fix lint issue: imports are not accurate sorted (File is not -ed)

camilamacedo86 · camilamacedo86 · commit 7210dea3594e · 2025-01-03T16:16:55.000Z
The imports need to be fixed
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -50,9 +50,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-controller/internal/action"
 	"github.com/operator-framework/operator-controller/internal/applier"
 	"github.com/operator-framework/operator-controller/internal/authentication"
diff --git a/internal/catalogmetadata/client/client.go b/internal/catalogmetadata/client/client.go
@@ -12,8 +12,9 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
+
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 const (
diff --git a/internal/catalogmetadata/client/client_test.go b/internal/catalogmetadata/client/client_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
 )
 
diff --git a/internal/controllers/clustercatalog_controller_test.go b/internal/controllers/clustercatalog_controller_test.go
@@ -15,7 +15,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/scheme"
 )
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
@@ -46,10 +46,10 @@ import (
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-controller/internal/bundleutil"
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
 	"github.com/operator-framework/operator-controller/internal/contentmanager"
diff --git a/internal/resolve/catalog.go b/internal/resolve/catalog.go
@@ -15,10 +15,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-controller/internal/bundleutil"
 	"github.com/operator-framework/operator-controller/internal/catalogmetadata/compare"
 	"github.com/operator-framework/operator-controller/internal/catalogmetadata/filter"
diff --git a/internal/resolve/catalog_test.go b/internal/resolve/catalog_test.go
@@ -16,11 +16,11 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 	"github.com/operator-framework/operator-registry/alpha/property"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-controller/internal/features"
 )
 
diff --git a/internal/scheme/scheme.go b/internal/scheme/scheme.go
@@ -7,9 +7,8 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 var Scheme = runtime.NewScheme()
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
@@ -28,9 +28,8 @@ import (
 	"k8s.io/utils/env"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 const (
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -14,7 +14,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	"github.com/operator-framework/operator-controller/internal/scheme"
 )
 
diff --git a/test/extension-developer-e2e/extension_developer_test.go b/test/extension-developer-e2e/extension_developer_test.go
@@ -18,9 +18,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 func TestExtensionDeveloper(t *testing.T) {
diff --git a/test/upgrade-e2e/post_upgrade_test.go b/test/upgrade-e2e/post_upgrade_test.go
@@ -18,9 +18,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@ import (`
`12`	`12`	`"k8s.io/apimachinery/pkg/api/meta"`
`13`	`13`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`14`	`14`
`15`		`- catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`16`	`15`	`"github.com/operator-framework/operator-registry/alpha/declcfg"`
	`16`	`+`
	`17`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ import (`
`14`	`14`	`"github.com/stretchr/testify/require"`
`15`	`15`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`16`	`16`
`17`		`- catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`18`	`17`	`"github.com/operator-framework/operator-registry/alpha/declcfg"`
`19`	`18`
	`19`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`20`	`20`	`catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import (`
`15`	`15`	`"sigs.k8s.io/controller-runtime/pkg/client/fake"`
`16`	`16`
`17`	`17`	`catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`18`		`-`
`19`	`18`	`"github.com/operator-framework/operator-controller/internal/controllers"`
`20`	`19`	`"github.com/operator-framework/operator-controller/internal/scheme"`
`21`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@ import (`
`7`	`7`	`utilruntime "k8s.io/apimachinery/pkg/util/runtime"`
`8`	`8`	`clientgoscheme "k8s.io/client-go/kubernetes/scheme"`
`9`	`9`
`10`		`- catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`11`		`-`
`12`	`10`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
	`11`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`var Scheme = runtime.NewScheme()`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,8 @@ import (`
`28`	`28`	`"k8s.io/utils/env"`
`29`	`29`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`30`	`30`
`31`		`- catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`32`		`-`
`33`	`31`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
	`32`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`34`	`33`	`)`
`35`	`34`
`36`	`35`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`15`	`15`
`16`	`16`	`catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`17`		`-`
`18`	`17`	`"github.com/operator-framework/operator-controller/internal/scheme"`
`19`	`18`	`)`
`20`	`19`