Merge pull request #3326 from helio/release-1.7-3242

[release-1.7] upgrade golangci-lint

Author: k8s-ci-robot

Makefile

@@ -81,7 +81,7 @@ ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-$(ENVSUBST_VER)
 
-GOLANGCI_LINT_VER := v1.50.0
+GOLANGCI_LINT_VER := v1.51.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

azure/regional_baseuri.go

@@ -24,7 +24,9 @@ import (
 	"github.com/pkg/errors"
 )
 
-type aliasAuth = Authorizer
+// aliasAuth helps to embed the interface Authorize since the Authorizer interface also defines an Authorizer method and
+// the compiler gets confused without a type alias (or renaming the method Authorizer).
+type aliasAuth Authorizer
 
 // baseURIAdapter wraps an azure.Authorizer and adds a region to the BaseURI. This is useful if you need to make direct
 // calls to a specific Azure region. One possible case is to avoid replication delay when listing resources within a

azure/services/privatedns/privatedns_test.go

@@ -89,15 +89,6 @@ var (
 		},
 	}
 
-	unmanagedTags = resources.TagsResource{
-		Properties: &resources.Tags{
-			Tags: map[string]*string{
-				"foo":       to.StringPtr("bar"),
-				"something": to.StringPtr("else"),
-			},
-		},
-	}
-
 	notDoneError  = azure.NewOperationNotDoneError(&infrav1.Future{Type: "resourceType", ResourceGroup: resourceGroup, Name: "resourceName"})
 	errFake       = errors.New("this is an error")
 	notFoundError = autorest.DetailedError{StatusCode: 404}

azure/services/virtualnetworks/virtualnetworks_test.go

@@ -43,14 +43,6 @@ var (
 		ClusterName:    "test-cluster",
 		AdditionalTags: map[string]string{"foo": "bar"},
 	}
-	managedVnet = network.VirtualNetwork{
-		ID:   to.StringPtr("/subscriptions/subscription/resourceGroups/test-group/providers/Microsoft.Network/virtualNetworks/test-vnet"),
-		Name: to.StringPtr("test-vnet"),
-		Tags: map[string]*string{
-			"foo": to.StringPtr("bar"),
-			"sigs.k8s.io_cluster-api-provider-azure_cluster_test-cluster": to.StringPtr("owned"),
-		},
-	}
 
 	managedTags = resources.TagsResource{
 		Properties: &resources.Tags{

hack/tools/tools.go

@@ -1,5 +1,5 @@
-//go:build tools
-// +build tools
+//go:build capztools
+// +build capztools
 
 /*
 Copyright 2020 The Kubernetes Authors.

scripts/go_install.sh

@@ -40,6 +40,6 @@ fi
 rm "${GOBIN}/${2}"* 2> /dev/null || true
 
 # install the golang module specified as the first argument
-go install -tags tools "${1}@${3}"
+go install -tags capztools "${1}@${3}"
 mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}"
 ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"