diff --git a/Makefile b/Makefile index 43393b6e..84629aca 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ setup: GOPATH=$(CURDIR)/_tools GOBIN=$(CURDIR)/_tools/bin go get github.com/twitchtv/retool ./_tools/bin/retool build -gen: +generate: # Recompile and install generator GOBIN="$$PWD/bin" go install -v ./protoc-gen-twirp GOBIN="$$PWD/bin" go install -v ./protoc-gen-twirp_python @@ -19,16 +19,16 @@ gen: test_all: setup test test_clients -test: gen +test: generate ./_tools/bin/errcheck ./internal/twirptest go test -race $(shell GO111MODULE=off go list ./... | grep -v /vendor/ | grep -v /_tools/) test_clients: test_go_client test_python_client -test_go_client: gen build/clientcompat build/gocompat +test_go_client: generate build/clientcompat build/gocompat ./build/clientcompat -client ./build/gocompat -test_python_client: gen build/clientcompat build/pycompat +test_python_client: generate build/clientcompat build/pycompat ./build/clientcompat -client ./build/pycompat diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go index 3cc87ab3..8c179391 100644 --- a/clientcompat/internal/clientcompat/clientcompat.twirp.go +++ b/clientcompat/internal/clientcompat/clientcompat.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: clientcompat.proto /* Package clientcompat is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: clientcompat.proto @@ -781,7 +781,7 @@ func (s *compatServiceServer) ServiceDescriptor() ([]byte, int) { } func (s *compatServiceServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -954,7 +954,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/clientcompat/pycompat/clientcompat_pb2_twirp.py b/clientcompat/pycompat/clientcompat_pb2_twirp.py index cabd67bb..8c274515 100644 --- a/clientcompat/pycompat/clientcompat_pb2_twirp.py +++ b/clientcompat/pycompat/clientcompat_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v7.2.0, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v8.0.0, DO NOT EDIT. # source: clientcompat.proto try: diff --git a/example/service.twirp.go b/example/service.twirp.go index 845e65bb..0f47ddff 100644 --- a/example/service.twirp.go +++ b/example/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: service.proto /* Package example is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: service.proto @@ -504,7 +504,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -677,7 +677,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/example/service_pb2_twirp.py b/example/service_pb2_twirp.py index eb3bd92a..0866e346 100644 --- a/example/service_pb2_twirp.py +++ b/example/service_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v7.2.0, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v8.0.0, DO NOT EDIT. # source: service.proto try: diff --git a/internal/gen/version.go b/internal/gen/version.go index 0ef79a23..28a2313f 100644 --- a/internal/gen/version.go +++ b/internal/gen/version.go @@ -13,4 +13,4 @@ package gen -const Version = "v7.2.0" +const Version = "v8.0.0" diff --git a/internal/twirptest/empty_service/empty_service.twirp.go b/internal/twirptest/empty_service/empty_service.twirp.go index ebab5202..e573b300 100644 --- a/internal/twirptest/empty_service/empty_service.twirp.go +++ b/internal/twirptest/empty_service/empty_service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: empty_service.proto /* Package empty_service is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: empty_service.proto @@ -216,7 +216,7 @@ func (s *emptyServer) ServiceDescriptor() ([]byte, int) { } func (s *emptyServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -389,7 +389,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/google_protobuf_imports/service.twirp.go b/internal/twirptest/google_protobuf_imports/service.twirp.go index 4b402505..4586fc2f 100644 --- a/internal/twirptest/google_protobuf_imports/service.twirp.go +++ b/internal/twirptest/google_protobuf_imports/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: service.proto /* Package google_protobuf_imports is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: service.proto @@ -505,7 +505,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -678,7 +678,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/importable/importable.twirp.go b/internal/twirptest/importable/importable.twirp.go index 7c9c1b1a..403ff0e6 100644 --- a/internal/twirptest/importable/importable.twirp.go +++ b/internal/twirptest/importable/importable.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: importable.proto /* Package importable is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. Test to make sure that importing other packages doesnt break @@ -505,7 +505,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -678,7 +678,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/importer/importer.twirp.go b/internal/twirptest/importer/importer.twirp.go index 65666a6b..38697daa 100644 --- a/internal/twirptest/importer/importer.twirp.go +++ b/internal/twirptest/importer/importer.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: importer.proto /* Package importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. Test to make sure that importing other packages doesnt break @@ -507,7 +507,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -680,7 +680,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/importer_local/importer_local.twirp.go b/internal/twirptest/importer_local/importer_local.twirp.go index 7bebe327..7a995575 100644 --- a/internal/twirptest/importer_local/importer_local.twirp.go +++ b/internal/twirptest/importer_local/importer_local.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: importer_local.proto /* Package importer_local is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: importer_local.proto @@ -502,7 +502,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -675,7 +675,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/importmapping/x/x.twirp.go b/internal/twirptest/importmapping/x/x.twirp.go index 5743c848..bcad85e9 100644 --- a/internal/twirptest/importmapping/x/x.twirp.go +++ b/internal/twirptest/importmapping/x/x.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: x/x.proto /* Package x is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: x/x.proto @@ -504,7 +504,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -677,7 +677,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/json_serialization/json_serialization.twirp.go b/internal/twirptest/json_serialization/json_serialization.twirp.go index 9dfcd90f..0e0861f0 100644 --- a/internal/twirptest/json_serialization/json_serialization.twirp.go +++ b/internal/twirptest/json_serialization/json_serialization.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: json_serialization.proto /* Package json_serialization is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: json_serialization.proto @@ -502,7 +502,7 @@ func (s *jSONSerializationServer) ServiceDescriptor() ([]byte, int) { } func (s *jSONSerializationServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -675,7 +675,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/multiple/multiple1.twirp.go b/internal/twirptest/multiple/multiple1.twirp.go index b2e6e0e9..ec8824b8 100644 --- a/internal/twirptest/multiple/multiple1.twirp.go +++ b/internal/twirptest/multiple/multiple1.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: multiple1.proto /* Package multiple is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. Multiple proto files in one package @@ -506,7 +506,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -679,7 +679,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/multiple/multiple2.twirp.go b/internal/twirptest/multiple/multiple2.twirp.go index df24ebd0..36746d1d 100644 --- a/internal/twirptest/multiple/multiple2.twirp.go +++ b/internal/twirptest/multiple/multiple2.twirp.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: multiple2.proto package multiple @@ -769,7 +769,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" diff --git a/internal/twirptest/no_package_name/no_package_name.twirp.go b/internal/twirptest/no_package_name/no_package_name.twirp.go index aa279e21..b9368fbf 100644 --- a/internal/twirptest/no_package_name/no_package_name.twirp.go +++ b/internal/twirptest/no_package_name/no_package_name.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: no_package_name.proto /* Package no_package_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: no_package_name.proto @@ -502,7 +502,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -675,7 +675,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go index 8fd88e27..cad31265 100644 --- a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go +++ b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: no_package_name_importer/no_package_name_importer.proto /* Package no_package_name_importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: no_package_name_importer/no_package_name_importer.proto @@ -504,7 +504,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -677,7 +677,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/service.twirp.go b/internal/twirptest/service.twirp.go index e8bf132e..ca0e0145 100644 --- a/internal/twirptest/service.twirp.go +++ b/internal/twirptest/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: service.proto /* Package twirptest is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: service.proto @@ -504,7 +504,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -677,7 +677,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go index 35a6eea8..4c7cfd51 100644 --- a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go +++ b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: service_method_same_name.proto /* Package service_method_same_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. It is generated from these files: service_method_same_name.proto @@ -502,7 +502,7 @@ func (s *echoServer) ServiceDescriptor() ([]byte, int) { } func (s *echoServer) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -675,7 +675,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil } diff --git a/internal/twirptest/snake_case_names/snake_case_names.twirp.go b/internal/twirptest/snake_case_names/snake_case_names.twirp.go index 837af179..5e099f1d 100644 --- a/internal/twirptest/snake_case_names/snake_case_names.twirp.go +++ b/internal/twirptest/snake_case_names/snake_case_names.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v7.2.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. // source: snake_case_names.proto /* Package snake_case_names is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.2.0. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. Test that protoc-gen-twirp follows the same behavior as protoc-gen-go for converting RPCs and message names from snake case to camel case. @@ -525,7 +525,7 @@ func (s *haberdasherV1Server) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherV1Server) ProtocGenTwirpVersion() string { - return "v7.2.0" + return "v8.0.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -698,7 +698,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v7.2.0") + req.Header.Set("Twirp-Version", "v8.0.0") return req, nil }