Enhance the gci lint (#859)

k8s-infra-cherrypick-robot · mkumatag · web-flow · commit 400e24d60636 · 2022-09-12T05:29:28.000-07:00
Co-authored-by: Manjunath A Kumatagi &lt;mkumatag@in.ibm.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -56,7 +56,16 @@ linters-settings:
     - '^ \+.*'
     - '^ ANCHOR.*'
   gci:
-    local-prefixes: "sigs.k8s.io/cluster-api-provider-ibmcloud"
+    sections:
+      - standard
+      - default
+      - prefix(github.com/IBM)
+      - prefix(k8s.io)
+      - prefix(sigs.k8s.io)
+      - prefix(sigs.k8s.io/cluster-api)
+      - prefix(sigs.k8s.io/cluster-api-provider-ibmcloud)
+      - blank
+      - dot
   importas:
     no-unaliased: true
     alias:
diff --git a/api/v1alpha3/conversion.go b/api/v1alpha3/conversion.go
@@ -18,9 +18,11 @@ package v1alpha3
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+
 	capiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 )
diff --git a/api/v1alpha3/groupversion_info.go b/api/v1alpha3/groupversion_info.go
@@ -21,6 +21,7 @@ package v1alpha3
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
diff --git a/api/v1alpha3/ibmvpccluster_types.go b/api/v1alpha3/ibmvpccluster_types.go
@@ -18,6 +18,7 @@ package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
diff --git a/api/v1alpha4/conversion.go b/api/v1alpha4/conversion.go
@@ -18,6 +18,7 @@ package v1alpha4
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+
 	capiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
diff --git a/api/v1alpha4/groupversion_info.go b/api/v1alpha4/groupversion_info.go
@@ -21,6 +21,7 @@ package v1alpha4
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
diff --git a/api/v1alpha4/ibmpowervs_conversion.go b/api/v1alpha4/ibmpowervs_conversion.go
@@ -18,9 +18,11 @@ package v1alpha4
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
-	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 )
 
diff --git a/api/v1alpha4/ibmpowervscluster_types.go b/api/v1alpha4/ibmpowervscluster_types.go
@@ -18,6 +18,7 @@ package v1alpha4
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
 )
 
diff --git a/api/v1alpha4/ibmvpc_conversion.go b/api/v1alpha4/ibmvpc_conversion.go
@@ -18,6 +18,7 @@ package v1alpha4
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
diff --git a/api/v1alpha4/ibmvpccluster_types.go b/api/v1alpha4/ibmvpccluster_types.go
@@ -18,6 +18,7 @@ package v1alpha4
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
 )
 
diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
@@ -21,6 +21,7 @@ package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
diff --git a/api/v1beta1/ibmpowervscluster_types.go b/api/v1beta1/ibmpowervscluster_types.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/api/v1beta1/ibmpowervscluster_webhook.go b/api/v1beta1/ibmpowervscluster_webhook.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmpowervsimage_types.go b/api/v1beta1/ibmpowervsimage_types.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/api/v1beta1/ibmpowervsimage_webhook.go b/api/v1beta1/ibmpowervsimage_webhook.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmpowervsmachine_types.go b/api/v1beta1/ibmpowervsmachine_types.go
@@ -19,6 +19,7 @@ package v1beta1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
 )
diff --git a/api/v1beta1/ibmpowervsmachine_webhook.go b/api/v1beta1/ibmpowervsmachine_webhook.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmpowervsmachinetemplate_webhook.go b/api/v1beta1/ibmpowervsmachinetemplate_webhook.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmvpccluster_types.go b/api/v1beta1/ibmvpccluster_types.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/api/v1beta1/ibmvpccluster_webhook.go b/api/v1beta1/ibmvpccluster_webhook.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmvpcmachine_webhook.go b/api/v1beta1/ibmvpcmachine_webhook.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/api/v1beta1/ibmvpcmachinetemplate_webhook.go b/api/v1beta1/ibmvpcmachinetemplate_webhook.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -20,14 +20,18 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/IBM/go-sdk-core/v5/core"
-	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+
+	"github.com/IBM/go-sdk-core/v5/core"
+	"github.com/IBM/vpc-go-sdk/vpcv1"
+
 	"k8s.io/klog/v2/klogr"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/vpc"
diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -19,16 +19,20 @@ package scope
 import (
 	"context"
 
-	"github.com/IBM/go-sdk-core/v5/core"
-	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+
+	"github.com/IBM/go-sdk-core/v5/core"
+	"github.com/IBM/vpc-go-sdk/vpcv1"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2/klogr"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/vpc"
diff --git a/cloud/scope/powervs_cluster.go b/cloud/scope/powervs_cluster.go
@@ -20,15 +20,19 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
+
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
-	"github.com/go-logr/logr"
-	"github.com/pkg/errors"
+
 	"k8s.io/klog/v2/klogr"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
diff --git a/cloud/scope/powervs_image.go b/cloud/scope/powervs_image.go
@@ -20,16 +20,20 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
+
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
-	"github.com/go-logr/logr"
-	"github.com/pkg/errors"
+
 	"k8s.io/klog/v2/klogr"
-	"sigs.k8s.io/cluster-api/util/patch"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"sigs.k8s.io/cluster-api/util/patch"
+
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
diff --git a/cloud/scope/powervs_machine.go b/cloud/scope/powervs_machine.go
@@ -23,22 +23,26 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
+
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/client/p_cloud_p_vm_instances"
 	"github.com/IBM-Cloud/power-go-client/power/models"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
-	"github.com/go-logr/logr"
-	"github.com/pkg/errors"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2/klogr"
 	"k8s.io/utils/pointer"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	capierrors "sigs.k8s.io/cluster-api/errors"
 	"sigs.k8s.io/cluster-api/util/patch"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
diff --git a/controllers/ibmpowervscluster_controller.go b/controllers/ibmpowervscluster_controller.go
@@ -23,18 +23,21 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/tools/record"
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/util"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"sigs.k8s.io/cluster-api/util"
+
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
diff --git a/controllers/ibmpowervsimage_controller.go b/controllers/ibmpowervsimage_controller.go
@@ -21,21 +21,25 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/IBM-Cloud/power-go-client/power/models"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+
+	"github.com/IBM-Cloud/power-go-client/power/models"
+
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	clusterv1util "sigs.k8s.io/cluster-api/util"
-	"sigs.k8s.io/cluster-api/util/conditions"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1util "sigs.k8s.io/cluster-api/util"
+	"sigs.k8s.io/cluster-api/util/conditions"
+
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
diff --git a/controllers/ibmpowervsmachine_controller.go b/controllers/ibmpowervsmachine_controller.go
diff --git a/controllers/ibmvpccluster_controller.go b/controllers/ibmvpccluster_controller.go
diff --git a/controllers/ibmvpcmachine_controller.go b/controllers/ibmvpcmachine_controller.go
diff --git a/main.go b/main.go
diff --git a/pkg/cloud/services/utils/accounts.go b/pkg/cloud/services/utils/accounts.go
diff --git a/pkg/record/record.go b/pkg/record/record.go
diff --git a/test/helpers/crd.go b/test/helpers/crd.go
diff --git a/test/helpers/envtest.go b/test/helpers/envtest.go
diff --git a/util/util.go b/util/util.go

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ package v1alpha3`
`21`	`21`
`22`	`22`	`import (`
`23`	`23`	`"k8s.io/apimachinery/pkg/runtime/schema"`
	`24`	`+`
`24`	`25`	`"sigs.k8s.io/controller-runtime/pkg/scheme"`
`25`	`26`	`)`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package v1alpha3`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
	`21`	`+`
`21`	`22`	`capiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"`
`22`	`23`	`)`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package v1alpha4`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`apiconversion "k8s.io/apimachinery/pkg/conversion"`
	`21`	`+`
`21`	`22`	`capiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"`
`22`	`23`	`capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"`
`23`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ package v1alpha4`
`21`	`21`
`22`	`22`	`import (`
`23`	`23`	`"k8s.io/apimachinery/pkg/runtime/schema"`
	`24`	`+`
`24`	`25`	`"sigs.k8s.io/controller-runtime/pkg/scheme"`
`25`	`26`	`)`
`26`	`27`