From 6c13580bee558b459f802412cdc735a88927f2f5 Mon Sep 17 00:00:00 2001 From: Drew Wells Date: Fri, 9 Feb 2024 16:45:16 -0600 Subject: [PATCH] fix panic in nil messages --- .gitignore | 1 + Makefile | 37 +++- docker/Dockerfile | 3 + example/feature_demo/demo_multi_file.pb.go | 4 +- .../demo_multi_file_service.pb.go | 4 +- .../demo_multi_file_service_grpc.pb.go | 12 +- example/feature_demo/demo_service.pb.go | 4 +- example/feature_demo/demo_service_grpc.pb.go | 179 +++++++----------- example/feature_demo/demo_types.pb.go | 104 +++++----- plugin/plugin.go | 8 +- 10 files changed, 164 insertions(+), 192 deletions(-) diff --git a/.gitignore b/.gitignore index 54b7d4b5..134200ae 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ trigger-travis.sh .idea /protoc-gen-gorm +/.gentool \ No newline at end of file diff --git a/Makefile b/Makefile index ddb611f6..73be6d77 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ test: build regenerate: clean-gen generate +clean: + rm -rf .gentool + clean-gen: cd example/postgres_arrays && rm -f *.pb.gorm.go && rm -f *.pb.go cd example/user && rm -f *.pb.gorm.go && rm -f *.pb.go @@ -45,9 +48,12 @@ example/postgres_arrays/*.pb.go: example/postgres_arrays/*.proto install: go install -v . -gentool: +gentool: .gentool + +.gentool: docker build -f docker/Dockerfile -t $(GENTOOL_IMAGE) . docker image prune -f --filter label=stage=server-intermediate + touch $@ generate-gentool: SRCROOT_ON_HOST := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) generate-gentool: SRCROOT_IN_CONTAINER := /go/src/$(PROJECT_ROOT) @@ -59,20 +65,28 @@ generate-gentool: GENERATOR := $(DOCKER_RUNNER) $(DOCKER_GENERATOR) generate-gentool: gentool $(DOCKER_RUNNER) \ $(GENTOOL_IMAGE) \ - --go_out="plugins=grpc:$(DOCKERPATH)" \ + --go_out="$(DOCKERPATH)" \ + --go-grpc_out="$(DOCKERPATH)" \ + --validate_out="lang=go:$(DOCKERPATH)" \ --gorm_out="engine=postgres,enums=string,gateway:$(DOCKERPATH)" \ - feature_demo/demo_multi_file.proto \ - feature_demo/demo_multi_file_service.proto \ - feature_demo/demo_service.proto \ - feature_demo/demo_types.proto + feature_demo/demo_multi_file.proto \ + feature_demo/demo_multi_file_service.proto \ + feature_demo/demo_service.proto \ + feature_demo/demo_types.proto + $(DOCKER_RUNNER) \ $(GENTOOL_IMAGE) \ - --go_out="plugins=grpc:$(DOCKERPATH)" \ + --go_out="$(DOCKERPATH)" \ + --go-grpc_out="$(DOCKERPATH)" \ + --validate_out="lang=go:$(DOCKERPATH)" \ --gorm_out="engine=postgres,enums=string,gateway:$(DOCKERPATH)" \ user/user.proto + $(DOCKER_RUNNER) \ $(GENTOOL_IMAGE) \ - --go_out="plugins=grpc:$(DOCKERPATH)" \ + --go_out="$(DOCKERPATH)" \ + --go-grpc_out="$(DOCKERPATH)" \ + --validate_out="lang=go:$(DOCKERPATH)" \ --gorm_out="engine=postgres,enums=string,gateway:$(DOCKERPATH)" \ postgres_arrays/postgres_arrays.proto @@ -83,8 +97,11 @@ build-local: protoc --proto_path . \ -I./proto/ \ -I./third_party/proto/ \ - -I=. example/feature_demo/demo_multi_file.proto \ - example/feature_demo/demo_service.proto --gorm_out="engine=postgres,enums=string,gateway:./example/feature_demo" --go_out=./example/feature_demo + -I=. \ + example/feature_demo/demo_multi_file.proto \ + example/feature_demo/demo_service.proto \ + --gorm_out="engine=postgres,enums=string,gateway:./example/feature_demo" \ + --go_out=./example/feature_demo build-user-local: rm -rf example/user/github.com/ diff --git a/docker/Dockerfile b/docker/Dockerfile index 74ec3f8d..5d5a805e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,10 +23,13 @@ ENTRYPOINT ["protoc", "-I.", \ "-Igithub.com/mwitkow/go-proto-validators", \ # required import paths for protoc-gen-gorm plugin, Should add /proto path once updated "-Igithub.com/infobloxopen/protoc-gen-gorm", \ + "-Igithub.com/infobloxopen/protoc-gen-gorm/proto", \ # required import paths for protoc-gen-atlas-query-validate plugin "-Igithub.com/infobloxopen/protoc-gen-atlas-query-validate", \ # required import paths for protoc-gen-preprocess plugin "-Igithub.com/infobloxopen/protoc-gen-preprocess", \ + "-Igithub.com/infobloxopen/protoc-gen-gorm/example", \ + "-Igithub.com/infobloxopen/protoc-gen-gorm/third_party/proto", \ # required import paths for protoc-gen-atlas-validate plugin "-Igithub.com/infobloxopen/protoc-gen-atlas-validate" \ ] diff --git a/example/feature_demo/demo_multi_file.pb.go b/example/feature_demo/demo_multi_file.pb.go index 157a2b63..52754ce0 100644 --- a/example/feature_demo/demo_multi_file.pb.go +++ b/example/feature_demo/demo_multi_file.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc (unknown) +// protoc-gen-go v1.28.1 +// protoc v3.18.1 // source: feature_demo/demo_multi_file.proto package example diff --git a/example/feature_demo/demo_multi_file_service.pb.go b/example/feature_demo/demo_multi_file_service.pb.go index 2c6cdce8..2a96e2ba 100644 --- a/example/feature_demo/demo_multi_file_service.pb.go +++ b/example/feature_demo/demo_multi_file_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc (unknown) +// protoc-gen-go v1.28.1 +// protoc v3.18.1 // source: feature_demo/demo_multi_file_service.proto package example diff --git a/example/feature_demo/demo_multi_file_service_grpc.pb.go b/example/feature_demo/demo_multi_file_service_grpc.pb.go index d81ecb32..db3c7c97 100644 --- a/example/feature_demo/demo_multi_file_service_grpc.pb.go +++ b/example/feature_demo/demo_multi_file_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc (unknown) +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.18.1 // source: feature_demo/demo_multi_file_service.proto package example @@ -18,10 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - BlogPostService_Read_FullMethodName = "/example.BlogPostService/Read" -) - // BlogPostServiceClient is the client API for BlogPostService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -39,7 +35,7 @@ func NewBlogPostServiceClient(cc grpc.ClientConnInterface) BlogPostServiceClient func (c *blogPostServiceClient) Read(ctx context.Context, in *ReadAccountRequest, opts ...grpc.CallOption) (*ReadBlogPostsResponse, error) { out := new(ReadBlogPostsResponse) - err := c.cc.Invoke(ctx, BlogPostService_Read_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.BlogPostService/Read", in, out, opts...) if err != nil { return nil, err } @@ -84,7 +80,7 @@ func _BlogPostService_Read_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: BlogPostService_Read_FullMethodName, + FullMethod: "/example.BlogPostService/Read", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BlogPostServiceServer).Read(ctx, req.(*ReadAccountRequest)) diff --git a/example/feature_demo/demo_service.pb.go b/example/feature_demo/demo_service.pb.go index e7091c26..944409de 100644 --- a/example/feature_demo/demo_service.pb.go +++ b/example/feature_demo/demo_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc (unknown) +// protoc-gen-go v1.28.1 +// protoc v3.18.1 // source: feature_demo/demo_service.proto package example diff --git a/example/feature_demo/demo_service_grpc.pb.go b/example/feature_demo/demo_service_grpc.pb.go index 61e2b75d..a02495a0 100644 --- a/example/feature_demo/demo_service_grpc.pb.go +++ b/example/feature_demo/demo_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc (unknown) +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.18.1 // source: feature_demo/demo_service.proto package example @@ -19,18 +19,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - IntPointService_Create_FullMethodName = "/example.IntPointService/Create" - IntPointService_Read_FullMethodName = "/example.IntPointService/Read" - IntPointService_Update_FullMethodName = "/example.IntPointService/Update" - IntPointService_UpdateSet_FullMethodName = "/example.IntPointService/UpdateSet" - IntPointService_List_FullMethodName = "/example.IntPointService/List" - IntPointService_ListSomething_FullMethodName = "/example.IntPointService/ListSomething" - IntPointService_Delete_FullMethodName = "/example.IntPointService/Delete" - IntPointService_CustomMethod_FullMethodName = "/example.IntPointService/CustomMethod" - IntPointService_CreateSomething_FullMethodName = "/example.IntPointService/CreateSomething" -) - // IntPointServiceClient is the client API for IntPointService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -63,7 +51,7 @@ func NewIntPointServiceClient(cc grpc.ClientConnInterface) IntPointServiceClient func (c *intPointServiceClient) Create(ctx context.Context, in *CreateIntPointRequest, opts ...grpc.CallOption) (*CreateIntPointResponse, error) { out := new(CreateIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_Create_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/Create", in, out, opts...) if err != nil { return nil, err } @@ -72,7 +60,7 @@ func (c *intPointServiceClient) Create(ctx context.Context, in *CreateIntPointRe func (c *intPointServiceClient) Read(ctx context.Context, in *ReadIntPointRequest, opts ...grpc.CallOption) (*ReadIntPointResponse, error) { out := new(ReadIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_Read_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/Read", in, out, opts...) if err != nil { return nil, err } @@ -81,7 +69,7 @@ func (c *intPointServiceClient) Read(ctx context.Context, in *ReadIntPointReques func (c *intPointServiceClient) Update(ctx context.Context, in *UpdateIntPointRequest, opts ...grpc.CallOption) (*UpdateIntPointResponse, error) { out := new(UpdateIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_Update_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/Update", in, out, opts...) if err != nil { return nil, err } @@ -90,7 +78,7 @@ func (c *intPointServiceClient) Update(ctx context.Context, in *UpdateIntPointRe func (c *intPointServiceClient) UpdateSet(ctx context.Context, in *UpdateSetIntPointRequest, opts ...grpc.CallOption) (*UpdateSetIntPointResponse, error) { out := new(UpdateSetIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_UpdateSet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/UpdateSet", in, out, opts...) if err != nil { return nil, err } @@ -99,7 +87,7 @@ func (c *intPointServiceClient) UpdateSet(ctx context.Context, in *UpdateSetIntP func (c *intPointServiceClient) List(ctx context.Context, in *ListIntPointRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_List_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/List", in, out, opts...) if err != nil { return nil, err } @@ -108,7 +96,7 @@ func (c *intPointServiceClient) List(ctx context.Context, in *ListIntPointReques func (c *intPointServiceClient) ListSomething(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListSomethingResponse, error) { out := new(ListSomethingResponse) - err := c.cc.Invoke(ctx, IntPointService_ListSomething_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/ListSomething", in, out, opts...) if err != nil { return nil, err } @@ -117,7 +105,7 @@ func (c *intPointServiceClient) ListSomething(ctx context.Context, in *emptypb.E func (c *intPointServiceClient) Delete(ctx context.Context, in *DeleteIntPointRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, IntPointService_Delete_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/Delete", in, out, opts...) if err != nil { return nil, err } @@ -126,7 +114,7 @@ func (c *intPointServiceClient) Delete(ctx context.Context, in *DeleteIntPointRe func (c *intPointServiceClient) CustomMethod(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, IntPointService_CustomMethod_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/CustomMethod", in, out, opts...) if err != nil { return nil, err } @@ -135,7 +123,7 @@ func (c *intPointServiceClient) CustomMethod(ctx context.Context, in *emptypb.Em func (c *intPointServiceClient) CreateSomething(ctx context.Context, in *Something, opts ...grpc.CallOption) (*Something, error) { out := new(Something) - err := c.cc.Invoke(ctx, IntPointService_CreateSomething_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointService/CreateSomething", in, out, opts...) if err != nil { return nil, err } @@ -219,7 +207,7 @@ func _IntPointService_Create_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_Create_FullMethodName, + FullMethod: "/example.IntPointService/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).Create(ctx, req.(*CreateIntPointRequest)) @@ -237,7 +225,7 @@ func _IntPointService_Read_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_Read_FullMethodName, + FullMethod: "/example.IntPointService/Read", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).Read(ctx, req.(*ReadIntPointRequest)) @@ -255,7 +243,7 @@ func _IntPointService_Update_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_Update_FullMethodName, + FullMethod: "/example.IntPointService/Update", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).Update(ctx, req.(*UpdateIntPointRequest)) @@ -273,7 +261,7 @@ func _IntPointService_UpdateSet_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_UpdateSet_FullMethodName, + FullMethod: "/example.IntPointService/UpdateSet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).UpdateSet(ctx, req.(*UpdateSetIntPointRequest)) @@ -291,7 +279,7 @@ func _IntPointService_List_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_List_FullMethodName, + FullMethod: "/example.IntPointService/List", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).List(ctx, req.(*ListIntPointRequest)) @@ -309,7 +297,7 @@ func _IntPointService_ListSomething_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_ListSomething_FullMethodName, + FullMethod: "/example.IntPointService/ListSomething", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).ListSomething(ctx, req.(*emptypb.Empty)) @@ -327,7 +315,7 @@ func _IntPointService_Delete_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_Delete_FullMethodName, + FullMethod: "/example.IntPointService/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).Delete(ctx, req.(*DeleteIntPointRequest)) @@ -345,7 +333,7 @@ func _IntPointService_CustomMethod_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_CustomMethod_FullMethodName, + FullMethod: "/example.IntPointService/CustomMethod", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).CustomMethod(ctx, req.(*emptypb.Empty)) @@ -363,7 +351,7 @@ func _IntPointService_CreateSomething_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointService_CreateSomething_FullMethodName, + FullMethod: "/example.IntPointService/CreateSomething", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceServer).CreateSomething(ctx, req.(*Something)) @@ -419,11 +407,6 @@ var IntPointService_ServiceDesc = grpc.ServiceDesc{ Metadata: "feature_demo/demo_service.proto", } -const ( - IntPointServiceB_List_FullMethodName = "/example.IntPointServiceB/List" - IntPointServiceB_Create_FullMethodName = "/example.IntPointServiceB/Create" -) - // IntPointServiceBClient is the client API for IntPointServiceB service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -442,7 +425,7 @@ func NewIntPointServiceBClient(cc grpc.ClientConnInterface) IntPointServiceBClie func (c *intPointServiceBClient) List(ctx context.Context, in *ListFooRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, IntPointServiceB_List_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointServiceB/List", in, out, opts...) if err != nil { return nil, err } @@ -451,7 +434,7 @@ func (c *intPointServiceBClient) List(ctx context.Context, in *ListFooRequest, o func (c *intPointServiceBClient) Create(ctx context.Context, in *CreateFooRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, IntPointServiceB_Create_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointServiceB/Create", in, out, opts...) if err != nil { return nil, err } @@ -500,7 +483,7 @@ func _IntPointServiceB_List_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointServiceB_List_FullMethodName, + FullMethod: "/example.IntPointServiceB/List", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceBServer).List(ctx, req.(*ListFooRequest)) @@ -518,7 +501,7 @@ func _IntPointServiceB_Create_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointServiceB_Create_FullMethodName, + FullMethod: "/example.IntPointServiceB/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointServiceBServer).Create(ctx, req.(*CreateFooRequest)) @@ -546,17 +529,6 @@ var IntPointServiceB_ServiceDesc = grpc.ServiceDesc{ Metadata: "feature_demo/demo_service.proto", } -const ( - IntPointTxn_Create_FullMethodName = "/example.IntPointTxn/Create" - IntPointTxn_Read_FullMethodName = "/example.IntPointTxn/Read" - IntPointTxn_Update_FullMethodName = "/example.IntPointTxn/Update" - IntPointTxn_List_FullMethodName = "/example.IntPointTxn/List" - IntPointTxn_Delete_FullMethodName = "/example.IntPointTxn/Delete" - IntPointTxn_DeleteSet_FullMethodName = "/example.IntPointTxn/DeleteSet" - IntPointTxn_CustomMethod_FullMethodName = "/example.IntPointTxn/CustomMethod" - IntPointTxn_CreateSomething_FullMethodName = "/example.IntPointTxn/CreateSomething" -) - // IntPointTxnClient is the client API for IntPointTxn service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -588,7 +560,7 @@ func NewIntPointTxnClient(cc grpc.ClientConnInterface) IntPointTxnClient { func (c *intPointTxnClient) Create(ctx context.Context, in *CreateIntPointRequest, opts ...grpc.CallOption) (*CreateIntPointResponse, error) { out := new(CreateIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_Create_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/Create", in, out, opts...) if err != nil { return nil, err } @@ -597,7 +569,7 @@ func (c *intPointTxnClient) Create(ctx context.Context, in *CreateIntPointReques func (c *intPointTxnClient) Read(ctx context.Context, in *ReadIntPointRequest, opts ...grpc.CallOption) (*ReadIntPointResponse, error) { out := new(ReadIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_Read_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/Read", in, out, opts...) if err != nil { return nil, err } @@ -606,7 +578,7 @@ func (c *intPointTxnClient) Read(ctx context.Context, in *ReadIntPointRequest, o func (c *intPointTxnClient) Update(ctx context.Context, in *UpdateIntPointRequest, opts ...grpc.CallOption) (*UpdateIntPointResponse, error) { out := new(UpdateIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_Update_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/Update", in, out, opts...) if err != nil { return nil, err } @@ -615,7 +587,7 @@ func (c *intPointTxnClient) Update(ctx context.Context, in *UpdateIntPointReques func (c *intPointTxnClient) List(ctx context.Context, in *ListIntPointRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_List_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/List", in, out, opts...) if err != nil { return nil, err } @@ -624,7 +596,7 @@ func (c *intPointTxnClient) List(ctx context.Context, in *ListIntPointRequest, o func (c *intPointTxnClient) Delete(ctx context.Context, in *DeleteIntPointRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_Delete_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/Delete", in, out, opts...) if err != nil { return nil, err } @@ -633,7 +605,7 @@ func (c *intPointTxnClient) Delete(ctx context.Context, in *DeleteIntPointReques func (c *intPointTxnClient) DeleteSet(ctx context.Context, in *DeleteIntPointsRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, IntPointTxn_DeleteSet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/DeleteSet", in, out, opts...) if err != nil { return nil, err } @@ -642,7 +614,7 @@ func (c *intPointTxnClient) DeleteSet(ctx context.Context, in *DeleteIntPointsRe func (c *intPointTxnClient) CustomMethod(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, IntPointTxn_CustomMethod_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/CustomMethod", in, out, opts...) if err != nil { return nil, err } @@ -651,7 +623,7 @@ func (c *intPointTxnClient) CustomMethod(ctx context.Context, in *emptypb.Empty, func (c *intPointTxnClient) CreateSomething(ctx context.Context, in *Something, opts ...grpc.CallOption) (*Something, error) { out := new(Something) - err := c.cc.Invoke(ctx, IntPointTxn_CreateSomething_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.IntPointTxn/CreateSomething", in, out, opts...) if err != nil { return nil, err } @@ -731,7 +703,7 @@ func _IntPointTxn_Create_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_Create_FullMethodName, + FullMethod: "/example.IntPointTxn/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).Create(ctx, req.(*CreateIntPointRequest)) @@ -749,7 +721,7 @@ func _IntPointTxn_Read_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_Read_FullMethodName, + FullMethod: "/example.IntPointTxn/Read", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).Read(ctx, req.(*ReadIntPointRequest)) @@ -767,7 +739,7 @@ func _IntPointTxn_Update_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_Update_FullMethodName, + FullMethod: "/example.IntPointTxn/Update", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).Update(ctx, req.(*UpdateIntPointRequest)) @@ -785,7 +757,7 @@ func _IntPointTxn_List_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_List_FullMethodName, + FullMethod: "/example.IntPointTxn/List", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).List(ctx, req.(*ListIntPointRequest)) @@ -803,7 +775,7 @@ func _IntPointTxn_Delete_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_Delete_FullMethodName, + FullMethod: "/example.IntPointTxn/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).Delete(ctx, req.(*DeleteIntPointRequest)) @@ -821,7 +793,7 @@ func _IntPointTxn_DeleteSet_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_DeleteSet_FullMethodName, + FullMethod: "/example.IntPointTxn/DeleteSet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).DeleteSet(ctx, req.(*DeleteIntPointsRequest)) @@ -839,7 +811,7 @@ func _IntPointTxn_CustomMethod_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_CustomMethod_FullMethodName, + FullMethod: "/example.IntPointTxn/CustomMethod", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).CustomMethod(ctx, req.(*emptypb.Empty)) @@ -857,7 +829,7 @@ func _IntPointTxn_CreateSomething_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: IntPointTxn_CreateSomething_FullMethodName, + FullMethod: "/example.IntPointTxn/CreateSomething", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(IntPointTxnServer).CreateSomething(ctx, req.(*Something)) @@ -909,10 +881,6 @@ var IntPointTxn_ServiceDesc = grpc.ServiceDesc{ Metadata: "feature_demo/demo_service.proto", } -const ( - CircleService_List_FullMethodName = "/example.CircleService/List" -) - // CircleServiceClient is the client API for CircleService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -930,7 +898,7 @@ func NewCircleServiceClient(cc grpc.ClientConnInterface) CircleServiceClient { func (c *circleServiceClient) List(ctx context.Context, in *ListCircleRequest, opts ...grpc.CallOption) (*ListCircleResponse, error) { out := new(ListCircleResponse) - err := c.cc.Invoke(ctx, CircleService_List_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.CircleService/List", in, out, opts...) if err != nil { return nil, err } @@ -975,7 +943,7 @@ func _CircleService_List_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CircleService_List_FullMethodName, + FullMethod: "/example.CircleService/List", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CircleServiceServer).List(ctx, req.(*ListCircleRequest)) @@ -999,21 +967,6 @@ var CircleService_ServiceDesc = grpc.ServiceDesc{ Metadata: "feature_demo/demo_service.proto", } -const ( - MultipleMethodsAutoGen_CreateA_FullMethodName = "/example.MultipleMethodsAutoGen/CreateA" - MultipleMethodsAutoGen_CreateB_FullMethodName = "/example.MultipleMethodsAutoGen/CreateB" - MultipleMethodsAutoGen_ReadA_FullMethodName = "/example.MultipleMethodsAutoGen/ReadA" - MultipleMethodsAutoGen_ReadB_FullMethodName = "/example.MultipleMethodsAutoGen/ReadB" - MultipleMethodsAutoGen_UpdateA_FullMethodName = "/example.MultipleMethodsAutoGen/UpdateA" - MultipleMethodsAutoGen_UpdateB_FullMethodName = "/example.MultipleMethodsAutoGen/UpdateB" - MultipleMethodsAutoGen_ListA_FullMethodName = "/example.MultipleMethodsAutoGen/ListA" - MultipleMethodsAutoGen_ListB_FullMethodName = "/example.MultipleMethodsAutoGen/ListB" - MultipleMethodsAutoGen_DeleteA_FullMethodName = "/example.MultipleMethodsAutoGen/DeleteA" - MultipleMethodsAutoGen_DeleteB_FullMethodName = "/example.MultipleMethodsAutoGen/DeleteB" - MultipleMethodsAutoGen_DeleteSetA_FullMethodName = "/example.MultipleMethodsAutoGen/DeleteSetA" - MultipleMethodsAutoGen_DeleteSetB_FullMethodName = "/example.MultipleMethodsAutoGen/DeleteSetB" -) - // MultipleMethodsAutoGenClient is the client API for MultipleMethodsAutoGen service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -1042,7 +995,7 @@ func NewMultipleMethodsAutoGenClient(cc grpc.ClientConnInterface) MultipleMethod func (c *multipleMethodsAutoGenClient) CreateA(ctx context.Context, in *CreateIntPointRequest, opts ...grpc.CallOption) (*CreateIntPointResponse, error) { out := new(CreateIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_CreateA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/CreateA", in, out, opts...) if err != nil { return nil, err } @@ -1051,7 +1004,7 @@ func (c *multipleMethodsAutoGenClient) CreateA(ctx context.Context, in *CreateIn func (c *multipleMethodsAutoGenClient) CreateB(ctx context.Context, in *CreateIntPointRequest, opts ...grpc.CallOption) (*CreateIntPointResponse, error) { out := new(CreateIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_CreateB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/CreateB", in, out, opts...) if err != nil { return nil, err } @@ -1060,7 +1013,7 @@ func (c *multipleMethodsAutoGenClient) CreateB(ctx context.Context, in *CreateIn func (c *multipleMethodsAutoGenClient) ReadA(ctx context.Context, in *ReadIntPointRequest, opts ...grpc.CallOption) (*ReadIntPointResponse, error) { out := new(ReadIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_ReadA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/ReadA", in, out, opts...) if err != nil { return nil, err } @@ -1069,7 +1022,7 @@ func (c *multipleMethodsAutoGenClient) ReadA(ctx context.Context, in *ReadIntPoi func (c *multipleMethodsAutoGenClient) ReadB(ctx context.Context, in *ReadIntPointRequest, opts ...grpc.CallOption) (*ReadIntPointResponse, error) { out := new(ReadIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_ReadB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/ReadB", in, out, opts...) if err != nil { return nil, err } @@ -1078,7 +1031,7 @@ func (c *multipleMethodsAutoGenClient) ReadB(ctx context.Context, in *ReadIntPoi func (c *multipleMethodsAutoGenClient) UpdateA(ctx context.Context, in *UpdateIntPointRequest, opts ...grpc.CallOption) (*UpdateIntPointResponse, error) { out := new(UpdateIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_UpdateA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/UpdateA", in, out, opts...) if err != nil { return nil, err } @@ -1087,7 +1040,7 @@ func (c *multipleMethodsAutoGenClient) UpdateA(ctx context.Context, in *UpdateIn func (c *multipleMethodsAutoGenClient) UpdateB(ctx context.Context, in *UpdateIntPointRequest, opts ...grpc.CallOption) (*UpdateIntPointResponse, error) { out := new(UpdateIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_UpdateB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/UpdateB", in, out, opts...) if err != nil { return nil, err } @@ -1096,7 +1049,7 @@ func (c *multipleMethodsAutoGenClient) UpdateB(ctx context.Context, in *UpdateIn func (c *multipleMethodsAutoGenClient) ListA(ctx context.Context, in *ListIntPointRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_ListA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/ListA", in, out, opts...) if err != nil { return nil, err } @@ -1105,7 +1058,7 @@ func (c *multipleMethodsAutoGenClient) ListA(ctx context.Context, in *ListIntPoi func (c *multipleMethodsAutoGenClient) ListB(ctx context.Context, in *ListIntPointRequest, opts ...grpc.CallOption) (*ListIntPointResponse, error) { out := new(ListIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_ListB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/ListB", in, out, opts...) if err != nil { return nil, err } @@ -1114,7 +1067,7 @@ func (c *multipleMethodsAutoGenClient) ListB(ctx context.Context, in *ListIntPoi func (c *multipleMethodsAutoGenClient) DeleteA(ctx context.Context, in *DeleteIntPointRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_DeleteA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/DeleteA", in, out, opts...) if err != nil { return nil, err } @@ -1123,7 +1076,7 @@ func (c *multipleMethodsAutoGenClient) DeleteA(ctx context.Context, in *DeleteIn func (c *multipleMethodsAutoGenClient) DeleteB(ctx context.Context, in *DeleteIntPointRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_DeleteB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/DeleteB", in, out, opts...) if err != nil { return nil, err } @@ -1132,7 +1085,7 @@ func (c *multipleMethodsAutoGenClient) DeleteB(ctx context.Context, in *DeleteIn func (c *multipleMethodsAutoGenClient) DeleteSetA(ctx context.Context, in *DeleteIntPointsRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_DeleteSetA_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/DeleteSetA", in, out, opts...) if err != nil { return nil, err } @@ -1141,7 +1094,7 @@ func (c *multipleMethodsAutoGenClient) DeleteSetA(ctx context.Context, in *Delet func (c *multipleMethodsAutoGenClient) DeleteSetB(ctx context.Context, in *DeleteIntPointsRequest, opts ...grpc.CallOption) (*DeleteIntPointResponse, error) { out := new(DeleteIntPointResponse) - err := c.cc.Invoke(ctx, MultipleMethodsAutoGen_DeleteSetB_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/example.MultipleMethodsAutoGen/DeleteSetB", in, out, opts...) if err != nil { return nil, err } @@ -1231,7 +1184,7 @@ func _MultipleMethodsAutoGen_CreateA_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_CreateA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/CreateA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).CreateA(ctx, req.(*CreateIntPointRequest)) @@ -1249,7 +1202,7 @@ func _MultipleMethodsAutoGen_CreateB_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_CreateB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/CreateB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).CreateB(ctx, req.(*CreateIntPointRequest)) @@ -1267,7 +1220,7 @@ func _MultipleMethodsAutoGen_ReadA_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_ReadA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/ReadA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).ReadA(ctx, req.(*ReadIntPointRequest)) @@ -1285,7 +1238,7 @@ func _MultipleMethodsAutoGen_ReadB_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_ReadB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/ReadB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).ReadB(ctx, req.(*ReadIntPointRequest)) @@ -1303,7 +1256,7 @@ func _MultipleMethodsAutoGen_UpdateA_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_UpdateA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/UpdateA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).UpdateA(ctx, req.(*UpdateIntPointRequest)) @@ -1321,7 +1274,7 @@ func _MultipleMethodsAutoGen_UpdateB_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_UpdateB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/UpdateB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).UpdateB(ctx, req.(*UpdateIntPointRequest)) @@ -1339,7 +1292,7 @@ func _MultipleMethodsAutoGen_ListA_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_ListA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/ListA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).ListA(ctx, req.(*ListIntPointRequest)) @@ -1357,7 +1310,7 @@ func _MultipleMethodsAutoGen_ListB_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_ListB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/ListB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).ListB(ctx, req.(*ListIntPointRequest)) @@ -1375,7 +1328,7 @@ func _MultipleMethodsAutoGen_DeleteA_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_DeleteA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/DeleteA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).DeleteA(ctx, req.(*DeleteIntPointRequest)) @@ -1393,7 +1346,7 @@ func _MultipleMethodsAutoGen_DeleteB_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_DeleteB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/DeleteB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).DeleteB(ctx, req.(*DeleteIntPointRequest)) @@ -1411,7 +1364,7 @@ func _MultipleMethodsAutoGen_DeleteSetA_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_DeleteSetA_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/DeleteSetA", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).DeleteSetA(ctx, req.(*DeleteIntPointsRequest)) @@ -1429,7 +1382,7 @@ func _MultipleMethodsAutoGen_DeleteSetB_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MultipleMethodsAutoGen_DeleteSetB_FullMethodName, + FullMethod: "/example.MultipleMethodsAutoGen/DeleteSetB", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MultipleMethodsAutoGenServer).DeleteSetB(ctx, req.(*DeleteIntPointsRequest)) diff --git a/example/feature_demo/demo_types.pb.go b/example/feature_demo/demo_types.pb.go index f401998a..925afbb9 100644 --- a/example/feature_demo/demo_types.pb.go +++ b/example/feature_demo/demo_types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc (unknown) +// protoc-gen-go v1.28.1 +// protoc v3.18.1 // source: feature_demo/demo_types.proto package example @@ -1225,59 +1225,59 @@ var file_feature_demo_demo_types_proto_rawDesc = []byte{ 0x2c, 0x0a, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x52, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3a, 0x06, 0xba, - 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x6a, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, + 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x6c, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x47, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, + 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x1a, 0x00, 0x52, 0x0c, 0x74, 0x65, 0x73, - 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, - 0x01, 0x22, 0x7a, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x47, 0x0a, 0x0c, - 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, - 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x06, 0xba, 0xb9, 0x19, 0x02, 0x2a, 0x00, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, - 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x7c, 0x0a, - 0x17, 0x54, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x72, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, - 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, - 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, - 0x04, 0x2a, 0x02, 0x50, 0x01, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, - 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x7a, 0x0a, 0x15, 0x54, - 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x43, - 0x6c, 0x65, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, - 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, 0x04, 0x2a, 0x02, 0x60, - 0x01, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, - 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x7b, 0x0a, 0x16, 0x54, 0x65, 0x73, 0x74, 0x41, - 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, - 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, - 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, 0x04, 0x2a, 0x02, 0x58, 0x01, 0x52, 0x0c, - 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, - 0x19, 0x02, 0x08, 0x01, 0x22, 0x3b, 0x0a, 0x12, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, - 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x6f, - 0x6d, 0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x73, 0x6f, 0x6d, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, - 0x01, 0x22, 0x53, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x49, 0x6e, 0x63, 0x6c, - 0x75, 0x64, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x45, 0x78, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x52, 0x05, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3a, 0x12, 0xba, 0xb9, 0x19, 0x0e, 0x08, 0x01, 0x12, 0x0a, 0x0a, 0x04, 0x55, 0x55, - 0x49, 0x44, 0x12, 0x02, 0x69, 0x64, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x62, 0x6c, 0x6f, 0x78, 0x6f, 0x70, 0x65, - 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x72, - 0x6d, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, - 0x65, 0x5f, 0x64, 0x65, 0x6d, 0x6f, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, 0x04, 0x1a, 0x02, 0x38, 0x00, 0x52, 0x0c, 0x74, + 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, + 0x02, 0x08, 0x01, 0x22, 0x7a, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, + 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x47, + 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x42, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x2a, 0x00, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, + 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, + 0x7c, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, + 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, + 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, + 0xb9, 0x19, 0x04, 0x2a, 0x02, 0x50, 0x01, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, + 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x7a, 0x0a, + 0x15, 0x54, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, + 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, + 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, 0x04, 0x2a, + 0x02, 0x60, 0x01, 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, + 0x63, 0x3a, 0x06, 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x7b, 0x0a, 0x16, 0x54, 0x65, 0x73, + 0x74, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x41, 0x70, 0x70, + 0x65, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, + 0x73, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x78, 0x61, 0x6d, + 0x70, 0x6c, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xba, 0xb9, 0x19, 0x04, 0x2a, 0x02, 0x58, 0x01, + 0x52, 0x0c, 0x74, 0x65, 0x73, 0x74, 0x54, 0x61, 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x3a, 0x06, + 0xba, 0xb9, 0x19, 0x02, 0x08, 0x01, 0x22, 0x3b, 0x0a, 0x12, 0x54, 0x65, 0x73, 0x74, 0x54, 0x61, + 0x67, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, + 0x73, 0x6f, 0x6d, 0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x73, 0x6f, 0x6d, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x06, 0xba, 0xb9, 0x19, + 0x02, 0x08, 0x01, 0x22, 0x53, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x49, 0x6e, + 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, + 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x52, 0x05, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3a, 0x12, 0xba, 0xb9, 0x19, 0x0e, 0x08, 0x01, 0x12, 0x0a, 0x0a, 0x04, + 0x55, 0x55, 0x49, 0x44, 0x12, 0x02, 0x69, 0x64, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x62, 0x6c, 0x6f, 0x78, 0x6f, + 0x70, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, + 0x6f, 0x72, 0x6d, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x65, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x5f, 0x64, 0x65, 0x6d, 0x6f, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/plugin/plugin.go b/plugin/plugin.go index 2d8000c5..5833f0c2 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -3070,8 +3070,10 @@ func (b *ORMBuilder) followsUpdateConventions(inType *protogen.Message, outType } } - // Check that type of field is a FieldMask - if string(field.Desc.Message().FullName()) == "google.protobuf.FieldMask" { + if field.Desc.Message() == nil { + fmt.Fprintf(os.Stderr, "field message is nil: %s.\n", field.Desc.FullName()) + // Check that type of field is a FieldMask + } else if string(field.Desc.Message().FullName()) == "google.protobuf.FieldMask" { // More than one mask in request is not allowed. if updateMask != "" { return false, "", "" @@ -3185,7 +3187,7 @@ func (b *ORMBuilder) followsListConventions(inType *protogen.Message, outType *p } } if !typeOrmable { - fmt.Fprintf(os.Stderr, `stub will be generated for %s since %s incoming message doesn't have "results" field of ormable type`, methodName, outType.Desc.Name()) + fmt.Fprintf(os.Stderr, `stub will be generated for %s since %s incoming message doesn't have "results" field of ormable type.`, methodName, outType.Desc.Name()) return false, "" }