Merge pull request #1987 from sonasingh46/gci_linter

chore(golangci-lint): add gci linter and lint fix make target

Author: k8s-ci-robot

.golangci.yml

@@ -16,6 +16,7 @@ linters:
     - errcheck
     - errorlint
     - exportloopref
+    - gci
     - goconst
     - gocyclo
     - godot

Makefile

@@ -297,7 +297,11 @@ $(YQ_BIN): $(YQ) ## Building yq from the tools folder
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) lint-latest ## Lint codebase
-	$(GOLANGCI_LINT) run -v
+	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)
+
+.PHONY: lint-fix
+lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
+	GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint
 
 lint-full: $(GOLANGCI_LINT) ## Run slower linters to detect possible issues
 	$(GOLANGCI_LINT) run -v --fast=false

api/v1beta1/azurecluster_default_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/Azure/go-autorest/autorest/to"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

api/v1beta1/azurecluster_validation.go

@@ -22,12 +22,11 @@ import (
 	"reflect"
 	"regexp"
 
-	"k8s.io/utils/pointer"
-
 	valid "github.com/asaskevich/govalidator"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/utils/pointer"
 )
 
 const (

api/v1beta1/azurecluster_validation_test.go

@@ -19,11 +19,10 @@ package v1beta1
 import (
 	"testing"
 
-	"k8s.io/utils/pointer"
-
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/utils/pointer"
 )
 
 func TestClusterNameValidation(t *testing.T) {

api/v1beta1/azureimage_validation_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

api/v1beta1/azuremachine_default.go

@@ -21,9 +21,8 @@ import (
 
 	"golang.org/x/crypto/ssh"
 	"k8s.io/apimachinery/pkg/util/uuid"
-	ctrl "sigs.k8s.io/controller-runtime"
-
 	utilSSH "sigs.k8s.io/cluster-api-provider-azure/util/ssh"
+	ctrl "sigs.k8s.io/controller-runtime"
 )
 
 // SetDefaultSSHPublicKey sets the default SSHPublicKey for an AzureMachine.

api/v1beta1/azuremachine_default_test.go

@@ -21,9 +21,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/google/uuid"
-
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/google/uuid"
 	. "github.com/onsi/gomega"
 )
 

api/v1beta1/azuremachine_validation.go

@@ -20,9 +20,8 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/google/uuid"
-
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute"
+	"github.com/google/uuid"
 	"golang.org/x/crypto/ssh"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )

api/v1beta1/azuremachine_validation_test.go

@@ -23,11 +23,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/google/uuid"
-
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
-
+	"github.com/google/uuid"
 	. "github.com/onsi/gomega"
 	"golang.org/x/crypto/ssh"
 	"k8s.io/apimachinery/pkg/util/validation/field"