From 4bca3e76bf7ce1bbd685534ab0ac7eab799c60d0 Mon Sep 17 00:00:00 2001 From: Nguyen Quang Huy Date: Wed, 20 Feb 2019 16:58:45 +0700 Subject: [PATCH] Fix redundant import alias Because these package names are short and they are unique, it can not conflict. So the import aliases that can be omitted and we should remove them. --- plugins/ipam/host-local/backend/allocator/config.go | 2 +- plugins/ipam/static/main.go | 2 +- plugins/meta/portmap/chain.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ipam/host-local/backend/allocator/config.go b/plugins/ipam/host-local/backend/allocator/config.go index 004054fe..b9686316 100644 --- a/plugins/ipam/host-local/backend/allocator/config.go +++ b/plugins/ipam/host-local/backend/allocator/config.go @@ -20,7 +20,7 @@ import ( "net" "github.com/containernetworking/cni/pkg/types" - types020 "github.com/containernetworking/cni/pkg/types/020" + "github.com/containernetworking/cni/pkg/types/020" ) // The top-level network config - IPAM plugins are passed the full configuration diff --git a/plugins/ipam/static/main.go b/plugins/ipam/static/main.go index 1b4842ff..7ebdab45 100644 --- a/plugins/ipam/static/main.go +++ b/plugins/ipam/static/main.go @@ -25,7 +25,7 @@ import ( "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/cni/pkg/version" - types020 "github.com/containernetworking/cni/pkg/types/020" + "github.com/containernetworking/cni/pkg/types/020" ) // The top-level network config - IPAM plugins are passed the full configuration diff --git a/plugins/meta/portmap/chain.go b/plugins/meta/portmap/chain.go index e275cb95..3d8dd2a1 100644 --- a/plugins/meta/portmap/chain.go +++ b/plugins/meta/portmap/chain.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/coreos/go-iptables/iptables" - shellwords "github.com/mattn/go-shellwords" + "github.com/mattn/go-shellwords" ) type chain struct {