fix format, imports, and lint

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

controllers/catalogsource_controller.go

@@ -10,13 +10,14 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 )
 
 const (

controllers/catalogsource_controller_test.go

@@ -10,14 +10,15 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	catsrccontroller "github.com/operator-framework/operator-controller/controllers"
-	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
+
+	catsrccontroller "github.com/operator-framework/operator-controller/controllers"
+	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 )
 
 var _ catalogsource.RegistryClient = &fakeRegistryClient{}
@@ -137,6 +138,7 @@ var _ = Describe("CatalogSource Controller Test", func() {
 					By("re-running reconcile")
 					res, err = reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: catSrcKey})
 					Expect(res).To(Equal(ctrl.Result{}))
+					Expect(err).ToNot(HaveOccurred())
 
 					By("checking the cache is populated")
 					entities = nil

internal/resolution/entity_sources/catalogsource/registry_bundle_to_entity_test.go

@@ -2,9 +2,10 @@ package catalogsource_test
 
 import (
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 	catalogsourceapi "github.com/operator-framework/operator-registry/pkg/api"
 
+	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

internal/resolution/entity_sources/catalogsource/registry_grpc_client_test.go

@@ -9,10 +9,11 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 	"github.com/operator-framework/operator-registry/pkg/api"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
+
+	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 )
 
 type mockServer struct {

internal/resolution/resolver.go

@@ -6,9 +6,10 @@ import (
 
 	"github.com/operator-framework/deppy/pkg/deppy/input"
 	"github.com/operator-framework/deppy/pkg/deppy/solver"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/olm"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/olm"
+
 	"github.com/operator-framework/operator-controller/api/v1alpha1"
 )
 

internal/resolution/variable_sources/entity/bundle_entity.go

@@ -53,7 +53,6 @@ type BundleEntity struct {
 	requiredPackages  []PackageRequired
 	channelProperties *ChannelProperties
 	semVersion        *semver.Version
-	bundlePath        string
 	mu                sync.RWMutex
 }
 

test/e2e/catalogsource_install_test.go

@@ -152,6 +152,8 @@ func createTestRegistryService(ctx context.Context, cli *kubernetes.Clientset, n
 	Expect(err).To(BeNil())
 
 	conn, err := grpc.Dial(getServiceAddress(ctx, cli, namespace, svc.Name), []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}...)
+	Expect(err).ToNot(HaveOccurred())
+
 	defer conn.Close()
 	oldState := conn.GetState()
 	Eventually(func(g Gomega) {