lint: upgrade golangci-lint

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>

Author: rchincha

.github/workflows/ci-cd.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       s3mock:
-        image: localstack/localstack-full
+        image: ghcr.io/project-zot/localstack/localstack:0.13.2
         env:
           SERVICES: s3
         ports:

.github/workflows/golangci-lint.yaml

@@ -0,0 +1,43 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - main
+  pull_request:
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          version: v1.43.0
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          args: --config ./golangcilint.yaml --enable-all --build-tags extended,containers_image_openpgp ./cmd/... ./pkg/...
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true then the action will use pre-installed Go.
+          # skip-go-installation: true
+
+          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true

Dockerfile

@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM docker.io/golang:1.16 AS builder
+FROM ghcr.io/project-zot/golang:1.16 AS builder
 ARG COMMIT
 RUN mkdir -p /go/src/github.com/project-zot/zot
 WORKDIR /go/src/github.com/project-zot/zot

Dockerfile-arch

@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM docker.io/golang:1.16 AS builder
+FROM ghcr.io/project-zot/golang:1.16 AS builder
 ARG COMMIT
 ARG ARCH
 RUN mkdir -p /go/src/github.com/project-zot/zot

Dockerfile-arch-minimal

@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM docker.io/golang:1.16 AS builder
+FROM ghcr.io/project-zot/golang:1.16 AS builder
 ARG COMMIT
 ARG ARCH
 RUN mkdir -p /go/src/github.com/project-zot/zot

Dockerfile-conformance

@@ -1,14 +1,14 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM docker.io/golang:1.16-alpine AS builder
+FROM ghcr.io/project-zot/golang:1.16 AS builder
 ARG COMMIT
-RUN apk --update add git make ca-certificates
+RUN apt-get update && apt-get install -y git make ca-certificates
 RUN mkdir -p /go/src/github.com/project-zot/zot
 WORKDIR /go/src/github.com/project-zot/zot
 COPY . .
 RUN make COMMIT=$COMMIT clean binary
-RUN echo -e '# Default config file for zot server\n\
+RUN echo '# Default config file for zot server\n\
 http:\n\
   address: 0.0.0.0\n\
   port: 5000\n\

Dockerfile-minimal

@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM docker.io/golang:1.16 AS builder
+FROM ghcr.io/project-zot/golang:1.16 AS builder
 ARG COMMIT
 RUN mkdir -p /go/src/github.com/project-zot/zot
 WORKDIR /go/src/github.com/project-zot/zot

Makefile

@@ -4,9 +4,11 @@ COMMIT_HASH=$(shell git describe --always --tags --long)
 GO_VERSION=$(shell go version | awk '{print $$3}')
 COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),$(COMMIT_HASH)-dirty,$(COMMIT_HASH))
 CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
-PATH := bin:$(PATH)
 TMPDIR := $(shell mktemp -d)
+TOOLSDIR := hack/tools
+PATH := bin:$(TOOLSDIR)/bin:$(PATH)
 STACKER := $(shell which stacker)
+GOLINTER := $(TOOLSDIR)/bin/golangci-lint
 OS ?= linux
 ARCH ?= amd64
 
@@ -55,11 +57,15 @@ covhtml:
 	cat coverage-extended.txt coverage-minimal.txt > coverage.txt
 	go tool cover -html=coverage.txt -o coverage.html
 
+$(GOLINTER):
+	mkdir -p $(TOOLSDIR)/bin
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLSDIR)/bin v1.43.0
+	$(GOLINTER) version
+
 .PHONY: check
-check: ./golangcilint.yaml
-	golangci-lint --version || curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.26.0
-	golangci-lint --config ./golangcilint.yaml run --enable-all --build-tags extended,containers_image_openpgp ./...
-	golangci-lint --config ./golangcilint.yaml run --enable-all --build-tags minimal,containers_image_openpgp ./...
+check: ./golangcilint.yaml $(GOLINTER)
+	$(GOLINTER) --config ./golangcilint.yaml run --enable-all --out-format=colored-line-number --build-tags minimal,containers_image_openpgp ./...
+	$(GOLINTER) --config ./golangcilint.yaml run --enable-all --out-format=colored-line-number --build-tags extended,containers_image_openpgp ./...
 
 swagger/docs.go: 
 	swag -v || go install github.com/swaggo/swag/cmd/swag
@@ -76,6 +82,7 @@ update-licenses:
 .PHONY: clean
 clean:
 	rm -f bin/zot*
+	rm -rf hack
 
 .PHONY: run
 run: binary test

errors/errors.go

@@ -27,6 +27,7 @@ var (
 	ErrCacheMiss               = errors.New("cache: miss")
 	ErrRequireCred             = errors.New("ldap: bind credentials required")
 	ErrInvalidCred             = errors.New("ldap: invalid credentials")
+	ErrEmptyJSON               = errors.New("cli: config json is empty")
 	ErrInvalidArgs             = errors.New("cli: Invalid Arguments")
 	ErrInvalidFlagsCombination = errors.New("cli: Invalid combination of flags")
 	ErrInvalidURL              = errors.New("cli: invalid URL format")
@@ -45,4 +46,5 @@ var (
 	ErrInvalidRepositoryName   = errors.New("routes: not a repository name")
 	ErrSyncMissingCatalog      = errors.New("sync: couldn't fetch upstream registry's catalog")
 	ErrMethodNotSupported      = errors.New("storage: method not supported")
+	ErrInvalidMetric           = errors.New("metrics: invalid metric func")
 )

golangcilint.yaml

@@ -5,15 +5,33 @@ run:
 
 linters:
   enable-all: true
-  disable: funlen,godox,gocognit
-
-output:
-  format: colored-line-number
+  disable: funlen,gocognit,exhaustivestruct,paralleltest,forbidigo,ireturn,wrapcheck,exhaustive
 
 linters-settings:
   dupl:
-    # tokens count to trigger issue, 150 by default
     threshold: 200
   nestif:
-    # their are various nested if else, therefore specifying complexity as 26
     min-complexity: 26
+  cyclop:
+    max-complexity: 40
+    skip-tests: true
+  varnamelen:
+    check-return: true
+    ignore-type-assert-ok: true
+    ignore-map-index-ok: true
+    ignore-chan-recv-ok: true
+    ignore-names:
+      - err
+      - ok
+      - gc
+  gomnd:
+    settings:
+      mnd:
+        checks: argument,case,condition,operation,return,assign
+        ignored-numbers: 10,64
+  gomoddirectives:
+    replace-allow-list:
+      - github.com/aquasecurity/fanal
+      - github.com/aquasecurity/trivy
+      - github.com/aquasecurity/trivy-db
+      - github.com/containers/image/v5