Merge pull request #835 from simonpasquier/add-golangci-lint

NO-JIRA: add golangci-lint

Author: openshift-merge-bot[bot]

.gitignore

@@ -14,3 +14,4 @@ dist/
 .devspace
 web/po-files/
 .claude/commands/configs
+_output/

.golangci-lint.yaml

@@ -0,0 +1,26 @@
+# List of all configuration options at https://github.com/golangci/golangci-lint/blob/HEAD/.golangci.reference.yml
+version: "2"
+
+linters:
+  settings:
+    errcheck:
+      exclude-functions:
+        - (net/http.ResponseWriter).Write
+  exclusions:
+    generated: strict
+    rules:
+      # Disable errcheck linter for test files.
+      - linters:
+          - errcheck
+        path: _test.go
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/openshift/monitoring-plugin)

Makefile

@@ -5,6 +5,9 @@ PLUGIN_NAME ?=monitoring-plugin
 IMAGE       ?= quay.io/${ORG}/${PLUGIN_NAME}:${VERSION}
 FEATURES    ?=incidents,perses-dashboards,dev-config
 
+GOLANGCI_LINT = $(shell pwd)/_output/tools/bin/golangci-lint
+GOLANGCI_LINT_VERSION ?= v2.11.3
+
 export NODE_OPTIONS?=--max_old_space_size=4096
 
 .PHONY: install-frontend
@@ -39,12 +42,6 @@ i18n-frontend:
 lint-frontend:
 	cd web && npm run lint
 
-.PHONY: lint-backend
-lint-backend:
-	go mod tidy
-	go fmt ./cmd/
-	go fmt ./pkg/
-
 .PHONY: install-backend
 install-backend:
 	go mod download
@@ -69,7 +66,6 @@ test-frontend:
 build-image:
 	./scripts/build-image.sh
 
-
 .PHONY: install
 install:
 	make install-frontend && make install-backend
@@ -79,8 +75,7 @@ update-plugin-name:
 	./scripts/update-plugin-name.sh
 
 .PHONY: deploy
-deploy:
-	make lint-backend
+deploy: lint-backend
 	PUSH=1 scripts/build-image.sh
 	helm uninstall $(PLUGIN_NAME) -n $(PLUGIN_NAME)-ns || true
 	helm install $(PLUGIN_NAME) charts/openshift-console-plugin -n monitoring-plugin-ns --create-namespace --set plugin.image=$(IMAGE)
@@ -89,6 +84,19 @@ deploy:
 deploy-acm:
 	./scripts/deploy-acm.sh
 
+# Download and install golangci-lint if not already installed
+.PHONY: golangci-lint
+golangci-lint:
+	@[ -f $(GOLANGCI_LINT) ] || { \
+		set -e ;\
+		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
+	}
+
+.PHONY: lint-backend
+lint-backend: golangci-lint
+	go mod tidy
+	$(GOLANGCI_LINT) -c $(shell pwd)/.golangci-lint.yaml run --verbose
+
 .PHONY: build-mcp-image
 build-mcp-image:
 	DOCKER_FILE_NAME="Dockerfile.mcp" REPO="monitoring-console-plugin" scripts/build-image.sh

cmd/plugin-backend.go

@@ -8,8 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	server "github.com/openshift/monitoring-plugin/pkg"
 	"github.com/sirupsen/logrus"
+
+	server "github.com/openshift/monitoring-plugin/pkg"
 )
 
 var (

pkg/proxy/proxy.go

@@ -130,11 +130,6 @@ func getProxy(kind KindType, proxyUrlString string, serviceCAfile string) (*http
 	return proxy, nil
 }
 
-func handleError(w http.ResponseWriter, code int, err error) {
-	log.Error(err)
-	http.Error(w, err.Error(), code)
-}
-
 func (h *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h.proxy.ServeHTTP(w, r)
 }

pkg/server.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/openshift/monitoring-plugin/pkg/proxy"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	v1 "k8s.io/api/core/v1"
@@ -21,6 +20,8 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
+
+	"github.com/openshift/monitoring-plugin/pkg/proxy"
 )
 
 var log = logrus.WithField("module", "server")
@@ -88,11 +89,11 @@ func CreateServer(ctx context.Context, cfg *Config) (*PluginServer, error) {
 
 func (s *PluginServer) StartHTTPServer() error {
 	if s.Config.IsTLSEnabled() {
-		log.Infof("listening for https on %s", s.Server.Addr)
-		return s.Server.ListenAndServeTLS(s.Config.CertFile, s.Config.PrivateKeyFile)
+		log.Infof("listening for https on %s", s.Addr)
+		return s.ListenAndServeTLS(s.Config.CertFile, s.Config.PrivateKeyFile)
 	}
-	log.Infof("listening for http on %s", s.Server.Addr)
-	return s.Server.ListenAndServe()
+	log.Infof("listening for http on %s", s.Addr)
+	return s.ListenAndServe()
 }
 
 func (s *PluginServer) Shutdown(ctx context.Context) error {