Merge pull request #45 from razo7/sort-imports-update

Sort Imports update
medik8s · May 8, 2023 · 933d5fe · 933d5fe
2 parents 9850421 + 16aa9f8
commit 933d5fe
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ OPM_VERSION ?= v1.26.2
 # See github.com/operator-framework/operator-sdk/releases for the last version
 OPERATOR_SDK_VERSION ?= v1.26.0
 # See https://github.com/slintes/sort-imports/releases for the last version
-SORT_IMPORTS_VERSION = v0.1.0
+SORT_IMPORTS_VERSION = v0.2.1
 # See https://github.com/onsi/ginkgo/releases for the last version
 GINKGO_VERSION ?= v1.16.5
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -171,13 +171,13 @@ test-imports: sort-imports
 
 # Sort imports
 fix-imports: sort-imports
-	$(SORT_IMPORTS) . -w
+	$(SORT_IMPORTS) -w .
 
 .PHONY: test
 test: test-no-verify verify-unchanged ## Generate and format code, run tests, generate manifests and bundle, and verify no uncommitted changes
 
 .PHONY: test-no-verify
-test-no-verify: manifests generate go-verify fmt vet envtest ginkgo # Generate and format code, and run tests
+test-no-verify: manifests generate go-verify fmt vet fix-imports envtest ginkgo # Generate and format code, and run tests
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(ENVTEST_DIR)/$(ENVTEST_VERSION) -p path)"  $(GINKGO) --v -r  --keepGoing -requireSuite -coverprofile cover.out ./controllers
 
 .PHONY: bundle-run

diff --git a/controllers/fenceagentsremediation_controller_test.go b/controllers/fenceagentsremediation_controller_test.go
@@ -31,7 +31,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
-	// "github.com/medik8s/fence-agents-remediation/pkg/cli"
 )
 
 const (

diff --git a/main.go b/main.go
@@ -36,10 +36,10 @@ import (
 
 	fenceagentsv1alpha1 "github.com/medik8s/fence-agents-remediation/api/v1alpha1"
 	"github.com/medik8s/fence-agents-remediation/controllers"
-	"github.com/medik8s/fence-agents-remediation/version"
 
 	//+kubebuilder:scaffold:imports
 	"github.com/medik8s/fence-agents-remediation/pkg/cli"
+	"github.com/medik8s/fence-agents-remediation/version"
 )
 
 var (

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -10,16 +10,17 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
-	configclient "github.com/openshift/client-go/config/clientset/versioned"
-	machineclient "github.com/openshift/machine-api-operator/pkg/generated/clientset/versioned/typed/machine/v1beta1"
-
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	configclient "github.com/openshift/client-go/config/clientset/versioned"
+	machineclient "github.com/openshift/machine-api-operator/pkg/generated/clientset/versioned/typed/machine/v1beta1"
+
+	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

diff --git a/test/e2e/far_e2e_test.go b/test/e2e/far_e2e_test.go
@@ -7,16 +7,17 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	configv1 "github.com/openshift/api/config/v1"
-
-	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
-	farUtils "github.com/medik8s/fence-agents-remediation/pkg/utils"
-	farE2eUtils "github.com/medik8s/fence-agents-remediation/test/e2e/utils"
 
 	corev1 "k8s.io/api/core/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	configv1 "github.com/openshift/api/config/v1"
+
+	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
+	farUtils "github.com/medik8s/fence-agents-remediation/pkg/utils"
+	farE2eUtils "github.com/medik8s/fence-agents-remediation/test/e2e/utils"
 )
 
 const (

diff --git a/test/e2e/utils/cluster.go b/test/e2e/utils/cluster.go
@@ -5,12 +5,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+
 	configv1 "github.com/openshift/api/config/v1"
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	machineclient "github.com/openshift/machine-api-operator/pkg/generated/clientset/versioned/typed/machine/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
+
+	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
 )
 
 const (