From 8283b4d64020df99e842e5d7018158d1c470d689 Mon Sep 17 00:00:00 2001 From: D4ryl00 Date: Thu, 17 Oct 2024 13:18:30 +0200 Subject: [PATCH] fix: set correct package path in API proto files Signed-off-by: D4ryl00 --- api/go-internal/handshake/handshake.proto | 2 +- api/go-internal/tinder/records.proto | 2 +- api/protocol/errcode/errcode.proto | 2 +- .../outofstoremessage.proto | 2 +- api/protocol/protocoltypes.proto | 2 +- .../replicationtypes/bertyreplication.proto | 2 +- .../bertyverifiablecreds.proto | 2 +- buf.gen.tag.yaml | 2 +- buf.gen.yaml | 22 +++++++++---------- internal/handshake/handshake.pb.go | 8 +++---- pkg/errcode/errcode.pb.go | 7 +++--- .../outofstoremessage.pb.go | 8 +++---- pkg/protocoltypes/protocoltypes.pb.go | 9 ++++---- pkg/replicationtypes/bertyreplication.pb.go | 6 ++--- pkg/tinder/records.pb.go | 7 +++--- .../bertyverifiablecreds.pb.go | 8 +++---- 16 files changed, 47 insertions(+), 44 deletions(-) diff --git a/api/go-internal/handshake/handshake.proto b/api/go-internal/handshake/handshake.proto index 72b7e1cb..96e96d96 100644 --- a/api/go-internal/handshake/handshake.proto +++ b/api/go-internal/handshake/handshake.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package handshake; -option go_package = "berty.tech/weshnet/internal/handshake"; +option go_package = "berty.tech/weshnet/v2/internal/handshake"; message BoxEnvelope { bytes box = 1; diff --git a/api/go-internal/tinder/records.proto b/api/go-internal/tinder/records.proto index dae670b0..3689c526 100644 --- a/api/go-internal/tinder/records.proto +++ b/api/go-internal/tinder/records.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package tinder; -option go_package = "berty.tech/weshnet/pkg/tinder"; +option go_package = "berty.tech/weshnet/v2/pkg/tinder"; message Records { repeated Record records = 1; diff --git a/api/protocol/errcode/errcode.proto b/api/protocol/errcode/errcode.proto index ea03294d..7e8219c1 100644 --- a/api/protocol/errcode/errcode.proto +++ b/api/protocol/errcode/errcode.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package weshnet.errcode; -option go_package = "berty.tech/weshnet/pkg/errcode"; +option go_package = "berty.tech/weshnet/v2/pkg/errcode"; enum ErrCode { //---------------- diff --git a/api/protocol/outofstoremessagetypes/outofstoremessage.proto b/api/protocol/outofstoremessagetypes/outofstoremessage.proto index 94ba073e..e79a9eb2 100644 --- a/api/protocol/outofstoremessagetypes/outofstoremessage.proto +++ b/api/protocol/outofstoremessagetypes/outofstoremessage.proto @@ -4,7 +4,7 @@ package weshnet.outofstoremessage.v1; import "protocoltypes.proto"; -option go_package = "berty.tech/weshnet/pkg/outofstoremessagetypes"; +option go_package = "berty.tech/weshnet/v2/pkg/outofstoremessagetypes"; // OutOfStoreMessageService is the service used to open out-of-store messages (e.g. push notifications) // It is used to open messages with a lightweight protocol service for mobile backgroup processes. diff --git a/api/protocol/protocoltypes.proto b/api/protocol/protocoltypes.proto index 7fdc21ea..8c36d53e 100644 --- a/api/protocol/protocoltypes.proto +++ b/api/protocol/protocoltypes.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package weshnet.protocol.v1; -option go_package = "berty.tech/weshnet/pkg/protocoltypes"; +option go_package = "berty.tech/weshnet/v2/pkg/protocoltypes"; // ProtocolService is the top-level API to manage the Wesh protocol service. // Each active Wesh protocol service is considered as a Wesh device and is associated with a Wesh user. diff --git a/api/protocol/replicationtypes/bertyreplication.proto b/api/protocol/replicationtypes/bertyreplication.proto index 53a8aba9..59d47308 100644 --- a/api/protocol/replicationtypes/bertyreplication.proto +++ b/api/protocol/replicationtypes/bertyreplication.proto @@ -5,7 +5,7 @@ package weshnet.replication.v1; import "protocoltypes.proto"; import "tagger/tagger.proto"; -option go_package = "berty.tech/weshnet/pkg/replicationtypes"; +option go_package = "berty.tech/weshnet/v2/pkg/replicationtypes"; // ReplicationService service ReplicationService { diff --git a/api/protocol/verifiablecredstypes/bertyverifiablecreds.proto b/api/protocol/verifiablecredstypes/bertyverifiablecreds.proto index b2222fd5..bb442ca4 100644 --- a/api/protocol/verifiablecredstypes/bertyverifiablecreds.proto +++ b/api/protocol/verifiablecredstypes/bertyverifiablecreds.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package weshnet.account.v1; -option go_package = "berty.tech/weshnet/pkg/verifiablecredstypes"; +option go_package = "berty.tech/weshnet/v2/pkg/verifiablecredstypes"; // StateChallenge serialized and signed state used when requesting a challenge message StateChallenge { diff --git a/buf.gen.tag.yaml b/buf.gen.tag.yaml index 17eb648d..60f05189 100644 --- a/buf.gen.tag.yaml +++ b/buf.gen.tag.yaml @@ -2,4 +2,4 @@ version: v1 plugins: - name: gotag out: ./ - opt: module=berty.tech/weshnet + opt: module=berty.tech/weshnet/v2 diff --git a/buf.gen.yaml b/buf.gen.yaml index a07a9b9e..4fc23490 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -1,13 +1,13 @@ version: v2 plugins: - - local: protoc-gen-go - out: ./ - opt: module=berty.tech/weshnet - - local: protoc-gen-go-grpc - out: ./ - opt: module=berty.tech/weshnet - - local: protoc-gen-grpc-gateway - out: ./ - opt: - - module=berty.tech/weshnet - - generate_unbound_methods=true + - local: protoc-gen-go + out: ./ + opt: module=berty.tech/weshnet/v2 + - local: protoc-gen-go-grpc + out: ./ + opt: module=berty.tech/weshnet/v2 + - local: protoc-gen-grpc-gateway + out: ./ + opt: + - module=berty.tech/weshnet/v2 + - generate_unbound_methods=true diff --git a/internal/handshake/handshake.pb.go b/internal/handshake/handshake.pb.go index 4cf99846..3dd62f8b 100644 --- a/internal/handshake/handshake.pb.go +++ b/internal/handshake/handshake.pb.go @@ -291,10 +291,10 @@ var file_handshake_handshake_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x65, 0x72, 0x41, 0x63, 0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x42, 0x27, 0x5a, 0x25, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, - 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2f, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x73, 0x42, 0x2a, 0x5a, 0x28, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, + 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/errcode/errcode.pb.go b/pkg/errcode/errcode.pb.go index 65b19f1c..558b0196 100644 --- a/pkg/errcode/errcode.pb.go +++ b/pkg/errcode/errcode.pb.go @@ -532,9 +532,10 @@ var file_errcode_errcode_proto_rawDesc = []byte{ 0x0a, 0x2f, 0x45, 0x72, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x49, - 0x44, 0x10, 0xef, 0x20, 0x42, 0x20, 0x5a, 0x1e, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, - 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x65, - 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x10, 0xef, 0x20, 0x42, 0x23, 0x5a, 0x21, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, + 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, + 0x67, 0x2f, 0x65, 0x72, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/outofstoremessagetypes/outofstoremessage.pb.go b/pkg/outofstoremessagetypes/outofstoremessage.pb.go index b8d68e1c..170af00a 100644 --- a/pkg/outofstoremessagetypes/outofstoremessage.pb.go +++ b/pkg/outofstoremessagetypes/outofstoremessage.pb.go @@ -38,10 +38,10 @@ var file_outofstoremessagetypes_outofstoremessage_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x75, 0x74, 0x4f, 0x66, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x2e, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x42, 0x2f, 0x5a, 0x2d, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, - 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6f, 0x75, - 0x74, 0x6f, 0x66, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x6c, 0x79, 0x42, 0x32, 0x5a, 0x30, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, + 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, + 0x2f, 0x6f, 0x75, 0x74, 0x6f, 0x66, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_outofstoremessagetypes_outofstoremessage_proto_goTypes = []any{ diff --git a/pkg/protocoltypes/protocoltypes.pb.go b/pkg/protocoltypes/protocoltypes.pb.go index 3fdc10ba..7665e8fb 100644 --- a/pkg/protocoltypes/protocoltypes.pb.go +++ b/pkg/protocoltypes/protocoltypes.pb.go @@ -11219,10 +11219,11 @@ var file_protocoltypes_proto_rawDesc = []byte{ 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x26, - 0x5a, 0x24, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, - 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, - 0x6c, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x29, + 0x5a, 0x27, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, + 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x63, 0x6f, 0x6c, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/replicationtypes/bertyreplication.pb.go b/pkg/replicationtypes/bertyreplication.pb.go index 592a3eac..2f7c3726 100644 --- a/pkg/replicationtypes/bertyreplication.pb.go +++ b/pkg/replicationtypes/bertyreplication.pb.go @@ -740,10 +740,10 @@ var file_replicationtypes_bertyreplication_proto_rawDesc = []byte{ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2e, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x53, - 0x74, 0x61, 0x74, 0x73, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x29, 0x5a, 0x27, 0x62, 0x65, + 0x74, 0x61, 0x74, 0x73, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x2c, 0x5a, 0x2a, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, - 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/tinder/records.pb.go b/pkg/tinder/records.pb.go index 48f193ed..ce185dea 100644 --- a/pkg/tinder/records.pb.go +++ b/pkg/tinder/records.pb.go @@ -133,9 +133,10 @@ var file_tinder_records_proto_rawDesc = []byte{ 0x72, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x06, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x42, 0x1f, 0x5a, 0x1d, 0x62, 0x65, 0x72, 0x74, 0x79, - 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x70, 0x6b, - 0x67, 0x2f, 0x74, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x62, 0x65, 0x72, 0x74, 0x79, + 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, + 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x74, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/verifiablecredstypes/bertyverifiablecreds.pb.go b/pkg/verifiablecredstypes/bertyverifiablecreds.pb.go index 9fad4dbe..3d8ed157 100644 --- a/pkg/verifiablecredstypes/bertyverifiablecreds.pb.go +++ b/pkg/verifiablecredstypes/bertyverifiablecreds.pb.go @@ -403,10 +403,10 @@ var file_verifiablecredstypes_bertyverifiablecreds_proto_rawDesc = []byte{ 0x65, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x31, 0x30, 0x43, 0x68, 0x61, 0x72, 0x73, 0x10, 0x02, 0x12, 0x1e, 0x0a, 0x19, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x4d, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x36, 0x5a, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x10, - 0xe7, 0x07, 0x42, 0x2d, 0x5a, 0x2b, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, - 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x65, 0x72, - 0x69, 0x66, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x63, 0x72, 0x65, 0x64, 0x73, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xe7, 0x07, 0x42, 0x30, 0x5a, 0x2e, 0x62, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x74, 0x65, 0x63, 0x68, + 0x2f, 0x77, 0x65, 0x73, 0x68, 0x6e, 0x65, 0x74, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, + 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x63, 0x72, 0x65, 0x64, 0x73, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (