From 8cd8c08e308b5579c4bb60d0cda3b75da1cbe329 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Wed, 4 May 2022 15:04:18 +0200 Subject: [PATCH] Upgrade protobuf go package version to v2 --- .../gen/ocis/messages/accounts/v0/accounts.pb.go | 10 +++++----- protogen/gen/ocis/messages/search/v0/search.pb.go | 10 +++++----- .../gen/ocis/messages/settings/v0/settings.pb.go | 10 +++++----- protogen/gen/ocis/messages/store/v0/store.pb.go | 12 ++++++------ .../gen/ocis/messages/thumbnails/v0/thumbnails.pb.go | 10 +++++----- .../gen/ocis/services/accounts/v0/accounts.pb.go | 5 ++--- .../ocis/services/accounts/v0/accounts.pb.micro.go | 8 +++----- protogen/gen/ocis/services/search/v0/search.pb.go | 5 ++--- .../gen/ocis/services/search/v0/search.pb.micro.go | 8 +++----- .../gen/ocis/services/settings/v0/settings.pb.go | 5 ++--- .../ocis/services/settings/v0/settings.pb.micro.go | 8 +++----- protogen/gen/ocis/services/store/v0/store.pb.go | 5 ++--- .../gen/ocis/services/store/v0/store.pb.micro.go | 8 +++----- .../gen/ocis/services/thumbnails/v0/thumbnails.pb.go | 5 ++--- .../services/thumbnails/v0/thumbnails.pb.micro.go | 8 +++----- .../proto/ocis/messages/accounts/v0/accounts.proto | 2 +- protogen/proto/ocis/messages/search/v0/search.proto | 4 ++-- .../proto/ocis/messages/settings/v0/settings.proto | 2 +- protogen/proto/ocis/messages/store/v0/store.proto | 2 +- .../ocis/messages/thumbnails/v0/thumbnails.proto | 4 ++-- 20 files changed, 58 insertions(+), 73 deletions(-) diff --git a/protogen/gen/ocis/messages/accounts/v0/accounts.pb.go b/protogen/gen/ocis/messages/accounts/v0/accounts.pb.go index 3937c7abad9..c9cf08d3538 100644 --- a/protogen/gen/ocis/messages/accounts/v0/accounts.pb.go +++ b/protogen/gen/ocis/messages/accounts/v0/accounts.pb.go @@ -1078,11 +1078,11 @@ var file_ocis_messages_accounts_v0_accounts_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x43, 0x61, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, - 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, - 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, + 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x76, 0x32, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, + 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protogen/gen/ocis/messages/search/v0/search.pb.go b/protogen/gen/ocis/messages/search/v0/search.pb.go index 1f3acae8c2d..f0aa6bb0e5b 100644 --- a/protogen/gen/ocis/messages/search/v0/search.pb.go +++ b/protogen/gen/ocis/messages/search/v0/search.pb.go @@ -355,11 +355,11 @@ var file_ocis_messages_search_v0_search_proto_rawDesc = []byte{ 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e, 0x76, 0x30, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x73, 0x63, 0x6f, - 0x72, 0x65, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, - 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, - 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x76, + 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, + 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protogen/gen/ocis/messages/settings/v0/settings.pb.go b/protogen/gen/ocis/messages/settings/v0/settings.pb.go index c03cacf632e..8e08272ef01 100644 --- a/protogen/gen/ocis/messages/settings/v0/settings.pb.go +++ b/protogen/gen/ocis/messages/settings/v0/settings.pb.go @@ -1667,11 +1667,11 @@ var file_ocis_messages_settings_v0_settings_proto_rawDesc = []byte{ 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, - 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2f, - 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, + 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, + 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x73, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protogen/gen/ocis/messages/store/v0/store.pb.go b/protogen/gen/ocis/messages/store/v0/store.pb.go index 0783db6ec36..8f8f1740f6b 100644 --- a/protogen/gen/ocis/messages/store/v0/store.pb.go +++ b/protogen/gen/ocis/messages/store/v0/store.pb.go @@ -527,12 +527,12 @@ var file_ocis_messages_store_v0_store_proto_rawDesc = []byte{ 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x3e, - 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x30, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x41, + 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, + 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protogen/gen/ocis/messages/thumbnails/v0/thumbnails.pb.go b/protogen/gen/ocis/messages/thumbnails/v0/thumbnails.pb.go index d6198d3d7d5..efcf6318ef6 100644 --- a/protogen/gen/ocis/messages/thumbnails/v0/thumbnails.pb.go +++ b/protogen/gen/ocis/messages/thumbnails/v0/thumbnails.pb.go @@ -237,12 +237,12 @@ var file_ocis_messages_thumbnails_v0_thumbnails_proto_rawDesc = []byte{ 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x2a, 0x0a, 0x0d, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4a, 0x50, 0x47, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, - 0x47, 0x49, 0x46, 0x10, 0x02, 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x47, 0x49, 0x46, 0x10, 0x02, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, - 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, - 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x74, 0x68, 0x75, - 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, + 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.pb.go b/protogen/gen/ocis/services/accounts/v0/accounts.pb.go index 437c039a80f..55766307d4d 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.pb.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.pb.go @@ -7,9 +7,6 @@ package v0 import ( - reflect "reflect" - sync "sync" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -17,6 +14,8 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + reflect "reflect" + sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go b/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go index bc2aabfad4f..3ce76d5b53d 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go @@ -5,21 +5,19 @@ package v0 import ( fmt "fmt" - math "math" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" emptypb "google.golang.org/protobuf/types/known/emptypb" _ "google.golang.org/protobuf/types/known/fieldmaskpb" + math "math" +) +import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/search/v0/search.pb.go b/protogen/gen/ocis/services/search/v0/search.pb.go index a6f300f23f9..29fb75e166d 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.go @@ -7,15 +7,14 @@ package v0 import ( - reflect "reflect" - sync "sync" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" _ "google.golang.org/protobuf/types/known/fieldmaskpb" + reflect "reflect" + sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/search/v0/search.pb.micro.go b/protogen/gen/ocis/services/search/v0/search.pb.micro.go index c4bb3e55d57..157d3a0c907 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.micro.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.micro.go @@ -5,20 +5,18 @@ package v0 import ( fmt "fmt" - math "math" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" _ "google.golang.org/protobuf/types/known/fieldmaskpb" + math "math" +) +import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.go b/protogen/gen/ocis/services/settings/v0/settings.pb.go index f25491a9bd5..b14b56e87a7 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.go @@ -7,15 +7,14 @@ package v0 import ( - reflect "reflect" - sync "sync" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" + reflect "reflect" + sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go index 1ad8adb3eab..8308ad5cce0 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go @@ -5,20 +5,18 @@ package v0 import ( fmt "fmt" - math "math" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" emptypb "google.golang.org/protobuf/types/known/emptypb" + math "math" +) +import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/store/v0/store.pb.go b/protogen/gen/ocis/services/store/v0/store.pb.go index adfd63bee60..47e658138fa 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.go @@ -7,13 +7,12 @@ package v0 import ( - reflect "reflect" - sync "sync" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/store/v0/store.pb.micro.go b/protogen/gen/ocis/services/store/v0/store.pb.micro.go index 8be5b4ca687..ed25b475640 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.micro.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.micro.go @@ -5,18 +5,16 @@ package v0 import ( fmt "fmt" - math "math" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" proto "google.golang.org/protobuf/proto" + math "math" +) +import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go index 4bd11aa0539..d892e3f0451 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go @@ -7,13 +7,12 @@ package v0 import ( - reflect "reflect" - sync "sync" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go index eb7ddb5f9eb..80cc63622d1 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go @@ -5,18 +5,16 @@ package v0 import ( fmt "fmt" - math "math" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" proto "google.golang.org/protobuf/proto" + math "math" +) +import ( context "context" - api "go-micro.dev/v4/api" - client "go-micro.dev/v4/client" - server "go-micro.dev/v4/server" ) diff --git a/protogen/proto/ocis/messages/accounts/v0/accounts.proto b/protogen/proto/ocis/messages/accounts/v0/accounts.proto index e09deb2772e..22ce3a588c0 100644 --- a/protogen/proto/ocis/messages/accounts/v0/accounts.proto +++ b/protogen/proto/ocis/messages/accounts/v0/accounts.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package ocis.messages.accounts.v0; -option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"; +option go_package = "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"; import "google/protobuf/timestamp.proto"; // Account follows the properties of the ms graph api user resource. diff --git a/protogen/proto/ocis/messages/search/v0/search.proto b/protogen/proto/ocis/messages/search/v0/search.proto index b3729e47e5d..f79488aaffd 100644 --- a/protogen/proto/ocis/messages/search/v0/search.proto +++ b/protogen/proto/ocis/messages/search/v0/search.proto @@ -4,7 +4,7 @@ package ocis.messages.search.v0; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0"; +option go_package = "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0"; message ResourceID { string storage_id = 1; @@ -34,4 +34,4 @@ message Match { Entity entity = 1; // the match score float score = 2; -} \ No newline at end of file +} diff --git a/protogen/proto/ocis/messages/settings/v0/settings.proto b/protogen/proto/ocis/messages/settings/v0/settings.proto index aaf9f511b67..5bf93c96b9d 100644 --- a/protogen/proto/ocis/messages/settings/v0/settings.proto +++ b/protogen/proto/ocis/messages/settings/v0/settings.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package ocis.messages.settings.v0; -option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"; +option go_package = "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"; // --- // messages for settings values diff --git a/protogen/proto/ocis/messages/store/v0/store.proto b/protogen/proto/ocis/messages/store/v0/store.proto index d7991d56398..4b5fcce0e12 100644 --- a/protogen/proto/ocis/messages/store/v0/store.proto +++ b/protogen/proto/ocis/messages/store/v0/store.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package ocis.messages.store.v0; -option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0"; +option go_package = "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0"; message Field { // type of value e.g string, int, int64, bool, float64 diff --git a/protogen/proto/ocis/messages/thumbnails/v0/thumbnails.proto b/protogen/proto/ocis/messages/thumbnails/v0/thumbnails.proto index d5c0d8a77bd..ca7a369f83c 100644 --- a/protogen/proto/ocis/messages/thumbnails/v0/thumbnails.proto +++ b/protogen/proto/ocis/messages/thumbnails/v0/thumbnails.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package ocis.messages.thumbnails.v0; -option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0"; +option go_package = "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0"; message WebdavSource { // REQUIRED. @@ -27,4 +27,4 @@ enum ThumbnailType { PNG = 0; // Represents PNG type JPG = 1; // Represents JPG type GIF = 2; // Represents GIF type -} \ No newline at end of file +}