From 968a195fe3c25adcd5dfc6f9be2671fbf211c32b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:39:01 -0400 Subject: [PATCH] Bump github.com/grpc-ecosystem/grpc-gateway/v2 from 2.16.0 to 2.16.1 (#659) Bumps [github.com/grpc-ecosystem/grpc-gateway/v2](https://github.com/grpc-ecosystem/grpc-gateway) from 2.16.0 to 2.16.1. - [Release notes](https://github.com/grpc-ecosystem/grpc-gateway/releases) - [Changelog](https://github.com/grpc-ecosystem/grpc-gateway/blob/main/.goreleaser.yml) - [Commits](https://github.com/grpc-ecosystem/grpc-gateway/compare/v2.16.0...v2.16.1) --- updated-dependencies: - dependency-name: github.com/grpc-ecosystem/grpc-gateway/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +-- go.sum | 12 +++--- .../grpc-gateway/v2/{LICENSE.txt => LICENSE} | 0 .../v2/internal/descriptor/BUILD.bazel | 2 +- .../internal/descriptor/apiconfig/BUILD.bazel | 6 +-- .../v2/protoc-gen-openapiv2/BUILD.bazel | 2 +- .../internal/genopenapi/BUILD.bazel | 14 +++---- .../internal/genopenapi/generator.go | 18 ++++++--- .../internal/genopenapi/template.go | 33 +++++++++------- .../v2/protoc-gen-openapiv2/main.go | 38 +++++++++++-------- vendor/modules.txt | 6 +-- 11 files changed, 78 insertions(+), 59 deletions(-) rename vendor/github.com/grpc-ecosystem/grpc-gateway/v2/{LICENSE.txt => LICENSE} (100%) diff --git a/go.mod b/go.mod index 85f9f6cb2..fa3dc6cb2 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 github.com/hashicorp/go-multierror v1.1.0 github.com/mackerelio/go-osstat v0.2.4 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 @@ -83,8 +83,8 @@ require ( golang.org/x/text v0.11.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230724170836-66ad5b6ff146 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230724170836-66ad5b6ff146 // indirect google.golang.org/grpc v1.56.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 093491eb0..0c0d74b71 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 h1:RoziI+96HlQWrbaVhgOOdFYUHtX81pwA6tCgDS9FNRo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1/go.mod h1:Rj8lEaVgLiPn1jTMVXEhATiZhuyXJq167bMYPbJM1CY= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= @@ -659,10 +659,10 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= -google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU= -google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto/googleapis/api v0.0.0-20230724170836-66ad5b6ff146 h1:P60zJj7Yxq1VhZIxpRO7A5lDFyy07D6Dqa+HCixuFBM= +google.golang.org/genproto/googleapis/api v0.0.0-20230724170836-66ad5b6ff146/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230724170836-66ad5b6ff146 h1:0PjALPu/U/4OVXKQM2P8b8NJGd4V+xbZSP+uuBJpGm0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230724170836-66ad5b6ff146/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE.txt b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE similarity index 100% rename from vendor/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE.txt rename to vendor/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/BUILD.bazel index 04553bc1a..ba0383f7c 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/BUILD.bazel @@ -20,8 +20,8 @@ go_library( "//internal/httprule", "//protoc-gen-openapiv2/options", "@com_github_golang_glog//:glog", - "@go_googleapis//google/api:annotations_go_proto", "@in_gopkg_yaml_v3//:yaml_v3", + "@org_golang_google_genproto_googleapis_api//annotations", "@org_golang_google_protobuf//compiler/protogen", "@org_golang_google_protobuf//encoding/protojson", "@org_golang_google_protobuf//proto", diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig/BUILD.bazel index 9fe7533ca..5ed535fb6 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig/BUILD.bazel @@ -9,9 +9,7 @@ proto_library( srcs = [ "apiconfig.proto", ], - deps = [ - "@go_googleapis//google/api:annotations_proto", - ], + deps = ["@googleapis//google/api:http_proto"], ) go_proto_library( @@ -19,7 +17,7 @@ go_proto_library( compilers = ["//:go_apiv2"], importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig", proto = ":apiconfig_proto", - deps = ["@go_googleapis//google/api:annotations_go_proto"], + deps = ["@org_golang_google_genproto_googleapis_api//annotations"], ) go_library( diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/BUILD.bazel index 6ef372c5a..dedd52446 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//internal/descriptor", "//protoc-gen-openapiv2/internal/genopenapi", "//utilities", - "@com_github_golang_glog//:glog", + "@org_golang_google_grpc//grpclog", "@org_golang_google_protobuf//proto", "@org_golang_google_protobuf//types/pluginpb", ], diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/BUILD.bazel index a98cea100..30b2f4e95 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/BUILD.bazel @@ -20,13 +20,13 @@ go_library( "//internal/descriptor", "//internal/generator", "//protoc-gen-openapiv2/options", - "@com_github_golang_glog//:glog", "@com_github_golang_protobuf//descriptor:go_default_library_gen", - "@go_googleapis//google/api:annotations_go_proto", - "@go_googleapis//google/api:visibility_go_proto", - "@go_googleapis//google/rpc:status_go_proto", + "@com_github_golang_protobuf//ptypes/any", "@in_gopkg_yaml_v3//:yaml_v3", - "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@org_golang_google_genproto_googleapis_api//annotations", + "@org_golang_google_genproto_googleapis_api//visibility", + "@org_golang_google_genproto_googleapis_rpc//status", + "@org_golang_google_grpc//grpclog", "@org_golang_google_protobuf//encoding/protojson", "@org_golang_google_protobuf//proto", "@org_golang_google_protobuf//types/descriptorpb", @@ -57,9 +57,9 @@ go_test( "//protoc-gen-openapiv2/options", "//runtime", "@com_github_google_go_cmp//cmp", - "@go_googleapis//google/api:annotations_go_proto", - "@go_googleapis//google/api:visibility_go_proto", "@in_gopkg_yaml_v3//:yaml_v3", + "@org_golang_google_genproto_googleapis_api//annotations", + "@org_golang_google_genproto_googleapis_api//visibility", "@org_golang_google_protobuf//encoding/protojson", "@org_golang_google_protobuf//encoding/prototext", "@org_golang_google_protobuf//proto", diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/generator.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/generator.go index f6b3c27bf..b2ed7bd34 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/generator.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/generator.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - "github.com/golang/glog" anypb "github.com/golang/protobuf/ptypes/any" "github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor" gen "github.com/grpc-ecosystem/grpc-gateway/v2/internal/generator" openapi_options "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" statuspb "google.golang.org/genproto/googleapis/rpc/status" + "google.golang.org/grpc/grpclog" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" @@ -322,10 +322,14 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*descriptor.Response var openapis []*wrapper for _, file := range targets { - glog.V(1).Infof("Processing %s", file.GetName()) + if grpclog.V(1) { + grpclog.Infof("Processing %s", file.GetName()) + } swagger, err := applyTemplate(param{File: file, reg: g.reg}) if errors.Is(err, errNoTargetService) { - glog.V(1).Infof("%s: %v", file.GetName(), err) + if grpclog.V(1) { + grpclog.Infof("%s: %v", file.GetName(), err) + } continue } if err != nil { @@ -344,7 +348,9 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*descriptor.Response return nil, fmt.Errorf("failed to encode OpenAPI for %s: %w", g.reg.GetMergeFileName(), err) } files = append(files, f) - glog.V(1).Infof("New OpenAPI file will emit") + if grpclog.V(1) { + grpclog.Infof("New OpenAPI file will emit") + } } else { for _, file := range openapis { f, err := encodeOpenAPI(file, g.format) @@ -352,7 +358,9 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*descriptor.Response return nil, fmt.Errorf("failed to encode OpenAPI for %s: %w", file.fileName, err) } files = append(files, f) - glog.V(1).Infof("New OpenAPI file will emit") + if grpclog.V(1) { + grpclog.Infof("New OpenAPI file will emit") + } } } return files, nil diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/template.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/template.go index 056d33ef2..01ef460af 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/template.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi/template.go @@ -17,12 +17,12 @@ import ( "text/template" "time" - "github.com/golang/glog" "github.com/grpc-ecosystem/grpc-gateway/v2/internal/casing" "github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor" openapi_options "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" "google.golang.org/genproto/googleapis/api/annotations" "google.golang.org/genproto/googleapis/api/visibility" + "google.golang.org/grpc/grpclog" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/descriptorpb" @@ -328,6 +328,7 @@ func nestedQueryParams(message *descriptor.Message, field *descriptor.Field, pre Pattern: schema.Pattern, Required: required, extensions: schema.extensions, + Enum: schema.Enum, } if param.Type == "array" { param.CollectionFormat = "multi" @@ -420,7 +421,7 @@ func findServicesMessagesAndEnumerations(s []*descriptor.Service, reg *descripto swgReqName, ok := fullyQualifiedNameToOpenAPIName(meth.RequestType.FQMN(), reg) if !ok { - glog.Errorf("couldn't resolve OpenAPI name for FQMN %q", meth.RequestType.FQMN()) + grpclog.Errorf("couldn't resolve OpenAPI name for FQMN %q", meth.RequestType.FQMN()) continue } if _, ok := refs[fmt.Sprintf("#/definitions/%s", swgReqName)]; ok { @@ -432,7 +433,7 @@ func findServicesMessagesAndEnumerations(s []*descriptor.Service, reg *descripto swgRspName, ok := fullyQualifiedNameToOpenAPIName(meth.ResponseType.FQMN(), reg) if !ok && !skipRenderingRef(meth.ResponseType.FQMN()) { - glog.Errorf("couldn't resolve OpenAPI name for FQMN %q", meth.ResponseType.FQMN()) + grpclog.Errorf("couldn't resolve OpenAPI name for FQMN %q", meth.ResponseType.FQMN()) continue } @@ -1059,7 +1060,7 @@ func partsToRegexpMap(parts []string) map[string]string { regExps := make(map[string]string) for _, part := range parts { if strings.Contains(part, "/") { - glog.Warningf("Path parameter %q contains '/', which is not supported in OpenAPI", part) + grpclog.Warningf("Path parameter %q contains '/', which is not supported in OpenAPI", part) } if submatch := canRegexp.FindStringSubmatch(part); len(submatch) > 2 { if strings.HasPrefix(submatch[2], "=") { // this part matches the standard and should be made into a regular expression @@ -1091,7 +1092,7 @@ func renderServiceTags(services []*descriptor.Service, reg *descriptor.Registry) opts, err := getServiceOpenAPIOption(reg, svc) if err != nil { - glog.Error(err) + grpclog.Error(err) return nil } if opts != nil { @@ -1225,7 +1226,7 @@ func renderServices(services []*descriptor.Service, paths openapiPathsObject, re pathParamName := fc.GetPathParamName() if pathParamName != "" && pathParamName != parameterString { pathParamNames["{"+parameterString+"}"] = "{" + pathParamName + "}" - parameterString = pathParamName + parameterString, _, _ = strings.Cut(pathParamName, "=") } } parameters = append(parameters, openapiParameterObject{ @@ -1278,7 +1279,7 @@ func renderServices(services []*descriptor.Service, paths openapiPathsObject, re } else { schema = messageSchema if schema.Properties == nil || len(*schema.Properties) == 0 { - glog.Warningf("created a body with 0 properties in the message, this might be unintended: %s", *meth.RequestType) + grpclog.Warningf("created a body with 0 properties in the message, this might be unintended: %s", *meth.RequestType) } } } @@ -1349,7 +1350,7 @@ func renderServices(services []*descriptor.Service, paths openapiPathsObject, re // Without a path parameter, there is nothing to vary to support multiple mappings of the same path/method. // Previously this did not log an error and only overwrote the mapping, we now log the error but // still overwrite the mapping - glog.Errorf("Duplicate mapping for path %s %s", b.HTTPMethod, path) + grpclog.Errorf("Duplicate mapping for path %s %s", b.HTTPMethod, path) } else { newPathCount := 0 var newPath string @@ -1729,7 +1730,7 @@ func applyTemplate(p param) (*openapiSwaggerObject, error) { messages[swgRef] = runtimeError } else { // just in case there is an error looking up runtimeError - glog.Error(err) + grpclog.Error(err) } } @@ -2276,6 +2277,9 @@ func enumValueProtoComments(reg *descriptor.Registry, enum *descriptor.Enum) str protoPath := protoPathIndex(reflect.TypeOf((*descriptorpb.EnumDescriptorProto)(nil)), "Value") var comments []string for idx, value := range enum.GetValue() { + if reg.GetOmitEnumDefaultValue() && value.GetNumber() == 0 { + continue + } if !isVisible(getEnumValueVisibilityOption(value), reg) { continue } @@ -2767,6 +2771,9 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option if len(j.GetEnum()) == 0 { s.Items.Enum = nil } + if j.GetFormat() != "" { + s.Items.Format = j.GetFormat() + } } else { s.MaxLength = j.GetMaxLength() s.MinLength = j.GetMinLength() @@ -2790,6 +2797,9 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option if len(j.GetEnum()) == 0 { s.Enum = nil } + if j.GetFormat() != "" { + s.Format = j.GetFormat() + } } s.MaxItems = j.GetMaxItems() s.MinItems = j.GetMinItems() @@ -2807,9 +2817,6 @@ func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_option if j.GetExample() != "" { s.Example = RawExample(j.GetExample()) } - if j.GetFormat() != "" { - s.Format = j.GetFormat() - } } func updateSwaggerObjectFromFieldBehavior(s *openapiSchemaObject, j []annotations.FieldBehavior, reg *descriptor.Registry, field *descriptor.Field) { @@ -2925,7 +2932,7 @@ func addCustomRefs(d openapiDefinitionsObject, reg *descriptor.Registry, refs re for ref := range refs { swgName, swgOk := fullyQualifiedNameToOpenAPIName(ref, reg) if !swgOk { - glog.Errorf("can't resolve OpenAPI name from CustomRef %q", ref) + grpclog.Errorf("can't resolve OpenAPI name from CustomRef %q", ref) continue } if _, ok := d[swgName]; ok { diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/main.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/main.go index fa19f1c91..e7fa7f74b 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/main.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/main.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/golang/glog" "github.com/grpc-ecosystem/grpc-gateway/v2/internal/codegenerator" "github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor" "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/internal/genopenapi" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" + "google.golang.org/grpc/grpclog" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/pluginpb" ) @@ -56,7 +56,6 @@ var ( func main() { flag.Parse() - defer glog.Flush() if *versionFlag { fmt.Printf("Version %v, commit %v, built at %v\n", version, commit, date) @@ -64,26 +63,31 @@ func main() { } reg := descriptor.NewRegistry() - - glog.V(1).Info("Processing code generator request") + if grpclog.V(1) { + grpclog.Info("Processing code generator request") + } f := os.Stdin if *file != "-" { var err error f, err = os.Open(*file) if err != nil { - glog.Fatal(err) + grpclog.Fatal(err) } } - glog.V(1).Info("Parsing code generator request") + if grpclog.V(1) { + grpclog.Info("Parsing code generator request") + } req, err := codegenerator.ParseRequest(f) if err != nil { - glog.Fatal(err) + grpclog.Fatal(err) + } + if grpclog.V(1) { + grpclog.Info("Parsed code generator request") } - glog.V(1).Info("Parsed code generator request") pkgMap := make(map[string]string) if req.Parameter != nil { if err := parseReqParam(req.GetParameter(), flag.CommandLine, pkgMap); err != nil { - glog.Fatalf("Error parsing flags: %v", err) + grpclog.Fatalf("Error parsing flags: %v", err) } } @@ -95,7 +99,7 @@ func main() { flag.Visit(func(f *flag.Flag) { if f.Name == "allow_repeated_fields_in_body" { - glog.Warning("The `allow_repeated_fields_in_body` flag is deprecated and will always behave as `true`.") + grpclog.Warning("The `allow_repeated_fields_in_body` flag is deprecated and will always behave as `true`.") } }) @@ -107,9 +111,9 @@ func main() { namingStrategy := *openAPINamingStrategy if *useFQNForOpenAPIName { if namingStrategy != "" { - glog.Fatal("The deprecated `fqn_for_openapi_name` flag must remain unset if `openapi_naming_strategy` is set.") + grpclog.Fatal("The deprecated `fqn_for_openapi_name` flag must remain unset if `openapi_naming_strategy` is set.") } - glog.Warning("The `fqn_for_openapi_name` flag is deprecated. Please use `openapi_naming_strategy=fqn` instead.") + grpclog.Warning("The `fqn_for_openapi_name` flag is deprecated. Please use `openapi_naming_strategy=fqn` instead.") namingStrategy = "fqn" } else if namingStrategy == "" { namingStrategy = "legacy" @@ -183,13 +187,15 @@ func main() { for _, target := range req.FileToGenerate { f, err := reg.LookupFile(target) if err != nil { - glog.Fatal(err) + grpclog.Fatal(err) } targets = append(targets, f) } out, err := g.Generate(targets) - glog.V(1).Info("Processed code generator request") + if grpclog.V(1) { + grpclog.Info("Processed code generator request") + } if err != nil { emitError(err) return @@ -214,10 +220,10 @@ func emitError(err error) { func emitResp(resp *pluginpb.CodeGeneratorResponse) { buf, err := proto.Marshal(resp) if err != nil { - glog.Fatal(err) + grpclog.Fatal(err) } if _, err := os.Stdout.Write(buf); err != nil { - glog.Fatal(err) + grpclog.Fatal(err) } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 8353bacde..5f8784684 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/googleapis/gax-go/v2/internal # github.com/gorilla/mux v1.8.0 ## explicit; go 1.12 github.com/gorilla/mux -# github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 +# github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 ## explicit; go 1.17 github.com/grpc-ecosystem/grpc-gateway/v2/internal/casing github.com/grpc-ecosystem/grpc-gateway/v2/internal/codegenerator @@ -403,12 +403,12 @@ google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 ## explicit; go 1.19 google.golang.org/genproto/internal -# google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 +# google.golang.org/genproto/googleapis/api v0.0.0-20230724170836-66ad5b6ff146 ## explicit; go 1.19 google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/api/visibility -# google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 +# google.golang.org/genproto/googleapis/rpc v0.0.0-20230724170836-66ad5b6ff146 ## explicit; go 1.19 google.golang.org/genproto/googleapis/rpc/code google.golang.org/genproto/googleapis/rpc/errdetails