From 7ba2fdd1a1bf0b807a0ab6a662e54d3c0a0da88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <66256922+daniel-weisse@users.noreply.github.com> Date: Tue, 17 May 2022 15:02:14 +0200 Subject: [PATCH] Fix proto file generation (#155) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix kms export path * Regenerate proto files Signed-off-by: Daniel Weiße --- kms/server/kmsapi/kmsproto/kmsapi.pb.go | 113 +++++++++---------- kms/server/kmsapi/kmsproto/kmsapi_grpc.pb.go | 12 +- proto/Dockerfile.gen-proto | 2 +- 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/kms/server/kmsapi/kmsproto/kmsapi.pb.go b/kms/server/kmsapi/kmsproto/kmsapi.pb.go index bc7fa74ed..142c6ed15 100644 --- a/kms/server/kmsapi/kmsproto/kmsapi.pb.go +++ b/kms/server/kmsapi/kmsproto/kmsapi.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.14.0 -// source: kmsproto/kmsapi.proto +// protoc-gen-go v1.28.0 +// protoc v3.20.1 +// source: kmsapi.proto package kmsproto @@ -32,7 +32,7 @@ type GetDataKeyRequest struct { func (x *GetDataKeyRequest) Reset() { *x = GetDataKeyRequest{} if protoimpl.UnsafeEnabled { - mi := &file_kmsproto_kmsapi_proto_msgTypes[0] + mi := &file_kmsapi_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *GetDataKeyRequest) String() string { func (*GetDataKeyRequest) ProtoMessage() {} func (x *GetDataKeyRequest) ProtoReflect() protoreflect.Message { - mi := &file_kmsproto_kmsapi_proto_msgTypes[0] + mi := &file_kmsapi_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *GetDataKeyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetDataKeyRequest.ProtoReflect.Descriptor instead. func (*GetDataKeyRequest) Descriptor() ([]byte, []int) { - return file_kmsproto_kmsapi_proto_rawDescGZIP(), []int{0} + return file_kmsapi_proto_rawDescGZIP(), []int{0} } func (x *GetDataKeyRequest) GetDataKeyId() string { @@ -86,7 +86,7 @@ type GetDataKeyResponse struct { func (x *GetDataKeyResponse) Reset() { *x = GetDataKeyResponse{} if protoimpl.UnsafeEnabled { - mi := &file_kmsproto_kmsapi_proto_msgTypes[1] + mi := &file_kmsapi_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -99,7 +99,7 @@ func (x *GetDataKeyResponse) String() string { func (*GetDataKeyResponse) ProtoMessage() {} func (x *GetDataKeyResponse) ProtoReflect() protoreflect.Message { - mi := &file_kmsproto_kmsapi_proto_msgTypes[1] + mi := &file_kmsapi_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -112,7 +112,7 @@ func (x *GetDataKeyResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetDataKeyResponse.ProtoReflect.Descriptor instead. func (*GetDataKeyResponse) Descriptor() ([]byte, []int) { - return file_kmsproto_kmsapi_proto_rawDescGZIP(), []int{1} + return file_kmsapi_proto_rawDescGZIP(), []int{1} } func (x *GetDataKeyResponse) GetDataKey() []byte { @@ -122,51 +122,50 @@ func (x *GetDataKeyResponse) GetDataKey() []byte { return nil } -var File_kmsproto_kmsapi_proto protoreflect.FileDescriptor +var File_kmsapi_proto protoreflect.FileDescriptor -var file_kmsproto_kmsapi_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x6b, 0x6d, 0x73, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6b, 0x6d, 0x73, 0x61, 0x70, - 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x70, 0x75, 0x62, 0x61, 0x70, 0x69, 0x22, - 0x4b, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, - 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x61, 0x74, 0x61, 0x4b, - 0x65, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x2f, 0x0a, 0x12, - 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x32, 0x4a, 0x0a, - 0x03, 0x41, 0x50, 0x49, 0x12, 0x43, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, - 0x65, 0x79, 0x12, 0x19, 0x2e, 0x70, 0x75, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x65, 0x74, 0x44, - 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, - 0x70, 0x75, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x73, - 0x73, 0x79, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2f, 0x6b, 0x6d, 0x73, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x6b, 0x6d, 0x73, - 0x61, 0x70, 0x69, 0x2f, 0x6b, 0x6d, 0x73, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, +var file_kmsapi_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x6b, 0x6d, 0x73, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, + 0x6b, 0x6d, 0x73, 0x61, 0x70, 0x69, 0x22, 0x4b, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, + 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x64, + 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, + 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x6c, 0x65, 0x6e, + 0x67, 0x74, 0x68, 0x22, 0x2f, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x61, 0x74, + 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x61, 0x74, + 0x61, 0x4b, 0x65, 0x79, 0x32, 0x4a, 0x0a, 0x03, 0x41, 0x50, 0x49, 0x12, 0x43, 0x0a, 0x0a, 0x47, + 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x19, 0x2e, 0x6b, 0x6d, 0x73, 0x61, + 0x70, 0x69, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x6b, 0x6d, 0x73, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x65, + 0x74, 0x44, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, + 0x64, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x73, 0x73, 0x79, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x74, + 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6b, 0x6d, 0x73, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x2f, 0x6b, 0x6d, 0x73, 0x61, 0x70, 0x69, 0x2f, 0x6b, 0x6d, 0x73, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_kmsproto_kmsapi_proto_rawDescOnce sync.Once - file_kmsproto_kmsapi_proto_rawDescData = file_kmsproto_kmsapi_proto_rawDesc + file_kmsapi_proto_rawDescOnce sync.Once + file_kmsapi_proto_rawDescData = file_kmsapi_proto_rawDesc ) -func file_kmsproto_kmsapi_proto_rawDescGZIP() []byte { - file_kmsproto_kmsapi_proto_rawDescOnce.Do(func() { - file_kmsproto_kmsapi_proto_rawDescData = protoimpl.X.CompressGZIP(file_kmsproto_kmsapi_proto_rawDescData) +func file_kmsapi_proto_rawDescGZIP() []byte { + file_kmsapi_proto_rawDescOnce.Do(func() { + file_kmsapi_proto_rawDescData = protoimpl.X.CompressGZIP(file_kmsapi_proto_rawDescData) }) - return file_kmsproto_kmsapi_proto_rawDescData + return file_kmsapi_proto_rawDescData } -var file_kmsproto_kmsapi_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_kmsproto_kmsapi_proto_goTypes = []interface{}{ - (*GetDataKeyRequest)(nil), // 0: pubapi.GetDataKeyRequest - (*GetDataKeyResponse)(nil), // 1: pubapi.GetDataKeyResponse +var file_kmsapi_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_kmsapi_proto_goTypes = []interface{}{ + (*GetDataKeyRequest)(nil), // 0: kmsapi.GetDataKeyRequest + (*GetDataKeyResponse)(nil), // 1: kmsapi.GetDataKeyResponse } -var file_kmsproto_kmsapi_proto_depIdxs = []int32{ - 0, // 0: pubapi.API.GetDataKey:input_type -> pubapi.GetDataKeyRequest - 1, // 1: pubapi.API.GetDataKey:output_type -> pubapi.GetDataKeyResponse +var file_kmsapi_proto_depIdxs = []int32{ + 0, // 0: kmsapi.API.GetDataKey:input_type -> kmsapi.GetDataKeyRequest + 1, // 1: kmsapi.API.GetDataKey:output_type -> kmsapi.GetDataKeyResponse 1, // [1:2] is the sub-list for method output_type 0, // [0:1] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -174,13 +173,13 @@ var file_kmsproto_kmsapi_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_kmsproto_kmsapi_proto_init() } -func file_kmsproto_kmsapi_proto_init() { - if File_kmsproto_kmsapi_proto != nil { +func init() { file_kmsapi_proto_init() } +func file_kmsapi_proto_init() { + if File_kmsapi_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_kmsproto_kmsapi_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_kmsapi_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetDataKeyRequest); i { case 0: return &v.state @@ -192,7 +191,7 @@ func file_kmsproto_kmsapi_proto_init() { return nil } } - file_kmsproto_kmsapi_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_kmsapi_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetDataKeyResponse); i { case 0: return &v.state @@ -209,18 +208,18 @@ func file_kmsproto_kmsapi_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_kmsproto_kmsapi_proto_rawDesc, + RawDescriptor: file_kmsapi_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_kmsproto_kmsapi_proto_goTypes, - DependencyIndexes: file_kmsproto_kmsapi_proto_depIdxs, - MessageInfos: file_kmsproto_kmsapi_proto_msgTypes, + GoTypes: file_kmsapi_proto_goTypes, + DependencyIndexes: file_kmsapi_proto_depIdxs, + MessageInfos: file_kmsapi_proto_msgTypes, }.Build() - File_kmsproto_kmsapi_proto = out.File - file_kmsproto_kmsapi_proto_rawDesc = nil - file_kmsproto_kmsapi_proto_goTypes = nil - file_kmsproto_kmsapi_proto_depIdxs = nil + File_kmsapi_proto = out.File + file_kmsapi_proto_rawDesc = nil + file_kmsapi_proto_goTypes = nil + file_kmsapi_proto_depIdxs = nil } diff --git a/kms/server/kmsapi/kmsproto/kmsapi_grpc.pb.go b/kms/server/kmsapi/kmsproto/kmsapi_grpc.pb.go index 5659ef1be..ff46a4c7b 100644 --- a/kms/server/kmsapi/kmsproto/kmsapi_grpc.pb.go +++ b/kms/server/kmsapi/kmsproto/kmsapi_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.20.1 +// source: kmsapi.proto package kmsproto @@ -31,7 +35,7 @@ func NewAPIClient(cc grpc.ClientConnInterface) APIClient { func (c *aPIClient) GetDataKey(ctx context.Context, in *GetDataKeyRequest, opts ...grpc.CallOption) (*GetDataKeyResponse, error) { out := new(GetDataKeyResponse) - err := c.cc.Invoke(ctx, "/pubapi.API/GetDataKey", in, out, opts...) + err := c.cc.Invoke(ctx, "/kmsapi.API/GetDataKey", in, out, opts...) if err != nil { return nil, err } @@ -76,7 +80,7 @@ func _API_GetDataKey_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/pubapi.API/GetDataKey", + FullMethod: "/kmsapi.API/GetDataKey", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(APIServer).GetDataKey(ctx, req.(*GetDataKeyRequest)) @@ -88,7 +92,7 @@ func _API_GetDataKey_Handler(srv interface{}, ctx context.Context, dec func(inte // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) var API_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "pubapi.API", + ServiceName: "kmsapi.API", HandlerType: (*APIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -97,5 +101,5 @@ var API_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "kmsproto/kmsapi.proto", + Metadata: "kmsapi.proto", } diff --git a/proto/Dockerfile.gen-proto b/proto/Dockerfile.gen-proto index 96705d629..5dba0741f 100644 --- a/proto/Dockerfile.gen-proto +++ b/proto/Dockerfile.gen-proto @@ -55,4 +55,4 @@ COPY --from=build /pubapi/*.go coordinator/pubapi/pubproto/ COPY --from=build /vpnapi/*.go coordinator/vpnapi/vpnproto/ COPY --from=build /disk-mapper/*.go state/keyservice/keyproto/ COPY --from=build /service/*.go debugd/service/ -COPY --from=build /kms/*.go kms/server/kmsproto/ +COPY --from=build /kms/*.go kms/server/kmsapi/kmsproto/