Update golangci-lint for go 1.20

Fixes #240 Note that "allow-leading-space" is no longer supported as mentioned in golangci/golangci-lint#3063 (comment) Fix new warnings that are now reported. Signed-off-by: Marc Khouzam <[email protected]>
vmware-tanzu · Apr 30, 2023 · fa2c943 · fa2c943
1 parent 7ad6ce4
commit fa2c943
Show file tree

Hide file tree

Showing 29 changed files with 105 additions and 105 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -36,14 +36,16 @@ linters-settings:
     local-prefixes: github.com/vmware-tanzu
   govet:
     check-shadowing: true
-
   misspell:
     locale: US
   nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+  revive:
+    rules:
+      - name: unused-parameter
+        disabled: true
   whitespace:
     multi-func: true
 
@@ -144,8 +146,3 @@ run:
   skip-dirs:
     - fakes/
   timeout: 15m
-
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.46.0 # use the fixed version to not introduce new linters unexpectedly
diff --git a/cmd/plugin/builder/command/cli_compile.go b/cmd/plugin/builder/command/cli_compile.go
@@ -160,7 +160,7 @@ func Compile(compileArgs *PluginCompileArgs) error {
 	guard := make(chan struct{}, maxConcurrent)
 
 	// Mix up IDs so we don't always get the same set.
-	randSkew := rand.Intn(len(identifiers)) // nolint:gosec
+	randSkew := rand.Intn(len(identifiers)) //nolint:gosec
 	var wg sync.WaitGroup
 	plugins := make(chan cli.Plugin, len(files))
 	fatalErrors := make(chan errInfo, len(files))

diff --git a/cmd/plugin/builder/command/publish/helper_test.go b/cmd/plugin/builder/command/publish/helper_test.go
@@ -66,6 +66,7 @@ func convertVersionToStringArray(arrOsArchInfo []osArch) []string {
 	return oa
 }
 
+//nolint:unparam
 func createDummyArtifactDir(directoryBasePath, pluginName, recommendedVersion, description string, versions []string) {
 	var err error
 

diff --git a/cmd/plugin/builder/inventory/inventory_plugin_group_test.go b/cmd/plugin/builder/inventory/inventory_plugin_group_test.go
@@ -26,7 +26,7 @@ var _ = Describe("Unit tests for inventory plugin-group add", func() {
 	fakeImgpkgWrapper := &fakes.ImgpkgWrapper{}
 
 	// pullDBImageStub create new empty database with the table schemas created
-	pullDBImageStub := func(image, path string) error {
+	pullDBImageStub := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteDBFileName)
 		db := plugininventory.NewSQLiteInventory(dbFile, "")
 		err := db.CreateSchema()

diff --git a/cmd/plugin/builder/inventory/inventory_plugin_test.go b/cmd/plugin/builder/inventory/inventory_plugin_test.go
@@ -36,7 +36,7 @@ var _ = Describe("Unit tests for inventory plugin add", func() {
 	}
 
 	// pullDBImageStub create new empty database with the table schemas created
-	pullDBImageStub := func(image, path string) error {
+	pullDBImageStub := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteDBFileName)
 		db := plugininventory.NewSQLiteInventory(dbFile, "")
 		err := db.CreateSchema()
@@ -46,7 +46,7 @@ var _ = Describe("Unit tests for inventory plugin add", func() {
 	}
 
 	// pullDBImageStubWithPlugins create new database with the table schemas and foo plugin
-	pullDBImageStubWithPlugins := func(image, path string) error {
+	pullDBImageStubWithPlugins := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteDBFileName)
 		db := plugininventory.NewSQLiteInventory(dbFile, "")
 		err := db.CreateSchema()

diff --git a/cmd/plugin/builder/inventory_plugin.go b/cmd/plugin/builder/inventory_plugin.go
@@ -88,7 +88,7 @@ type inventoryPluginActivateDeactivateFlags struct {
 
 func newInventoryPluginActivateCmd() *cobra.Command {
 	pluginActivateCmd, flags := getActivateDeactivateBaseCmd()
-	pluginActivateCmd.Use = "activate" // nolint:goconst
+	pluginActivateCmd.Use = "activate" //nolint:goconst
 	pluginActivateCmd.Short = "Activate the existing plugin in the inventory database available on the remote repository"
 	pluginActivateCmd.Example = ""
 	pluginActivateCmd.RunE = func(cmd *cobra.Command, args []string) error {
@@ -108,7 +108,7 @@ func newInventoryPluginActivateCmd() *cobra.Command {
 
 func newInventoryPluginDeactivateCmd() *cobra.Command {
 	pluginDeactivateCmd, flags := getActivateDeactivateBaseCmd()
-	pluginDeactivateCmd.Use = "deactivate" // nolint:goconst
+	pluginDeactivateCmd.Use = "deactivate" //nolint:goconst
 	pluginDeactivateCmd.Short = "Deactivate the existing plugin in the inventory database available on the remote repository"
 	pluginDeactivateCmd.Example = ""
 	pluginDeactivateCmd.RunE = func(cmd *cobra.Command, args []string) error {
@@ -126,7 +126,7 @@ func newInventoryPluginDeactivateCmd() *cobra.Command {
 	return pluginDeactivateCmd
 }
 
-func getActivateDeactivateBaseCmd() (*cobra.Command, *inventoryPluginActivateDeactivateFlags) { // nolint:dupl
+func getActivateDeactivateBaseCmd() (*cobra.Command, *inventoryPluginActivateDeactivateFlags) { //nolint:dupl
 	var flags = &inventoryPluginActivateDeactivateFlags{}
 
 	var activateDeactivateCmd = &cobra.Command{}

diff --git a/cmd/plugin/builder/inventory_plugin_group.go b/cmd/plugin/builder/inventory_plugin_group.go
@@ -131,7 +131,7 @@ func newInventoryPluginGroupDeactivateCmd() *cobra.Command {
 	return pluginGroupDeactivateCmd
 }
 
-func getPluginGroupActivateDeactivateBaseCmd() (*cobra.Command, *inventoryPluginGroupActivateDeactivateFlags) { // nolint:dupl
+func getPluginGroupActivateDeactivateBaseCmd() (*cobra.Command, *inventoryPluginGroupActivateDeactivateFlags) { //nolint:dupl
 	var flags = &inventoryPluginGroupActivateDeactivateFlags{}
 
 	var activateDeactivateCmd = &cobra.Command{}

diff --git a/cmd/plugin/builder/template/plugintemplates/Makefile.tmpl b/cmd/plugin/builder/template/plugintemplates/Makefile.tmpl
@@ -6,7 +6,7 @@ include $(ROOT_DIR_RELATIVE)/plugin-tooling.mk
 TOOLS_DIR := tools
 TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
-GOLANGCI_LINT_VERSION := 1.49.0
+GOLANGCI_LINT_VERSION := 1.52.2
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) ## Lint the plugin

diff --git a/hack/tools/Makefile b/hack/tools/Makefile
@@ -21,7 +21,7 @@ BIN_DIR := bin
 
 GOIMPORTS_VERSION=0.1.12
 VALE_VERSION=2.20.1
-GOLANGCI_LINT_VERSION=1.46.0
+GOLANGCI_LINT_VERSION=1.52.2
 MISSPELL_VERSION=0.3.4
 CONTROLLER_TOOLS_VERSION=0.9.2
 IMGPKG_VERSION=v0.35.0

diff --git a/pkg/airgapped/plugin_bundle_test.go b/pkg/airgapped/plugin_bundle_test.go
@@ -155,7 +155,7 @@ imagesToCopy:
 
 	// downloadInventoryImageAndSaveFilesToDirStub fakes the image downloads and puts a database
 	// with the table schemas created to provided path
-	downloadInventoryImageAndSaveFilesToDirStub := func(image, path string) error {
+	downloadInventoryImageAndSaveFilesToDirStub := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteDBFileName)
 		err := utils.SaveFile(dbFile, []byte{})
 		Expect(err).ToNot(HaveOccurred())
@@ -175,7 +175,7 @@ imagesToCopy:
 
 	// downloadInventoryMetadataImageWithNoExistingPlugins fakes the image downloads and puts a database
 	// with the table schemas created to provided path
-	downloadInventoryMetadataImageWithNoExistingPlugins := func(image, path string) error {
+	downloadInventoryMetadataImageWithNoExistingPlugins := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteInventoryMetadataDBFileName)
 		err := utils.SaveFile(dbFile, []byte{})
 		Expect(err).ToNot(HaveOccurred())
@@ -189,7 +189,7 @@ imagesToCopy:
 
 	// downloadInventoryMetadataImageWithExistingPlugins fakes the image downloads and puts a database
 	// with the table schemas created to provided path
-	downloadInventoryMetadataImageWithExistingPlugins := func(image, path string) error {
+	downloadInventoryMetadataImageWithExistingPlugins := func(image, path string) error { //nolint:unparam
 		dbFile := filepath.Join(path, plugininventory.SQliteInventoryMetadataDBFileName)
 		err := utils.SaveFile(dbFile, []byte{})
 		Expect(err).ToNot(HaveOccurred())
@@ -208,7 +208,7 @@ imagesToCopy:
 	}
 
 	// copyImageToTarStub fakes the image downloads and creates a fake tar.gz file for images
-	copyImageToTarStub := func(image, tarfile string) error {
+	copyImageToTarStub := func(image, tarfile string) error { //nolint:unparam
 		_, err := os.Create(tarfile)
 		Expect(err).ToNot(HaveOccurred())
 		return nil

diff --git a/pkg/auth/csp/grpc.go b/pkg/auth/csp/grpc.go
@@ -62,11 +62,11 @@ type configSource struct {
 
 // Token fetches the token.
 func (c *configSource) Token() (*oauth2.Token, error) {
-	g, err := c.GetCurrentServer() // nolint:staticcheck // Deprecated
+	g, err := c.GetCurrentServer() //nolint:staticcheck // Deprecated
 	if err != nil {
 		return nil, err
 	}
-	if !g.IsGlobal() { // nolint:staticcheck // Deprecated
+	if !g.IsGlobal() { //nolint:staticcheck // Deprecated
 		return nil, fmt.Errorf("trying to fetch token for non global server")
 	}
 	if !IsExpired(g.GlobalOpts.Auth.Expiration) {

diff --git a/pkg/auth/csp/selfmanaged.go b/pkg/auth/csp/selfmanaged.go
@@ -95,6 +95,7 @@ func runLocalListener() error {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/callback", callbackHandler)
 	tokenExchange, tokenExchangeComplete = context.WithCancel(context.TODO())
+	//nolint:gosec
 	l := http.Server{
 		Addr:    "",
 		Handler: mux,

diff --git a/pkg/auth/tkg/cluster_pinniped_info.go b/pkg/auth/tkg/cluster_pinniped_info.go
@@ -4,6 +4,7 @@
 package tkgauth
 
 import (
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
@@ -59,7 +60,7 @@ func GetClusterInfoFromCluster(clusterAPIServerURL, configmapName string) (*clie
 
 	clusterAPIServerURL = strings.TrimRight(clusterAPIServerURL, " /")
 	clusterInfoURL := clusterAPIServerURL + fmt.Sprintf("/api/v1/namespaces/%s/configmaps/%s", KubePublicNamespace, configmapName)
-	req, _ := http.NewRequest("GET", clusterInfoURL, http.NoBody)
+	req, _ := http.NewRequestWithContext(context.Background(), "GET", clusterInfoURL, http.NoBody)
 	// To get the cluster ca certificate first time, we need to use skip verify the server certificate,
 	// all the later communications to cluster would be using CA after this call
 	clusterClient := &http.Client{
@@ -124,7 +125,7 @@ func GetPinnipedInfoFromCluster(clusterInfo *clientcmdapi.Cluster, discoveryPort
 		}
 	}
 	pinnipedInfoURL := endpoint + fmt.Sprintf("/api/v1/namespaces/%s/configmaps/pinniped-info", KubePublicNamespace)
-	req, _ := http.NewRequest("GET", pinnipedInfoURL, http.NoBody)
+	req, _ := http.NewRequestWithContext(context.Background(), "GET", pinnipedInfoURL, http.NoBody)
 	pool := x509.NewCertPool()
 	pool.AppendCertsFromPEM(clusterInfo.CertificateAuthorityData)
 	clusterClient := &http.Client{

diff --git a/pkg/auth/tkg/kube_config.go b/pkg/auth/tkg/kube_config.go
@@ -91,7 +91,6 @@ func KubeconfigWithPinnipedAuthLoginPlugin(endpoint string, options *KubeConfigO
 		return
 	}
 
-	mergeFilePath = ""
 	if options != nil && options.MergeFilePath != "" {
 		mergeFilePath = options.MergeFilePath
 	} else {

diff --git a/pkg/auth/wcp/discovery.go b/pkg/auth/wcp/discovery.go
@@ -5,6 +5,7 @@
 package wcp
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
@@ -22,7 +23,7 @@ const (
 func IsVSphereSupervisor(endpoint string, httpClient *http.Client) (bool, error) {
 	loginBannerURL := fmt.Sprintf("%s/wcp/loginbanner", endpoint)
 
-	req, _ := http.NewRequest("GET", loginBannerURL, http.NoBody)
+	req, _ := http.NewRequestWithContext(context.Background(), "GET", loginBannerURL, http.NoBody)
 
 	resp, err := httpClient.Do(req)
 	if err != nil {

diff --git a/pkg/command/config.go b/pkg/command/config.go
@@ -182,7 +182,7 @@ func setUnstableVersions(cfg *configtypes.ClientConfig, value string) error {
 		configtypes.AlphaUnstableVersions,
 		configtypes.ExperimentalUnstableVersions,
 		configtypes.NoUnstableVersions:
-		cfg.SetUnstableVersionSelector(optionKey) // nolint:staticcheck // Deprecated
+		cfg.SetUnstableVersionSelector(optionKey) //nolint:staticcheck // Deprecated
 	default:
 		return fmt.Errorf("unknown unstable-versions setting: %s; should be one of [all, none, alpha, experimental]", optionKey)
 	}
@@ -194,7 +194,7 @@ func setEdition(cfg *configtypes.ClientConfig, edition string) error {
 
 	switch editionOption {
 	case configtypes.EditionCommunity, configtypes.EditionStandard:
-		cfg.SetEditionSelector(editionOption) // nolint:staticcheck // Deprecated
+		cfg.SetEditionSelector(editionOption) //nolint:staticcheck // Deprecated
 	default:
 		return fmt.Errorf("unknown edition: %s; should be one of [%s, %s]", editionOption, configtypes.EditionStandard, configtypes.EditionCommunity)
 	}
@@ -260,9 +260,9 @@ var listServersCmd = &cobra.Command{
 		}
 
 		output := component.NewOutputWriter(cmd.OutOrStdout(), outputFormat, "Name", "Type", "Endpoint", "Path", "Context")
-		for _, server := range cfg.KnownServers { // nolint:staticcheck // Deprecated
+		for _, server := range cfg.KnownServers { //nolint:staticcheck // Deprecated
 			var endpoint, path, context string
-			if server.IsGlobal() { // nolint:staticcheck // Deprecated
+			if server.IsGlobal() { //nolint:staticcheck // Deprecated
 				endpoint = server.GlobalOpts.Endpoint
 			} else {
 				endpoint = server.ManagementClusterOpts.Endpoint
@@ -294,13 +294,13 @@ var deleteServersCmd = &cobra.Command{
 
 		if isAborted == nil {
 			log.Infof("Deleting entry for cluster %s", args[0])
-			serverExists, err := configlib.ServerExists(args[0]) // nolint:staticcheck // Deprecated
+			serverExists, err := configlib.ServerExists(args[0]) //nolint:staticcheck // Deprecated
 			if err != nil {
 				return err
 			}
 
 			if serverExists {
-				err := configlib.RemoveServer(args[0]) // nolint:staticcheck // Deprecated
+				err := configlib.RemoveServer(args[0]) //nolint:staticcheck // Deprecated
 				if err != nil {
 					return err
 				}

diff --git a/pkg/command/discovery_source.go b/pkg/command/discovery_source.go
@@ -108,7 +108,7 @@ func newListDiscoverySourceCmd() *cobra.Command {
 					}
 				}
 			} else {
-				server, err := configlib.GetCurrentServer() // nolint:staticcheck // Deprecated
+				server, err := configlib.GetCurrentServer() //nolint:staticcheck // Deprecated
 				if err == nil && server != nil {
 					outputFromDiscoverySources(server.DiscoverySources, common.PluginScopeContext, output)
 				}
@@ -300,8 +300,8 @@ func createRESTDiscoverySource(discoveryName, uri string) *configtypes.GenericRE
 
 func discoverySourceNameAndType(ds configtypes.PluginDiscovery) (string, string) {
 	switch {
-	case ds.GCP != nil: // nolint:staticcheck // Deprecated
-		return ds.GCP.Name, common.DiscoveryTypeGCP // nolint:staticcheck // Deprecated
+	case ds.GCP != nil: //nolint:staticcheck // Deprecated
+		return ds.GCP.Name, common.DiscoveryTypeGCP //nolint:staticcheck // Deprecated
 	case ds.Kubernetes != nil:
 		return ds.Kubernetes.Name, common.DiscoveryTypeKubernetes
 	case ds.Local != nil: