feat(registry_gcr): supporting workload identity (#12)

* feat(registry_gcr): supporting workload identity

* update dockerfile

Author: iomarmochtar

.devcontainer/devcontainer.json

@@ -0,0 +1,8 @@
+{
+	"name": "Go",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
+	"features": {
+		"golang": "1.23.1"
+	},
+	"postCreateCommand": "make dev-tools"
+}

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
       - v*
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.23
 
 jobs:
   github-release:
@@ -16,13 +16,11 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
-      - name: install upx
-        run: sudo apt install upx-ucl -y
       - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v1
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
-          args: release --rm-dist
+          version: '~> v2'
+          args: release --clean 
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
 

.github/workflows/tests.yml renamed to .github/workflows/test.yml

@@ -1,4 +1,3 @@
-
 name: tests
 on:
   push:
@@ -9,8 +8,8 @@ on:
       - '**'
 
 env:
-  GO_VERSION: 1.18
-  LINTER_VERSION: 1.46.0
+  GO_VERSION: 1.23
+  LINTER_VERSION: 1.61.0
   CGO_ENABLED: 0
 
 jobs:
@@ -36,12 +35,4 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - name: install required packages
         run: sudo apt install -y make
-      - run: make test 
-      # code coverage update
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          files: coverage.txt
-          verbose: true
+      - run: make test

.gitignore

@@ -3,4 +3,4 @@
 bin/*
 dist/*
 vendor/
-coverage.txt
+coverage.*

.golangci.yml

@@ -1,32 +1,65 @@
 run:
-  timeout: 3m
-
-linters-settings:
-  gocyclo:
-    min-complexity: 15
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-
+  timeout: 10m
+    
 linters:
   enable:
-    - megacheck
-    - govet
-    - revive
+    - bodyclose
+    - copyloopvar
+    - dogsled
+    - errcheck
+    - exhaustive
+    - funlen
+    - goconst
+    - gocritic
     - gocyclo
+    - gofmt
+    - goimports
+    - goprintffuncname
     - gosec
-    - unconvert
-    - dupl
+    - gosimple
+    - govet
+    - ineffassign
     - nakedret
-    - prealloc
-    - exportloopref
-    - gocritic
-    - goimports
-    - whitespace
-    - misspell
-    - depguard
-    - importas
-    - contextcheck
+    - noctx
     - nolintlint
+    - prealloc
     - revive
+    - rowserrcheck
+    - staticcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - whitespace
+
+linters-settings:
+  funlen:
+    lines: 100
+    statements: 60
+  lll:
+    line-length: 200
+  gosec:
+    excludes:
+      - G101
+  revive:
+    rules:
+      - name: exported
+        disabled: true
+      - name: package-comments
+        disabled: true
+  stylecheck:
+    checks:
+      - all
+      - -ST1000
+
 
+issues:
+  exclude-use-default: false
+  exclude-rules:
+    - path: (.+)_test.go
+      linters:
+        - goconst
+        - lll
+        - funlen
+        - errcheck

.goreleaser.yml

@@ -1,3 +1,4 @@
+version: 2
 project_name: cir-rotator
 before:
   hooks:
@@ -11,25 +12,23 @@ builds:
     goos:
       - darwin
       - linux
-      - windows
     goarch:
       - amd64
-    hooks:
-      post:
-        - upx --brute "{{ .Path }}"
+      - arm64
+    ignore:
+      - goos: linux
+        goarch: arm64
+    ldflags:
+      - -s -w -X github.com/iomarmochtar/cir-rotator/app/cmd.BuildHash={{.Commit}} -X github.com/iomarmochtar/cir-rotator/app/cmd.Version={{.Version}}
+    tags:
+      - static_build
 
 checksum:
   name_template: 'checksums.txt'
 
 archives:
-  - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}_{{ .Version }}'
+  - files:
+      # Only include built binary in archive
+      - 'none*'
     format: tar.gz
-    replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
-    format_overrides:
-      - goos: windows
-        format: zip
+    name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'

CHANGELOG.md

@@ -0,0 +1,37 @@
+# 0.3.0
+
+### Features and enhancements
+
+- feat(registry_gcr): supporting workload identity
+- chore(go): bump go version to `1.23.1`
+- chore(gomock): change mock framework to the active fork (uber's gomock)
+- docs: prepare for gcr deprecation to artifact registry
+- docs: update description and fix broken links
+
+# 0.2.0
+
+### Features and enhancements
+
+- feat(http): parallel execution with adjustable pool size
+- feat(delete/read_repo_list): read repository list json file in delete action
+
+# 0.1.2
+
+### Bug Fixes
+
+- fix(jwt): set adjustable jwt token expiry for fixing deletion action fails if more than one hour in duration
+
+
+# 0.1.1
+
+### Bug Fixes
+
+- fix(app_flow): centralized deletion logic
+
+# 0.1.0
+
+initial release
+
+### Features and enhancements
+
+- feat(registry): supporting GCR

Dockerfile

@@ -1,10 +1,10 @@
-FROM golang:1.18.3-alpine3.15 as builder
+FROM goreleaser/goreleaser:v2.3.2 AS builder
 WORKDIR /build
 COPY . .
-RUN apk --update add make && make compile 
+RUN goreleaser build --clean --single-target
 
-FROM alpine:3.15.4 
+FROM alpine:3.20.3
 RUN apk --no-cache add ca-certificates
-COPY --from=builder /build/dist/cir-rotator /usr/bin/cir-rotator
-ENTRYPOINT ["cir-rotator"]
+COPY --from=builder /build/dist/cir-rotator_linux_amd64_v1/cir-rotator /usr/bin/cir-rotator
+ENTRYPOINT ["gitlab-token-updater"]
 CMD ["--help"]

Makefile

@@ -1,28 +1,48 @@
-NAME           ?= "cir-rotator"
-LINTER_VERSION  = 1.46.0
-LINTER_BIN      = ./bin/golangci-lint
-COVERAGE_OUT    = coverage.txt
-
-.PHONY: setup-linter
-export LINTER_VERSION
-setup-linter:
-	test ! -f ${LINTER_BIN} && curl -sfL https://raw.githubusercontent.com/bukalapak/toolkit-installer/master/golangci-lint.sh | sh || true
-
-.PHONY: lint
-lint: setup-linter
-	${LINTER_BIN} run -v
+GO111MODULE = on
+CGO_ENABLED = 0
+GO_FILES = $(shell go list ./... | grep -v mocks)
 
 .PHONY: test
 test:
-	go test -v -cover -coverprofile=${COVERAGE_OUT} -covermode=atomic ./...
+	go test -v $(GO_FILES) -coverprofile=coverage.out
+
+.PHONY: test-s
+test-s:
+	go test -v $(pkg)
+
+.PHONY: gen-mocks
+gen-mocks:
+	go generate $(GO_FILES)
+
+.PHONY: cleantestcache
+cleantestcache:
+	go clean -testcache
+
+.PHONY: tidy
+tidy:
+	GO111MODULE=$(GO111MODULE) go mod tidy
+
+.PHONY: cover
+cover: cleantestcache test
+	go tool cover -html=coverage.out -o coverage.html
+	go tool cover -func coverage.out
+
+.PHONY: cleanlintcache
+cleanlintcache:
+	golangci-lint cache clean
+
+.PHONY: lint
+lint: cleanlintcache
+	golangci-lint run --timeout 20m ./...
 
-.PHONY: coverage-html
-coverage-html: test
-	go tool cover -html=${COVERAGE_OUT}
+.PHONY: dev-tools
+dev-tools:
+	go install go.uber.org/mock/[email protected]
+	./scripts/install_goreleaser.sh
 
 .PHONY: test-all
-test-all: test lint
+test-all: cover lint
 
-.PHONY: compile
-compile:
-	GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -o dist/${NAME} main.go
+.PHONY: dist-dev
+dist-dev:
+	goreleaser build --snapshot --clean --single-target