github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Consolidate gogo/protobuf dependencies under our own protobuf package

Browse Source 
This would make gogo/protobuf migration easier.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-19 02:15:34 +00:00
parent 184883b0a6
commit 88c0c7201e
69 changed files with 133 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
protobuf/any.go
View File

@@ -17,11 +17,11 @@
package protobuf
import (
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
)
// FromAny converts typeurl.Any to github.com/gogo/protobuf/types.Any.
// FromAny converts typeurl.Any to github.com/containerd/containerd/protobuf/types.Any.
func FromAny(from typeurl.Any) *types.Any {
if from == nil {
return nil
@@ -37,7 +37,7 @@ func FromAny(from typeurl.Any) *types.Any {
}
}
// FromAny converts an arbitrary interface to github.com/gogo/protobuf/types.Any.
// FromAny converts an arbitrary interface to github.com/containerd/containerd/protobuf/types.Any.
func MarshalAnyToProto(from interface{}) (*types.Any, error) {
any, err := typeurl.MarshalAny(from)
if err != nil {