diff --git a/accounts/pkg/proto/v0/accounts.proto b/accounts/pkg/proto/v0/accounts.proto index 98c0eca2ce..3d3a688a61 100644 --- a/accounts/pkg/proto/v0/accounts.proto +++ b/accounts/pkg/proto/v0/accounts.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -option go_package = "pkg/proto/v0;proto"; +package com.owncloud.ocis.accounts.v0; -package accounts; +option go_package = "github.com/owncloud/ocis/accounts/pkg/proto/v0"; import "google/api/field_behavior.proto"; import "google/api/annotations.proto"; diff --git a/changelog/unreleased/unique-proto-package-names.md b/changelog/unreleased/unique-proto-package-names.md new file mode 100644 index 0000000000..6433c8dc20 --- /dev/null +++ b/changelog/unreleased/unique-proto-package-names.md @@ -0,0 +1,5 @@ +Change: Make Protobuf package names unique + +Introduce unique `package` and `go_package` names for our Protobuf definitions + +https://github.com/owncloud/ocis/pull/1875 diff --git a/settings/pkg/proto/v0/settings.proto b/settings/pkg/proto/v0/settings.proto index a2e4c3e2a2..1166e52b4c 100644 --- a/settings/pkg/proto/v0/settings.proto +++ b/settings/pkg/proto/v0/settings.proto @@ -1,7 +1,8 @@ syntax = "proto3"; -package proto; -option go_package = "pkg/proto/v0;proto"; +package com.owncloud.ocis.settings.v0; + +option go_package = "github.com/owncloud/ocis/settings/pkg/proto/v0"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; diff --git a/store/pkg/proto/v0/store.proto b/store/pkg/proto/v0/store.proto index d40c20bf57..405b9f176f 100644 --- a/store/pkg/proto/v0/store.proto +++ b/store/pkg/proto/v0/store.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -option go_package = "pkg/proto/v0;proto"; +package com.owncloud.ocis.store.v0; -package store; +option go_package = "github.com/owncloud/ocis/store/pkg/proto/v0"; import "protoc-gen-openapiv2/options/annotations.proto"; diff --git a/thumbnails/pkg/proto/v0/thumbnails.proto b/thumbnails/pkg/proto/v0/thumbnails.proto index 75a48fa739..872e3d847a 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.proto +++ b/thumbnails/pkg/proto/v0/thumbnails.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option go_package = "pkg/proto/v0;proto"; - package com.owncloud.ocis.thumbnails.v0; +option go_package = "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"; + import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {