lint

maistra · Jan 9, 2024 · c2f7b71 · c2f7b71
1 parent 622d556
commit c2f7b71
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/components/dashboard/dashboard.go b/components/dashboard/dashboard.go
@@ -5,7 +5,6 @@ package dashboard
 import (
 	"context"
 	"fmt"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"path/filepath"
 	"strings"
 
@@ -18,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/common"

diff --git a/components/dashboard/servicemesh_setup.go b/components/dashboard/servicemesh_setup.go
@@ -1,14 +1,14 @@
 package dashboard
 
 import (
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"path"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dsci "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh"

diff --git a/components/kserve/kserve.go b/components/kserve/kserve.go
@@ -4,7 +4,6 @@ package kserve
 import (
 	"context"
 	"fmt"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"path/filepath"
 	"strings"
 
@@ -15,6 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
 	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/infrastructure/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"

diff --git a/controllers/dscinitialization/servicemesh_setup.go b/controllers/dscinitialization/servicemesh_setup.go
@@ -1,13 +1,13 @@
 package dscinitialization
 
 import (
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"path"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 	corev1 "k8s.io/api/core/v1"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh"

diff --git a/pkg/feature/builder.go b/pkg/feature/builder.go
@@ -1,7 +1,6 @@
 package feature
 
 import (
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"io/fs"
 
 	"github.com/pkg/errors"
@@ -13,6 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
 	v1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/infrastructure/v1"
 )
 

diff --git a/pkg/feature/initializer.go b/pkg/feature/initializer.go
@@ -2,9 +2,9 @@ package feature
 
 import (
 	"github.com/hashicorp/go-multierror"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 
 	v1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 )
 
 type FeaturesInitializer struct {

diff --git a/tests/integration/features/features_int_test.go b/tests/integration/features/features_int_test.go
@@ -44,7 +44,7 @@ var _ = Describe("preconditions", func() {
 			namespace = envtestutil.AppendRandomNameTo(testFeatureName)
 
 			dsciSpec := newDSCInitializationSpec(namespace)
-			origin := newOrigin(featurev1.DSCIType, "default")
+			origin := newOrigin("default")
 			var err error
 			testFeature, err = feature.CreateFeature(testFeatureName).
 				For(dsciSpec, origin).
@@ -90,7 +90,7 @@ var _ = Describe("preconditions", func() {
 
 		BeforeEach(func() {
 			dsciSpec = newDSCInitializationSpec("default")
-			origin = newOrigin(featurev1.DSCIType, "default")
+			origin = newOrigin("default")
 		})
 
 		It("should successfully check for existing CRD", func() {
@@ -145,7 +145,7 @@ var _ = Describe("feature trackers", func() {
 
 		BeforeEach(func() {
 			dsciSpec = newDSCInitializationSpec("default")
-			origin = newOrigin(featurev1.DSCIType, "default")
+			origin = newOrigin("default")
 		})
 
 		It("should indicate successful installation in FeatureTracker", func() {
@@ -251,9 +251,9 @@ func newDSCInitializationSpec(ns string) *dscv1.DSCInitializationSpec {
 	return &spec
 }
 
-func newOrigin(source, name string) featurev1.Origin {
+func newOrigin(name string) featurev1.Origin {
 	origin := featurev1.Origin{
-		Type: source,
+		Type: featurev1.DSCIType,
 		Name: name,
 	}
 	return origin

diff --git a/tests/integration/features/serverless_feature_test.go b/tests/integration/features/serverless_feature_test.go
@@ -2,7 +2,6 @@ package features_test
 
 import (
 	"context"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -11,6 +10,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/infrastructure/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/serverless"

diff --git a/tests/integration/features/servicemesh_feature_test.go b/tests/integration/features/servicemesh_feature_test.go
@@ -2,7 +2,6 @@ package features_test
 
 import (
 	"context"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -13,6 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/gvr"

diff --git a/tests/integration/servicemesh/service_mesh_setup_features_int_test.go b/tests/integration/servicemesh/service_mesh_setup_features_int_test.go
@@ -3,7 +3,6 @@ package servicemesh_test
 import (
 	"context"
 	"embed"
-	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"io"
 	"os"
 	"path"
@@ -19,6 +18,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	dscv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/infrastructure/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh"