[Monorepo] Unify Makefile for Lint, Fix Lint Issues, and Correct Imports

- Unified linting configuration for both projects, now defined in the root directory.
- Addressed Catalogd test file linting issues:
  - Replaced `assert.Nil(t, err)` with `require.NoError(t, err)` where applicable.
  - Replaced `assert.NotNil(t, err)` with `require.Error(t, err)` where appropriate.
- Fixed import sorting ensuring all files have properly organized imports for the lint does not fail with the issue (File is not -ed). Note this was caused by the replace `catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"` with `catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`

Author: camilamacedo86

.github/workflows/catalogd-sanity.yaml

@@ -80,14 +80,6 @@ generate: $(CONTROLLER_GEN) ## Generate code and manifests.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/base/crd/bases output:rbac:artifacts:config=config/base/rbac output:webhook:artifacts:config=config/base/manager/webhook/
 
-.PHONY: fmt
-fmt: ## Run go fmt against code.
-	go fmt ./...
-
-.PHONY: vet
-vet: ## Run go vet against code.
-	go vet -tags '$(GO_BUILD_TAGS)' ./...
-
 .PHONY: bingo-upgrade
 bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
 	@for pkg in $$($(BINGO) list | awk '{ print $$1 }' | tail -n +3); do \
@@ -120,15 +112,6 @@ e2e: run image-registry test-e2e kind-cluster-cleanup ## Run e2e test suite on l
 image-registry: ## Setup in-cluster image registry
 	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
 
-.PHONY: tidy
-tidy: ## Update dependencies
-	# Force tidy to use the version already in go.mod
-	go mod tidy -go=$(GOLANG_VERSION)
-
-.PHONY: verify
-verify: tidy fmt vet generate ## Verify the current code generation and lint
-	git diff --exit-code
-
 .PHONY: verify-crd-compatibility
 CRD_DIFF_ORIGINAL_REF := main
 CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
@@ -141,9 +124,6 @@ verify-crd-compatibility: $(CRD_DIFF)
 		echo "Skipping CRD diff: CRD does not exist in ${CRD_DIFF_ORIGINAL_REF}"; \
 	fi
 
-.PHONY: lint
-lint: $(GOLANGCI_LINT) ## Run golangci linter.
-	$(GOLANGCI_LINT) run --build-tags $(GO_BUILD_TAGS) $(GOLANGCI_LINT_ARGS)
 
 ## image-registry target has to come after run-latest-release,
 ## because the image-registry depends on the olm-ca issuer.
@@ -196,7 +176,7 @@ export GO_BUILD_TAGS     := containers_image_openpgp
 BUILDCMD = go build -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$(notdir $@) ./cmd/$(notdir $@)
 
 .PHONY: build-deps
-build-deps: generate fmt vet
+build-deps: generate
 
 .PHONY: build go-build-local $(BINARIES)
 build: build-deps go-build-local ## Build binaries for current GOOS and GOARCH.

catalogd/.golangci.yaml

@@ -758,9 +758,9 @@ func TestCatalogdControllerReconcile(t *testing.T) {
 			assert.Equal(t, ctrl.Result{}, res)
 			// errors are aggregated/wrapped
 			if tt.expectedError == nil {
-				assert.Nil(t, err)
+				require.NoError(t, err)
 			} else {
-				assert.NotNil(t, err)
+				require.Error(t, err)
 				assert.Equal(t, tt.expectedError.Error(), err.Error())
 			}
 			diff := cmp.Diff(tt.expectedCatalog, tt.catalog,

catalogd/Makefile

@@ -77,7 +77,7 @@ func TestRunGarbageCollection(t *testing.T) {
 
 			_, err := runGarbageCollection(ctx, cachePath, metaClient)
 			if !tt.wantErr {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				entries, err := os.ReadDir(cachePath)
 				require.NoError(t, err)
 				assert.Len(t, entries, len(tt.existCatalogs))

catalogd/internal/controllers/core/clustercatalog_controller_test.go

@@ -410,7 +410,7 @@ func TestImageRegistry(t *testing.T) {
 					assert.False(t, rs.UnpackTime.IsZero())
 				}
 			} else {
-				assert.Error(t, err)
+				require.Error(t, err)
 				isTerminal := errors.Is(err, reconcile.TerminalError(nil))
 				assert.Equal(t, tt.terminal, isTerminal, "expected terminal %v, got %v", tt.terminal, isTerminal)
 			}

catalogd/internal/garbagecollection/garbage_collector_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -91,7 +92,7 @@ func TestClusterCatalogDefaulting(t *testing.T) {
 
 			// Assert
 			if tc.expectError {
-				assert.Error(t, err)
+				require.Error(t, err)
 				assert.Contains(t, err.Error(), tc.errorMessage)
 			} else {
 				assert.NoError(t, err)

catalogd/internal/source/containers_image_test.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"

catalogd/internal/webhook/cluster_catalog_webhook_test.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 (

cmd/manager/main.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"
 )