Merge pull request #27 from doitintl/update/go

update go and linter

Author: alexei-led

.github/workflows/docker-release.yaml

@@ -15,24 +15,24 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ${{ secrets.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -61,7 +61,7 @@ jobs:
           echo "::debug::docker image tag ${tag}"
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           path: /tmp/.buildx-cache
@@ -71,7 +71,7 @@ jobs:
 
       - name: Build and push Docker image
         id: build-push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           build-args: VERSION=${{ steps.tagger.outputs.tag }}
           platforms: linux/amd64,linux/arm64

.github/workflows/github-release.yaml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.16.x
+          go-version: '>=1.19.0'
 
       - name: Cross-Platform build
         run: |
@@ -33,7 +33,7 @@ jobs:
 
       - name: Release to GitHub
         if: startsWith(github.ref, 'refs/tags/')
-        uses: anton-yurchenko/git-release@v3.4.4
+        uses: docker://antonyurchenko/git-release:latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DRAFT_RELEASE: "true"

.github/workflows/test.yaml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.16.x
+          go-version: '>=1.19.0'
 
       - name: Lint
         run: |

.golangci.yaml

@@ -1,8 +1,20 @@
+run:
+  # which dirs to skip
+  skip-dirs:
+    - mocks
+  # Timeout for analysis, e.g. 30s, 5m.
+  # Default: 1m
+  timeout: 5m
+  # Exit code when at least one issue was found.
+  # Default: 1
+  issues-exit-code: 2
+  # Include test files or not.
+  # Default: true
+  tests: false
+
 linters-settings:
   govet:
     check-shadowing: true
-  golint:
-    min-confidence: 0
   gocyclo:
     min-complexity: 15
   maligned:
@@ -14,8 +26,8 @@ linters-settings:
     min-occurrences: 2
   misspell:
     locale: US
-  lll:
-    line-length: 140
+    ignore-words:
+      - "cancelled"
   goimports:
     local-prefixes: github.com/golangci/golangci-lint
   gocritic:
@@ -34,54 +46,99 @@ linters-settings:
       - whyNoLint
       - wrapperFunc
   funlen:
-    lines: 100
+    lines: 105
     statements: 50
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    # - rowserrcheck
+    - asciicheck
+    - bidichk
     - bodyclose
-    - deadcode
+    # - containedctx
+    # - contextcheck disabled because of generics
+    - dupword
+    - decorder
     - depguard
     - dogsled
     - dupl
+    - durationcheck
     - errcheck
+    - errchkjson
+    - errname
+    - errorlint
+    - exhaustive
+    # - exhaustivestruct TODO: check how to fix it
+    - exportloopref
+    # - forbidigo TODO: configure forbidden code patterns
+    # - forcetypeassert
     - funlen
+    - gci
+    # - gochecknoglobals TODO: remove globals from code
+    # - gochecknoinits TODO: remove main.init
+    - gocognit
     - goconst
     - gocritic
     - gocyclo
+    #    - godox
+    - goerr113
     - gofmt
     - goimports
-    - golint
+    - gomnd
+    # - gomoddirectives
     - gosec
     - gosimple
     - govet
+    - goprintffuncname
+    - grouper
+    - importas
+    # - ireturn TODO: not sure if it is a good linter
     - ineffassign
-    - interfacer
-    - lll
+    - interfacebloat
+    - loggercheck
+    - maintidx
+    - makezero
     - misspell
     - nakedret
-    - scopelint
-    - staticcheck
-    - structcheck
+    # - nestif
+    - nilerr
+    - nilnil
+    # - noctx
+    - nolintlint
+    - prealloc
+    - predeclared
+    - promlinter
+    - reassign
+    - revive
+    # - rowserrcheck disabled because of generics
+    # - staticcheck doesn't work with go1.19
+    # - structcheck disabled because of generics
     - stylecheck
+    - tenv
+    - testableexamples
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
+    # - varnamelen TODO: review naming
+    # - varcheck depricated 1.49
+    # - wastedassign disabled because of generics
     - whitespace
-
-  # don't enable:
-  # - gochecknoglobals
-  # - gocognit
-  # - godox
-  # - maligned
-  # - prealloc
+    - wrapcheck
+    # - wsl
 
 issues:
-    exclude:
-        - Using the variable on range scope `tt` in function literal
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - funlen
+        - bodyclose
+        - gosec
+        - dupl
+        - gocognit
+        - goconst
+        - gocyclo
+  exclude:
+    - Using the variable on range scope `tt` in function literal

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:experimental
 
-FROM --platform=${BUILDPLATFORM} golang:1.16-alpine as builder
+FROM --platform=${BUILDPLATFORM} golang:1.19-alpine as builder
 # passed by buildkit
 ARG TARGETOS
 ARG TARGETARCH

Makefile

@@ -28,7 +28,7 @@ export CGO_ENABLED=0
 export GOPROXY=https://proxy.golang.org
 
 .PHONY: all
-all: fmt lint test ; $(info $(M) building executable…) @ ## Build program binary
+all: fmt lint test ; $(info $(M) building executable...) @ ## Build program binary
 	$Q env GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) $(GO) build \
 		-tags release \
 		-ldflags "$(LDFLAGS_VERSION) -X main.Platform=$(TARGETOS)/$(TARGETARCH)" \
@@ -52,7 +52,7 @@ platfrom-build: clean lint test ; $(info $(M) building binaries for multiple os/
 setup-tools: setup-lint setup-gocov setup-gocov-xml setup-go2xunit setup-mockery setup-ghr
 
 setup-lint:
-	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.39
+	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
 setup-gocov:
 	$(GO) install github.com/axw/gocov/...
 setup-gocov-xml:
@@ -80,10 +80,10 @@ test-verbose: ARGS=-v            ## Run tests in verbose mode with coverage repo
 test-race:    ARGS=-race         ## Run tests with race detector
 $(TEST_TARGETS): NAME=$(MAKECMDGOALS:test-%=%)
 $(TEST_TARGETS): test
-check test tests: fmt ; $(info $(M) running $(NAME:%=% )tests…) @ ## Run tests
+check test tests: fmt ; $(info $(M) running $(NAME:%=% )tests...) @ ## Run tests
 	$Q $(GO) test -timeout $(TIMEOUT)s $(ARGS) $(TESTPKGS)
 
-test-xml: fmt lint | $(GO2XUNIT) ; $(info $(M) running xUnit tests…) @ ## Run tests with xUnit output
+test-xml: fmt lint | $(GO2XUNIT) ; $(info $(M) running xUnit tests...) @ ## Run tests with xUnit output
 	$Q mkdir -p test
 	$Q 2>&1 $(GO) test -timeout $(TIMEOUT)s -v $(TESTPKGS) | tee test/tests.output
 	$(GO2XUNIT) -fail -input test/tests.output -output test/tests.xml
@@ -95,7 +95,7 @@ COVERAGE_HTML    = $(COVERAGE_DIR)/index.html
 .PHONY: test-coverage test-coverage-tools
 test-coverage-tools: | $(GOCOV) $(GOCOVXML)
 test-coverage: COVERAGE_DIR := $(CURDIR)/test/coverage.$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-test-coverage: fmt lint test-coverage-tools ; $(info $(M) running coverage tests…) @ ## Run coverage tests
+test-coverage: fmt lint test-coverage-tools ; $(info $(M) running coverage tests...) @ ## Run coverage tests
 	$Q mkdir -p $(COVERAGE_DIR)
 	$Q $(GO) test \
 		-coverpkg=$$($(GO) list -f '{{ join .Deps "\n" }}' $(TESTPKGS) | \
@@ -111,15 +111,15 @@ lint: setup-lint ; $(info $(M) running golangci-lint) @ ## Run golangci-lint
 	$Q $(GOLINT) run --timeout=5m -v -c $(LINT_CONFIG) ./...
 
 .PHONY: fmt
-fmt: ; $(info $(M) running gofmt…) @ ## Run gofmt on all source files
+fmt: ; $(info $(M) running gofmt...) @ ## Run gofmt on all source files
 	$Q $(GO) fmt $(PKGS)
 
 .PHONY: mock
-mock: | $(GOMOCK) ; $(info $(M) generating mocks…) @ ## Run mockery
+mock: ; $(info $(M) generating mocks...) @ ## Run mockery
 	$Q $(GO) mod vendor -v
-	$Q $(GOMOCK) -name SecretsManagerAPI -dir vendor/github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface
-	$Q $(GOMOCK) -name SSMAPI -dir vendor/github.com/aws/aws-sdk-go/service/ssm/ssmiface
-	$Q $(GOMOCK) -name GoogleSecretsManagerAPI -dir pkg/secrets/google
+	$Q $(GOMOCK) --name SecretsManagerAPI --dir vendor/github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface
+	$Q $(GOMOCK) --name SSMAPI --dir vendor/github.com/aws/aws-sdk-go/service/ssm/ssmiface
+	$Q $(GOMOCK) --name GoogleSecretsManagerAPI --dir pkg/secrets/google
 	$Q rm -rf vendor
 
 # Misc
@@ -137,7 +137,7 @@ endif
 		--token $(GITHUB_TOKEN)
 
 .PHONY: clean
-clean: ; $(info $(M) cleaning…)	@ ## Cleanup everything
+clean: ; $(info $(M) cleaning...)	@ ## Cleanup everything
 	@rm -rf $(BIN)
 	@rm -rf test/tests.* test/coverage.*
 

go.mod

@@ -1,15 +1,42 @@
 module secrets-init
 
-go 1.14
+go 1.19
 
 require (
-	cloud.google.com/go v0.56.0
-	github.com/aws/aws-sdk-go v1.24.1
-	github.com/googleapis/gax-go/v2 v2.0.5
+	cloud.google.com/go/secretmanager v1.8.0
+	github.com/aws/aws-sdk-go v1.44.128
+	github.com/googleapis/gax-go/v2 v2.6.0
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.4.0
-	github.com/urfave/cli/v2 v2.0.0
-	golang.org/x/sys v0.0.0-20200331124033-c3d80250170d
-	google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.1
+	github.com/urfave/cli/v2 v2.23.0
+	golang.org/x/sys v0.1.0
+	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+)
+
+require (
+	cloud.google.com/go/compute v1.10.0 // indirect
+	cloud.google.com/go/iam v0.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/api v0.99.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/grpc v1.50.1 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )