diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-06 06:24:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 06:24:19 -0400 |
| commit | 0b05ba808d5e2fc75ce10b23405bd5c05da2c331 (patch) | |
| tree | 7c489ea3aa926cda031d6aaa4a852e9e6e469d14 /vendor/github.com/golang/protobuf/proto/registry.go | |
| parent | 9b9bd9e0e7b72c91d8e60103e8da7999cefbc63d (diff) | |
| parent | 3de369fd696e6b98d00259d3c759d9b81df4e84b (diff) | |
| download | podman-0b05ba808d5e2fc75ce10b23405bd5c05da2c331.tar.gz podman-0b05ba808d5e2fc75ce10b23405bd5c05da2c331.tar.bz2 podman-0b05ba808d5e2fc75ce10b23405bd5c05da2c331.zip | |
Merge pull request #10241 from containers/dependabot/go_modules/github.com/onsi/gomega-1.12.0
Bump github.com/onsi/gomega from 1.11.0 to 1.12.0
Diffstat (limited to 'vendor/github.com/golang/protobuf/proto/registry.go')
| -rw-r--r-- | vendor/github.com/golang/protobuf/proto/registry.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/registry.go b/vendor/github.com/golang/protobuf/proto/registry.go index 1e7ff6420..066b4323b 100644 --- a/vendor/github.com/golang/protobuf/proto/registry.go +++ b/vendor/github.com/golang/protobuf/proto/registry.go @@ -13,6 +13,7 @@ import ( "strings" "sync" + "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/runtime/protoimpl" @@ -62,14 +63,7 @@ func FileDescriptor(s filePath) fileDescGZIP { // Find the descriptor in the v2 registry. var b []byte if fd, _ := protoregistry.GlobalFiles.FindFileByPath(s); fd != nil { - if fd, ok := fd.(interface{ ProtoLegacyRawDesc() []byte }); ok { - b = fd.ProtoLegacyRawDesc() - } else { - // TODO: Use protodesc.ToFileDescriptorProto to construct - // a descriptorpb.FileDescriptorProto and marshal it. - // However, doing so causes the proto package to have a dependency - // on descriptorpb, leading to cyclic dependency issues. - } + b, _ = Marshal(protodesc.ToFileDescriptorProto(fd)) } // Locally cache the raw descriptor form for the file. |