organizing imports

janus-idp · May 14, 2024 · e4fe3dc · e4fe3dc
1 parent 63a2c94
commit e4fe3dc
Show file tree

Hide file tree

Showing 41 changed files with 137 additions and 196 deletions.
diff --git a/controllers/backstage_controller.go b/controllers/backstage_controller.go
@@ -19,29 +19,22 @@ import (
 	"fmt"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	"k8s.io/apimachinery/pkg/types"
-
-	openshift "github.com/openshift/api/route/v1"
-
-	"k8s.io/apimachinery/pkg/api/meta"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	corev1 "k8s.io/api/core/v1"
-
 	appsv1 "k8s.io/api/apps/v1"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
-
-	bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	openshift "github.com/openshift/api/route/v1"
+
+	bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
 )
 
 var recNumber = 0

diff --git a/controllers/spec_preprocessor.go b/controllers/spec_preprocessor.go
@@ -18,12 +18,11 @@ import (
 	"context"
 	"fmt"
 
-	bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
-
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
 )
 
 // Add additional details to the Backstage Spec helping in making Backstage RuntimeObjects Model

diff --git a/integration_tests/cr-config_test.go b/integration_tests/cr-config_test.go
@@ -18,26 +18,19 @@ import (
 	"context"
 	"time"
 
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
-
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
-
-	corev1 "k8s.io/api/core/v1"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
-	appsv1 "k8s.io/api/apps/v1"
-
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
-	"k8s.io/apimachinery/pkg/types"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 var _ = When("create backstage with CR configured", func() {

diff --git a/integration_tests/default-config_test.go b/integration_tests/default-config_test.go
@@ -16,21 +16,18 @@ package integration_tests
 
 import (
 	"context"
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
 	corev1 "k8s.io/api/core/v1"
-
 	"k8s.io/apimachinery/pkg/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 var _ = When("create default backstage", func() {

diff --git a/integration_tests/matchers.go b/integration_tests/matchers.go
@@ -17,9 +17,10 @@ package integration_tests
 import (
 	"fmt"
 
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/onsi/gomega/format"
 	"github.com/onsi/gomega/types"
-	corev1 "k8s.io/api/core/v1"
 )
 
 // Matcher for Container VolumeMounts

diff --git a/integration_tests/rhdh-config_test.go b/integration_tests/rhdh-config_test.go
@@ -18,19 +18,16 @@ import (
 	"context"
 	"time"
 
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
 	appsv1 "k8s.io/api/apps/v1"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 var _ = When("create default backstage", func() {

diff --git a/integration_tests/route_test.go b/integration_tests/route_test.go
@@ -16,19 +16,18 @@ package integration_tests
 
 import (
 	"context"
-	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
 	"time"
 
-	openshift "github.com/openshift/api/route/v1"
-
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
-	"k8s.io/apimachinery/pkg/types"
+	openshift "github.com/openshift/api/route/v1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
 )
 
 var _ = When("create default backstage", func() {

diff --git a/integration_tests/suite_test.go b/integration_tests/suite_test.go
@@ -18,43 +18,34 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strconv"
-
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-
-	"k8s.io/utils/ptr"
-
-	openshift "github.com/openshift/api/route/v1"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
-	corev1 "k8s.io/api/core/v1"
-
 	"path/filepath"
+	"strconv"
 	"testing"
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	controller "redhat-developer/red-hat-developer-hub-operator/controllers"
-
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/rand"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
-
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	openshift "github.com/openshift/api/route/v1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"k8s.io/apimachinery/pkg/util/rand"
 
 	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	controller "redhat-developer/red-hat-developer-hub-operator/controllers"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/integration_tests/utils.go b/integration_tests/utils.go
@@ -24,8 +24,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	//. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	//. "github.com/onsi/ginkgo/v2"
 )
 
 func generateConfigMap(ctx context.Context, k8sClient client.Client, name, namespace string, data map[string]string) string {

diff --git a/main.go b/main.go
@@ -20,24 +20,21 @@ import (
 	"flag"
 	"os"
 
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/discovery"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
+	openshift "github.com/openshift/api/route/v1"
+
 	backstageiov1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
 	controller "redhat-developer/red-hat-developer-hub-operator/controllers"
-
-	openshift "github.com/openshift/api/route/v1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/pkg/model/appconfig.go b/pkg/model/appconfig.go
@@ -18,12 +18,11 @@ import (
 	"path/filepath"
 
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
 	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
-	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type AppConfigFactory struct{}

diff --git a/pkg/model/appconfig_test.go b/pkg/model/appconfig_test.go
@@ -16,17 +16,15 @@ package model
 
 import (
 	"context"
-
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"testing"
 
 	corev1 "k8s.io/api/core/v1"
-
-	"testing"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/stretchr/testify/assert"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 var (

diff --git a/pkg/model/configmapenvs.go b/pkg/model/configmapenvs.go
@@ -15,12 +15,12 @@
 package model
 
 import (
-	"redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 type ConfigMapEnvsFactory struct{}

diff --git a/pkg/model/configmapenvs_test.go b/pkg/model/configmapenvs_test.go
@@ -18,15 +18,13 @@ import (
 	"context"
 	"testing"
 
-	"k8s.io/utils/ptr"
-
 	corev1 "k8s.io/api/core/v1"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 
 	"github.com/stretchr/testify/assert"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
 )
 
 func TestDefaultConfigMapEnvFrom(t *testing.T) {

diff --git a/pkg/model/configmapfiles.go b/pkg/model/configmapfiles.go
@@ -16,12 +16,11 @@ package model
 
 import (
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
 	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
-	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type ConfigMapFilesFactory struct{}

diff --git a/pkg/model/configmapfiles_test.go b/pkg/model/configmapfiles_test.go
@@ -16,14 +16,13 @@ package model
 
 import (
 	"context"
-
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"testing"
-
 	"github.com/stretchr/testify/assert"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
 )
 
 var (

diff --git a/pkg/model/db-secret.go b/pkg/model/db-secret.go
@@ -17,11 +17,11 @@ package model
 import (
 	"strconv"
 
-	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
-	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
-
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
 )
 
 type DbSecretFactory struct{}