fix(lint): failing linter for go modules (#620)

* fix(lint): failing linter for go modules

* fix: add E2E deps to replace allow list

* fix: rm unnecessary string substitution

* fix: target for fixing linter errors

.golangci.yml

@@ -21,6 +21,17 @@ linters-settings:
       # Replace these for trivy
       - github.com/docker/docker
       - oras.land/oras-go
+      # End-to-end testing
+      - github.com/spdx/tools-golang
+      - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
+      - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
+      - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
+      - cloud.google.com/go
+      - github.com/cucumber/godog
+      - k8s.io/api
+      - k8s.io/apimachinery
+      - k8s.io/client-go
+      - github.com/docker/cli
 
   gosec:
     # To specify a set of rules to explicitly exclude.

Makefile

@@ -155,9 +155,16 @@ bin/golangci-lint-$(GOLANGCI_VERSION): | $(BIN_DIR)
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b "$(BIN_DIR)" "v$(GOLANGCI_VERSION)"
 	@mv bin/golangci-lint $@
 
+GOMODULES := $(shell find $(ROOT_DIR) -name 'go.mod')
+LINTGOMODULES = $(addprefix lint-, $(GOMODULES))
+FIXGOMODULES = $(addprefix fix-, $(GOMODULES))
+
+.PHONY: $(LINTGOMODULES)
+$(LINTGOMODULES):
+	cd $(dir $(@:lint-%=%)) && "$(GOLANGCI_BIN)" run -c "$(GOLANGCI_CONFIG)"
+
 .PHONY: lint-go
-lint-go: bin/golangci-lint
-	find . -name go.mod -execdir "$(GOLANGCI_BIN)" run --tests -c "$(GOLANGCI_CONFIG)" \;
+lint-go: bin/golangci-lint $(LINTGOMODULES)
 
 .PHONY: lint-cfn
 lint-cfn:
@@ -168,9 +175,12 @@ lint-cfn:
 .PHONY: lint
 lint: lint-go lint-cfn ## Run linters
 
+.PHONY: $(FIXGOMODULES)
+$(FIXGOMODULES):
+	cd $(dir $(@:fix-%=%)) && "$(GOLANGCI_BIN)" run -c "$(GOLANGCI_CONFIG)" --fix
+
 .PHONY: fix
-fix: bin/golangci-lint ## Fix lint violations
-	./bin/golangci-lint run --fix
+fix: bin/golangci-lint $(FIXGOMODULES) ## Fix lint violations
 
 bin/licensei: bin/licensei-${LICENSEI_VERSION}
 	@ln -sf licensei-${LICENSEI_VERSION} bin/licensei

e2e/basic_scan_test.go

@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("Running a basic scan (only SBOM)", func() {
 		ginkgo.It("should finish successfully", func(ctx ginkgo.SpecContext) {
 			ginkgo.By("waiting until test asset is found")
 			assetsParams := models.GetAssetsParams{
-				Filter: utils.PointerTo(fmt.Sprintf("%s", DefaultScope)),
+				Filter: utils.PointerTo(DefaultScope),
 			}
 			gomega.Eventually(func() bool {
 				assets, err := client.GetAssets(ctx, assetsParams)