address linting errors

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · Oct 3, 2023 · 8121fba · 8121fba
1 parent 3c8584e
commit 8121fba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/client-go/metadata"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -133,7 +133,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	unpacker, err := source.NewDefaultUnpacker(mgr, systemNamespace, cacheDir)
+	unpacker, err := source.NewDefaultUnpacker(systemNamespace, cacheDir)
 	if err != nil {
 		setupLog.Error(err, "unable to create unpacker")
 		os.Exit(1)
@@ -205,7 +205,10 @@ func main() {
 		os.Exit(1)
 	}
 
-	unpackStartupGarbageCollection(context.Background(), filepath.Join(cacheDir, source.UnpackCacheDir), setupLog, metaClient)
+	if err := unpackStartupGarbageCollection(context.Background(), filepath.Join(cacheDir, source.UnpackCacheDir), setupLog, metaClient); err != nil {
+		setupLog.Error(err, "running garbage collection")
+		os.Exit(1)
+	}
 
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
@@ -224,7 +227,7 @@ func podNamespace() string {
 
 func unpackStartupGarbageCollection(ctx context.Context, cachePath string, log logr.Logger, metaClient metadata.Interface) error {
 	getter := metaClient.Resource(v1alpha1.GroupVersion.WithResource("catalogs"))
-	metaList, err := getter.List(ctx, v1.ListOptions{})
+	metaList, err := getter.List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return fmt.Errorf("error listing catalogs: %w", err)
 	}

diff --git a/internal/source/image_registry_client_test.go b/internal/source/image_registry_client_test.go
@@ -16,11 +16,12 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/random"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/operator-framework/catalogd/api/core/v1alpha1"
 	"github.com/operator-framework/catalogd/internal/source"
 	"github.com/operator-framework/catalogd/pkg/errors"
-	"github.com/stretchr/testify/assert"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestImageRegistry(t *testing.T) {

diff --git a/internal/source/unpacker.go b/internal/source/unpacker.go
@@ -7,8 +7,6 @@ import (
 	"os"
 	"path"
 
-	"sigs.k8s.io/controller-runtime/pkg/cluster"
-
 	catalogdv1alpha1 "github.com/operator-framework/catalogd/api/core/v1alpha1"
 )
 
@@ -110,7 +108,7 @@ const UnpackCacheDir = "unpack"
 // source types.
 //
 // TODO: refactor NewDefaultUnpacker due to growing parameter list
-func NewDefaultUnpacker(systemNsCluster cluster.Cluster, namespace, cacheDir string) (Unpacker, error) {
+func NewDefaultUnpacker(namespace, cacheDir string) (Unpacker, error) {
 	unpackPath := path.Join(cacheDir, UnpackCacheDir)
 	if err := os.MkdirAll(unpackPath, 0700); err != nil {
 		return nil, fmt.Errorf("creating unpack cache directory: %w", err)