Upgrade linter - fix found issues - use go1.20

.github/workflows/pull_request.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.18','1.19']
+        go: ['1.19','1.20']
 
     steps:
     - name: install make

.github/workflows/push_image.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.19']
+        go: ['1.20']
     steps:
       - name: install make
         run: sudo apt-get install make
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.19']
+        go: ['1.20']
     steps:
     - name: install make
       run: sudo apt-get install make

.github/workflows/push_image_pr.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.19']
+        go: ['1.20']
     steps:
       - name: install make
         run: sudo apt-get install make

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.19']
+        go: ['1.20']
     steps:
       - name: checkout
         uses: actions/checkout@v3

.golangci.yml

@@ -1,27 +1,24 @@
 linters:
   enable:
-    - deadcode
     - errcheck
     - errorlint
     - cyclop
     - errname
     - exhaustive
     - exportloopref
     - gocritic
-    - goimports
+    - gofmt
     - gosimple
     - govet
     - ineffassign
     - revive
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unused
-    - varcheck
 linters-settings:
   stylecheck:
-    go: "1.19"
+    go: "1.20"
   gocritic:
     enabled-checks:
       - hugeParam
@@ -30,4 +27,4 @@ linters-settings:
       - indexAlloc
       - deprecatedComment
   cyclop:
-    max-complexity: 15
+    max-complexity: 20

Dockerfile

@@ -25,7 +25,7 @@ WORKDIR /opt/app-root/web
 RUN npm run format-all
 RUN npm run build$BUILDSCRIPT
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.19 as go-builder
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as go-builder
 
 ARG TARGETPLATFORM
 ARG TARGETARCH=amd64

Makefile

@@ -46,7 +46,7 @@ OCI_BUILD_OPTS ?=
 OCI_BIN_PATH = $(shell which docker 2>/dev/null || which podman)
 OCI_BIN ?= $(shell basename ${OCI_BIN_PATH})
 
-GOLANGCI_LINT_VERSION = v1.50.1
+GOLANGCI_LINT_VERSION = v1.53.3
 NPM_INSTALL ?= install
 CMDLINE_ARGS ?= --loglevel trace --loki-tenant-id netobserv --frontend-config config/sample-frontend-config.yaml --auth-check none
 LDFLAGS := -X 'main.buildVersion=${BUILD_VERSION}' -X 'main.buildDate=${BUILD_DATE}'
@@ -93,7 +93,7 @@ help: ## Display this help.
 .PHONY: prereqs
 prereqs: ## Test if prerequisites are met, and installing missing dependencies
 	@echo "### Test if prerequisites are met, and installing missing dependencies"
-	test -f $(go env GOPATH)/bin/golangci-lint || GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
+	GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
 
 .PHONY: vendors
 vendors: ## Check go vendors

go.mod

@@ -1,6 +1,6 @@
 module github.com/netobserv/network-observability-console-plugin
 
-go 1.18
+go 1.19
 
 require (
 	github.com/gorilla/mux v1.8.0

pkg/handler/csv/loki_csv.go

@@ -63,15 +63,15 @@ func GetCSVData(qr *model.AggregatedQueryResponse, columns []string) ([][]string
 					data[0] = append(data[0], fields...)
 				}
 
-				data = append(data, getRowDatas(stream, entry, labels, fields, line, len(data[0])))
+				data = append(data, getRowDatas(stream, labels, fields, line, len(data[0])))
 			}
 		}
 		return data, nil
 	}
 	return nil, fmt.Errorf("loki returned an unexpected type: %T", qr.Result)
 }
 
-func getRowDatas(stream model.Stream, entry model.Entry, labels, fields []string,
+func getRowDatas(stream model.Stream, labels, fields []string,
 	line map[string]interface{}, size int) []string {
 	rowDatas := make([]string, 0, size)
 

pkg/handler/status.go

@@ -6,7 +6,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func Status(w http.ResponseWriter, r *http.Request) {
+func Status(w http.ResponseWriter, _ *http.Request) {
 	_, err := w.Write([]byte("OK"))
 	if err != nil {
 		logrus.Errorf("could not write response: %v", err)

pkg/kubernetes/auth/check_auth.go

@@ -44,7 +44,7 @@ type NoopChecker struct {
 	Checker
 }
 
-func (b *NoopChecker) CheckAuth(ctx context.Context, header http.Header) error {
+func (b *NoopChecker) CheckAuth(_ context.Context, _ http.Header) error {
 	hlog.Debug("noop auth checker: ignore auth")
 	return nil
 }

pkg/server/server_test.go

@@ -579,9 +579,8 @@ func checkHTTPReady(httpClient *http.Client, url string) {
 		if r, err := httpClient.Get(url); err == nil {
 			r.Body.Close()
 			break
-		} else {
-			time.Sleep(time.Second)
 		}
+		time.Sleep(time.Second)
 	}
 }