Fix some naming issues to make make generate work again

Makefile

@@ -64,8 +64,8 @@ OC_MODULES = \
 	services/web \
 	services/webdav\
 	services/webfinger\
-	ocis \
-	ocis-pkg
+	opencloud \
+	pkg
 
 # bin file definitions
 PHP_CS_FIXER=php -d zend.enable_gc=0 vendor-bin/owncloud-codestyle/vendor/bin/php-cs-fixer

pkg/.mockery.yaml

@@ -4,6 +4,6 @@ dir: "{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
 packages:
-    github.com/opencloud-eu/opencloud/ocis-pkg/oidc:
+    github.com/opencloud-eu/opencloud/pkg/oidc:
         interfaces:
             OIDCClient:

services/invitations/.mockery.yaml

@@ -3,7 +3,7 @@ filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
 packages:
-    github.com/opencloud-eu/opencloud/ocis-pkg/keycloak:
+    github.com/opencloud-eu/opencloud/pkg/keycloak:
         config:
             dir: "pkg/backends/keycloak/mocks"
         interfaces:

services/invitations/pkg/backends/keycloak/mocks/client.go

@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
-	libregraph "github.com/owncloud/libre-graph-api-go"
 	keycloak "github.com/opencloud-eu/opencloud/pkg/keycloak"
+	libregraph "github.com/owncloud/libre-graph-api-go"
 
 	mock "github.com/stretchr/testify/mock"
 )

services/search/Makefile

@@ -26,7 +26,7 @@ include ../../.make/generate.mk
 .PHONY: ci-go-generate
 ci-go-generate: $(PIGEON) $(MOCKERY) # CI runs ci-node-generate automatically before this target
 	$(MOCKERY)
-	$(PIGEON) -optimize-grammar -optimize-parser -o ../../ocis-pkg/kql/dictionary_gen.go ../../ocis-pkg/kql/dictionary.peg
+	$(PIGEON) -optimize-grammar -optimize-parser -o ../../pkg/kql/dictionary_gen.go ../../pkg/kql/dictionary.peg
 
 .PHONY: ci-node-generate
 ci-node-generate: