chore: fix import paths

Signed-off-by: Mark Sagi-Kazar <[email protected]>
banzaicloud · Apr 14, 2023 · c9ac9bf · c9ac9bf
1 parent 4a7ba6c
commit c9ac9bf
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 23 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -37,13 +37,13 @@ linters-settings:
     min-confidence: 0.1
   gocyclo:
     min-complexity: 40
-    gci:
-        sections:
-          - standard
-          - default
-          - prefix(github.com/banzaicloud/imps)
-    goimports:
-        local-prefixes: github.com/banzaicloud/imps
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/banzaicloud/imps)
+  goimports:
+    local-prefixes: github.com/banzaicloud/imps
   gocritic:
     disabled-checks:
       - ifElseChain

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -8,11 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/banzaicloud/imps/api/v1alpha1"
-	"github.com/banzaicloud/imps/controllers"
-	"github.com/banzaicloud/imps/internal/errorhandler"
-	"github.com/banzaicloud/imps/internal/log"
-	"github.com/banzaicloud/imps/pkg/ecr"
+	// +kubebuilder:scaffold:imports
 	"github.com/banzaicloud/operator-tools/pkg/reconciler"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -21,6 +17,12 @@ import (
 	logrintegration "logur.dev/integration/logr"
 	"logur.dev/logur"
 	ctrl "sigs.k8s.io/controller-runtime"
+
+	"github.com/banzaicloud/imps/api/v1alpha1"
+	"github.com/banzaicloud/imps/controllers"
+	"github.com/banzaicloud/imps/internal/errorhandler"
+	"github.com/banzaicloud/imps/internal/log"
+	"github.com/banzaicloud/imps/pkg/ecr"
 )
 
 var (

diff --git a/cmd/refresher/main.go b/cmd/refresher/main.go
@@ -7,10 +7,6 @@ import (
 	"time"
 
 	"emperror.dev/errors"
-	"github.com/banzaicloud/imps/controllers"
-	"github.com/banzaicloud/imps/internal/errorhandler"
-	"github.com/banzaicloud/imps/internal/log"
-	"github.com/banzaicloud/imps/pkg/ecr"
 	"github.com/banzaicloud/operator-tools/pkg/reconciler"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -20,6 +16,11 @@ import (
 	logrintegration "logur.dev/integration/logr"
 	"logur.dev/logur"
 	ctrl "sigs.k8s.io/controller-runtime"
+
+	"github.com/banzaicloud/imps/controllers"
+	"github.com/banzaicloud/imps/internal/errorhandler"
+	"github.com/banzaicloud/imps/internal/log"
+	"github.com/banzaicloud/imps/pkg/ecr"
 )
 
 var (

diff --git a/controllers/imagepullsecret_controller.go b/controllers/imagepullsecret_controller.go
@@ -19,8 +19,6 @@ import (
 	"time"
 
 	"emperror.dev/emperror"
-	"github.com/banzaicloud/imps/api/v1alpha1"
-	"github.com/banzaicloud/imps/internal/cron"
 	"github.com/banzaicloud/operator-tools/pkg/reconciler"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,6 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"github.com/banzaicloud/imps/api/v1alpha1"
+	"github.com/banzaicloud/imps/internal/cron"
 )
 
 // AlertingPolicyReconciler reconciles a AlertingPolicy object

diff --git a/controllers/imagepullsecret_reconciler.go b/controllers/imagepullsecret_reconciler.go
@@ -20,15 +20,16 @@ import (
 	"time"
 
 	"emperror.dev/errors"
-	"github.com/banzaicloud/imps/api/v1alpha1"
-	"github.com/banzaicloud/imps/pkg/pullsecrets"
 	"github.com/banzaicloud/operator-tools/pkg/reconciler"
 	corev1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"logur.dev/logur"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/banzaicloud/imps/api/v1alpha1"
+	"github.com/banzaicloud/imps/pkg/pullsecrets"
 )
 
 var requeueObject = ctrl.Result{

diff --git a/controllers/refresher_controller.go b/controllers/refresher_controller.go
@@ -20,8 +20,6 @@ import (
 
 	"emperror.dev/emperror"
 	"emperror.dev/errors"
-	"github.com/banzaicloud/imps/internal/cron"
-	"github.com/banzaicloud/imps/pkg/pullsecrets"
 	"github.com/banzaicloud/operator-tools/pkg/reconciler"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,6 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"github.com/banzaicloud/imps/internal/cron"
+	"github.com/banzaicloud/imps/pkg/pullsecrets"
 )
 
 // RefresherReconciler reconciles a AlertingPolicy object

diff --git a/pkg/pullsecrets/docker_config.go b/pkg/pullsecrets/docker_config.go
@@ -21,11 +21,12 @@ import (
 	"time"
 
 	"emperror.dev/errors"
-	"github.com/banzaicloud/imps/api/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/banzaicloud/imps/api/common"
 )
 
 func NewDockerRegistryConfig() common.DockerRegistryConfig {

diff --git a/pkg/pullsecrets/provider_ecr.go b/pkg/pullsecrets/provider_ecr.go
@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+
 	"github.com/banzaicloud/imps/api/common"
 	impsEcr "github.com/banzaicloud/imps/pkg/ecr"
 )