Merge pull request #25 from opencloud-eu/adapt-protobuf-naming

Adapt protobuf naming
opencloud-eu · Jan 15, 2025 · 9f1f06f · 9f1f06f
2 parents 132aef9 + 8c8cdd9
commit 9f1f06f
Show file tree

Hide file tree

Showing 177 changed files with 8,038 additions and 9,106 deletions.
diff --git a/pkg/l10n/l10n.go b/pkg/l10n/l10n.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/leonelquinteros/gotext"
 	"github.com/opencloud-eu/opencloud/pkg/middleware"
-	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
+	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/settings/v0"
 	micrometadata "go-micro.dev/v4/metadata"
 )
 

diff --git a/pkg/roles/manager.go b/pkg/roles/manager.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/cs3org/reva/v2/pkg/store"
 	"github.com/opencloud-eu/opencloud/pkg/log"
-	settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
-	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
+	settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/messages/settings/v0"
+	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/settings/v0"
 	microstore "go-micro.dev/v4/store"
 	"google.golang.org/protobuf/encoding/protojson"
 )

diff --git a/pkg/roles/option.go b/pkg/roles/option.go
@@ -2,7 +2,7 @@ package roles
 
 import (
 	"github.com/opencloud-eu/opencloud/pkg/log"
-	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
+	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/settings/v0"
 	"go-micro.dev/v4/store"
 )
 

diff --git a/protogen/.mockery.yaml b/protogen/.mockery.yaml
@@ -4,18 +4,18 @@ dir: "{{.InterfaceDir}}/mocks"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
 packages:
-    github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0:
+    github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/eventhistory/v0:
         interfaces:
             EventHistoryService:
-    github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0:
+    github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/policies/v0:
         interfaces:
             PoliciesProviderService:
-    github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0:
+    github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/search/v0:
         interfaces:
             SearchProviderService:
-    github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0:
+    github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/settings/v0:
         interfaces:
             ValueService:
-    github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0:
+    github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/thumbnails/v0:
         interfaces:
             ThumbnailService:
diff --git a/protogen/docs/GRPC.tmpl b/protogen/docs/GRPC.tmpl
@@ -25,7 +25,7 @@ geekdocRepo: https://github.com/opencloud-eu/opencloud
 | ----- | ---- | ----- | ----------- |
 {{ range .Fields -}}
 {{- $loca := printf "#%s" (.LongType | lower | replace "." "") -}}
-{{- if and (hasPrefix "ocis." .LongType) (ge (len $filenameParts) 3) -}}
+{{- if and (hasPrefix "opencloud." .LongType) (ge (len $filenameParts) 3) -}}
 	{{- $ltypeSpl := .LongType | splitList "." -}}
 	{{- $ltypePkg := slice $ltypeSpl 0 (sub (len $ltypeSpl) 1) | join "_" -}}
 	{{- $loca = printf "/apis/grpc_apis/%s/#%s" $ltypePkg (.Type | lower) -}}
@@ -72,12 +72,12 @@ geekdocRepo: https://github.com/opencloud-eu/opencloud
 {{ range .Methods -}}
 {{- $reqLoca := printf "#%s" (.RequestLongType | lower | replace "." "") -}}
 {{- $respLoca := printf "#%s" (.ResponseLongType | lower | replace "." "") -}}
-{{- if and (hasPrefix ".ocis." .RequestLongType) (ge (len $filenameParts) 3) }}
+{{- if and (hasPrefix ".opencloud." .RequestLongType) (ge (len $filenameParts) 3) }}
 	{{- $ltypeSpl := .RequestLongType | substr 1 -1 | splitList "." -}}
 	{{- $ltypePkg := slice $ltypeSpl 0 (sub (len $ltypeSpl) 1) | join "_" -}}
 	{{- $reqLoca = printf "/grpc_apis/%s/#%s" $ltypePkg (.RequestType | lower) -}}
 {{- end -}}
-{{- if and (hasPrefix ".ocis." .ResponseLongType) (ge (len $filenameParts) 3) }}
+{{- if and (hasPrefix ".opencloud." .ResponseLongType) (ge (len $filenameParts) 3) }}
 	{{- $ltypeSpl := .ResponseLongType | substr 1 -1 | splitList "." -}}
 	{{- $ltypePkg := slice $ltypeSpl 0 (sub (len $ltypeSpl) 1) | join "_" -}}
 	{{- $respLoca = printf "/grpc_apis/%s/#%s" $ltypePkg (.ResponseType | lower) -}}

diff --git a/protogen/gen/ocis/messages/eventhistory/v0/eventhistory.pb.go b/protogen/gen/ocis/messages/eventhistory/v0/eventhistory.pb.go