diff --git a/daemon/container_operations.go b/daemon/container_operations.go index 909c7ccb27..dc4654f146 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -801,7 +801,7 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName return nil } -func updateJoinInfo(networkSettings *network.Settings, n libnetwork.Network, ep libnetwork.Endpoint) error { // nolint: interfacer +func updateJoinInfo(networkSettings *network.Settings, n libnetwork.Network, ep libnetwork.Endpoint) error { if ep == nil { return errors.New("invalid enppoint whhile building portmap info") } diff --git a/daemon/metrics.go b/daemon/metrics.go index 20030c4270..ec633d6cd7 100644 --- a/daemon/metrics.go +++ b/daemon/metrics.go @@ -143,7 +143,7 @@ type metricsPlugin interface { StopMetrics() error } -func makePluginAdapter(p plugingetter.CompatPlugin) (metricsPlugin, error) { // nolint: interfacer +func makePluginAdapter(p plugingetter.CompatPlugin) (metricsPlugin, error) { if pc, ok := p.(plugingetter.PluginWithV1Client); ok { return &metricsPluginAdapter{pc.Client(), p.Name()}, nil } diff --git a/distribution/pull_v1.go b/distribution/pull_v1.go index c2c897dc1c..b244bb9cdc 100644 --- a/distribution/pull_v1.go +++ b/distribution/pull_v1.go @@ -13,7 +13,6 @@ import ( "time" "github.com/docker/distribution/reference" - "github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/transport" "github.com/docker/docker/distribution/metadata" "github.com/docker/docker/distribution/xfer" @@ -70,9 +69,7 @@ func (p *v1Puller) Pull(ctx context.Context, ref reference.Named, _ *specs.Platf return nil } -// Note use auth.Scope rather than reference.Named due to this warning causing Jenkins CI to fail: -// warning: ref can be github.com/docker/docker/vendor/github.com/docker/distribution/registry/client/auth.Scope (interfacer) -func (p *v1Puller) pullRepository(ctx context.Context, ref auth.Scope) error { +func (p *v1Puller) pullRepository(ctx context.Context, ref reference.Named) error { progress.Message(p.config.ProgressOutput, "", "Pulling repository "+p.repoInfo.Name.Name()) tagged, isTagged := ref.(reference.NamedTagged) diff --git a/distribution/push_v2.go b/distribution/push_v2.go index 5281677734..8bc0edd4c1 100644 --- a/distribution/push_v2.go +++ b/distribution/push_v2.go @@ -649,7 +649,6 @@ func (bla byLikeness) Swap(i, j int) { } func (bla byLikeness) Len() int { return len(bla.arr) } -// nolint: interfacer func sortV2MetadataByLikenessAndAge(repoInfo reference.Named, hmacKey []byte, marr []metadata.V2Metadata) { // reverse the metadata array to shift the newest entries to the beginning for i := 0; i < len(marr)/2; i++ { diff --git a/hack/validate/gometalinter.json b/hack/validate/gometalinter.json index 81eb1017cb..e36dd73306 100644 --- a/hack/validate/gometalinter.json +++ b/hack/validate/gometalinter.json @@ -18,7 +18,6 @@ "golint", "gosimple", "ineffassign", - "interfacer", "unconvert", "vet" ], diff --git a/registry/auth.go b/registry/auth.go index 1f2043a0d9..3f58fc6cff 100644 --- a/registry/auth.go +++ b/registry/auth.go @@ -248,7 +248,6 @@ func (err PingResponseError) Error() string { // challenge manager for the supported authentication types and // whether v2 was confirmed by the response. If a response is received but // cannot be interpreted a PingResponseError will be returned. -// nolint: interfacer func PingV2Registry(endpoint *url.URL, transport http.RoundTripper) (challenge.Manager, bool, error) { var ( foundV2 = false