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

Avoid duplicate imports of github.com/gogo/protobuf/types

Browse Source 
Re-use the import aliased as `ptypes`.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
This commit is contained in:
Tobias Klauser 2020-03-10 09:41:03 +01:00
parent 4eb9d15dc6
commit a9bd451ab4
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@ -58,7 +58,6 @@ import (
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
snproxy "github.com/containerd/containerd/snapshots/proxy" snproxy "github.com/containerd/containerd/snapshots/proxy"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
ptypes "github.com/gogo/protobuf/types" ptypes "github.com/gogo/protobuf/types"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
@ -723,7 +722,7 @@ func (c *Client) Server(ctx context.Context) (ServerInfo, error) {
} }
c.connMu.Unlock() c.connMu.Unlock()
response, err := c.IntrospectionService().Server(ctx, &types.Empty{}) response, err := c.IntrospectionService().Server(ctx, &ptypes.Empty{})
if err != nil { if err != nil {
return ServerInfo{}, err return ServerInfo{}, err
} }

3
runtime/v2/runc/v1/service.go
View File

@ -45,7 +45,6 @@ import (
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/gogo/protobuf/types"
ptypes "github.com/gogo/protobuf/types" ptypes "github.com/gogo/protobuf/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -166,7 +165,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container
} }
if data, err := ioutil.ReadAll(os.Stdin); err == nil { if data, err := ioutil.ReadAll(os.Stdin); err == nil {
if len(data) > 0 { if len(data) > 0 {
var any types.Any var any ptypes.Any
if err := proto.Unmarshal(data, &any); err != nil { if err := proto.Unmarshal(data, &any); err != nil {
return "", err return "", err
} }

3
runtime/v2/runc/v2/service.go
View File

@ -48,7 +48,6 @@ import (
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/gogo/protobuf/types"
ptypes "github.com/gogo/protobuf/types" ptypes "github.com/gogo/protobuf/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -211,7 +210,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container
} }
if data, err := ioutil.ReadAll(os.Stdin); err == nil { if data, err := ioutil.ReadAll(os.Stdin); err == nil {
if len(data) > 0 { if len(data) > 0 {
var any types.Any var any ptypes.Any
if err := proto.Unmarshal(data, &any); err != nil { if err := proto.Unmarshal(data, &any); err != nil {
return "", err return "", err
} }