Deprecate golint and apply some changes from revive

.golangci.yml

@@ -77,9 +77,30 @@ linters-settings:
     #  2. you use go >= 1.10
     #  3. you do repeated runs (false for CI) or cache $GOPATH/pkg or `go env GOCACHE` dir in CI.
     use-installed-packages: false
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.8
+  revive:
+    confidence: 0.8
+    severity: warning
+    errorCode: 0
+    warningCode: 0
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: if-return
+      - name: increment-decrement
+      - name: var-naming
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: false
@@ -157,7 +178,7 @@ linters:
     - errcheck
     - gofmt
     - goimports
-    - golint
+    - revive
     - gosimple
     - govet
     - ineffassign

integration/tests/backwards_compat/backwards_compatibility_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package backwards_compat
 
 import (

integration/tests/before_active/createdeletebeforeactive_test.go

@@ -1,20 +1,21 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package before_active
 
 import (
 	"fmt"
 	"testing"
 
+	awseks "github.com/aws/aws-sdk-go/service/eks"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/matchers"
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	"github.com/weaveworks/eksctl/pkg/testutils"
-
-	awseks "github.com/aws/aws-sdk-go/service/eks"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 var params *tests.Params

integration/tests/cloudwatch_logging/cloudwatch_logging_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cloudwatch_logging
 
 import (
@@ -15,6 +16,7 @@ import (
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 
 	"github.com/pkg/errors"
+
 	"github.com/weaveworks/eksctl/pkg/testutils"
 
 	. "github.com/weaveworks/eksctl/integration/runner"

integration/tests/cluster_api/cluster_api_endpoints_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cluster_api
 
 import (

integration/tests/cluster_dns/cluster_dns_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cluster_dns
 
 import (
@@ -10,6 +11,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/utilities/kube"
 

integration/tests/dry_run/dry_run_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package dry_run
 
 import (
@@ -10,18 +11,17 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	. "github.com/weaveworks/eksctl/integration/runner"
 
+	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/eks"
 	"github.com/weaveworks/eksctl/pkg/testutils"
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
-
-	. "github.com/onsi/ginkgo"
 )
 
 var params *tests.Params

integration/tests/eks_connector/eks_connector_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package eks_connector_test
 
 import (
@@ -14,6 +15,7 @@ import (
 	awseks "github.com/aws/aws-sdk-go/service/eks"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"

integration/tests/instance_selector/instance_selector_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package instance_selector
 
 import (

integration/tests/quickstart_profiles_gen/quickstart_profiles_gen_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package quickstart_profiles_gen
 
 import (

integration/tests/unowned_cluster/unowned_cluster_test.go

@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package unowned_clusters
 
 import (
@@ -11,23 +12,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/service/kms"
-	"github.com/weaveworks/eksctl/pkg/eks"
-
-	cfn "github.com/aws/aws-sdk-go/service/cloudformation"
-
 	"github.com/aws/aws-sdk-go/aws"
-
-	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-
+	cfn "github.com/aws/aws-sdk-go/service/cloudformation"
 	awseks "github.com/aws/aws-sdk-go/service/eks"
-	. "github.com/weaveworks/eksctl/integration/runner"
-	"github.com/weaveworks/eksctl/integration/tests"
-	"github.com/weaveworks/eksctl/pkg/testutils"
-
+	"github.com/aws/aws-sdk-go/service/kms"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
+
+	. "github.com/weaveworks/eksctl/integration/runner"
+	"github.com/weaveworks/eksctl/integration/tests"
+	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/eks"
+	"github.com/weaveworks/eksctl/pkg/testutils"
 )
 
 var params *tests.Params

pkg/actions/identityproviders/wait.go

@@ -7,6 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/eks"
+
 	"github.com/weaveworks/eksctl/pkg/utils/waiters"
 )
 
@@ -38,8 +39,5 @@ func (m *Manager) waitForUpdate(
 		clusterName,
 	)
 
-	if err := waiters.Wait(clusterName, msg, acceptors, newRequest, timeout, nil); err != nil {
-		return err
-	}
-	return nil
+	return waiters.Wait(clusterName, msg, acceptors, newRequest, timeout, nil)
 }

pkg/actions/nodegroup/create.go

@@ -189,11 +189,7 @@ func (m *Manager) nodeCreationTasks(options CreateOpts, nodegroupFilter filter.N
 	}
 
 	taskTree.Append(allNodeGroupTasks)
-	if err := m.init.DoAllNodegroupStackTasks(taskTree, meta.Region, meta.Name); err != nil {
-		return err
-	}
-
-	return nil
+	return m.init.DoAllNodegroupStackTasks(taskTree, meta.Region, meta.Name)
 }
 
 func (m *Manager) postNodeCreationTasks(clientSet kubernetes.Interface, options CreateOpts) error {
@@ -307,9 +303,5 @@ func loadVPCFromConfig(provider api.ClusterProvider, cfg *api.ClusterConfig) err
 		return err
 	}
 
-	if err := cfg.CanUseForPrivateNodeGroups(); err != nil {
-		return err
-	}
-
-	return nil
+	return cfg.CanUseForPrivateNodeGroups()
 }

pkg/actions/repo/enable.go

@@ -17,14 +17,15 @@ import (
 	portforward "github.com/justinbarrick/go-k8s-portforward"
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
-	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	"github.com/weaveworks/eksctl/pkg/git"
-	"github.com/weaveworks/eksctl/pkg/gitops/deploykey"
-	"github.com/weaveworks/eksctl/pkg/kubernetes"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+
+	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/git"
+	"github.com/weaveworks/eksctl/pkg/gitops/deploykey"
+	"github.com/weaveworks/eksctl/pkg/kubernetes"
 )
 
 const (
@@ -215,10 +216,7 @@ func (fi *Installer) addFilesToRepo() error {
 	}
 
 	// git push
-	if err := fi.GitClient.Push(); err != nil {
-		return err
-	}
-	return nil
+	return fi.GitClient.Push()
 }
 
 func (fi *Installer) createFluxNamespaceIfMissing(manifestsMap map[string][]byte) error {

pkg/apis/eksctl.io/v1alpha5/addon.go

@@ -19,7 +19,7 @@ type Addon struct {
 	// AttachPolicy holds a policy document to attach
 	// +optional
 	AttachPolicy InlineDocument `json:"attachPolicy,omitempty"`
-	// ARN of the permissions boundary to associate
+	// ARN of the permissions' boundary to associate
 	// +optional
 	PermissionsBoundary string `json:"permissionsBoundary,omitempty"`
 	// WellKnownPolicies for attaching common IAM policies
@@ -41,11 +41,7 @@ func (a Addon) Validate() error {
 		return fmt.Errorf("name required")
 	}
 
-	if err := a.checkOnlyOnePolicyProviderIsSet(); err != nil {
-		return err
-	}
-
-	return nil
+	return a.checkOnlyOnePolicyProviderIsSet()
 }
 
 func (a Addon) checkOnlyOnePolicyProviderIsSet() error {

pkg/cfn/builder/managed_nodegroup.go

@@ -262,17 +262,17 @@ func validateLaunchTemplate(launchTemplateData *ec2.ResponseLaunchTemplateData,
 
 func getAMIType(ng *api.ManagedNodeGroup, instanceType string) string {
 	amiTypeMapping := map[string]struct {
-		X86_64 string
+		X86x64 string
 		GPU    string
 		ARM    string
 	}{
 		api.NodeImageFamilyAmazonLinux2: {
-			X86_64: eks.AMITypesAl2X8664,
+			X86x64: eks.AMITypesAl2X8664,
 			GPU:    eks.AMITypesAl2X8664Gpu,
 			ARM:    eks.AMITypesAl2Arm64,
 		},
 		api.NodeImageFamilyBottlerocket: {
-			X86_64: eks.AMITypesBottlerocketX8664,
+			X86x64: eks.AMITypesBottlerocketX8664,
 			ARM:    eks.AMITypesBottlerocketArm64,
 		},
 	}
@@ -288,7 +288,7 @@ func getAMIType(ng *api.ManagedNodeGroup, instanceType string) string {
 	case instanceutils.IsARMInstanceType(instanceType):
 		return amiType.ARM
 	default:
-		return amiType.X86_64
+		return amiType.X86x64
 	}
 }
 

pkg/cfn/builder/network_interfaces.go

@@ -39,7 +39,7 @@ func buildNetworkInterfaces(
 			return errors.Wrapf(err, "couldn't retrieve instance type description for %v", instanceTypes)
 		}
 
-		var numEFAs float64 = math.MaxFloat64
+		var numEFAs = math.MaxFloat64
 		for _, it := range info.InstanceTypes {
 			networkInfo := it.NetworkInfo
 			numEFAs = math.Min(float64(aws.Int64Value(networkInfo.MaximumNetworkCards)), numEFAs)

pkg/ctl/cmdutils/nodegroup.go

@@ -3,6 +3,7 @@ package cmdutils
 import (
 	"github.com/aws/aws-sdk-go/service/eks"
 	"github.com/kris-nova/logger"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/manager"
 )
@@ -21,11 +22,8 @@ func PopulateNodegroup(stackManager manager.StackManager, name string, cfg *api.
 		}
 		nodeGroupType = api.NodeGroupTypeUnowned
 	}
-	if err = PopulateNodegroupFromStack(nodeGroupType, name, cfg); err != nil {
-		return err
-	}
 
-	return nil
+	return PopulateNodegroupFromStack(nodeGroupType, name, cfg)
 }
 
 // PopulateNodegroupFromStack populates the nodegroup field of an api.ClusterConfig by type from its CF stack.