export tools to module to update the version from dependabot

Author: moukoublen

.github/workflows/ci.yml

@@ -10,25 +10,25 @@ on:
 jobs:
 
   ci:
+    name: Lints and Tests
     runs-on: ubuntu-latest
+    # strategy:
+    #   matrix:
+    #     go-version: [ '1.22', '1.23' ]
     steps:
-    - uses: actions/checkout@v4
 
-    # - uses: streetsidesoftware/cspell-action@v6
-    #   with:
-    #     root: '.'
-    #     inline: warning
-    #     strict: true
-    #     incremental_files_only: false
-    #     config: '.vscode/cspell.json'
-    #     verbose: false
+    # https://github.com/actions/checkout
+    - uses: actions/checkout@v4
 
+    # https://github.com/actions/setup-go
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.23'
+        go-version: "1.23.x"
+        check-latest: true
         cache: false
 
+    # https://github.com/actions/cache
     - name: Cache Tools
       id: cache-tools
       uses: actions/cache@v4
@@ -37,37 +37,34 @@ jobs:
           .tools/
           ~/.cache/go-build/
           ~/go/pkg/
-        key: ci-tools-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.sum', '**/Makefile', 'scripts/tools.mk', '.github/workflows/go.yml') }}
+        key: ci-tools-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.mod', '**/go.sum', '**/Makefile', 'scripts/tools.mk', '.github/workflows/ci.yml', 'tools/tools.go') }}
         restore-keys: |
           ci-tools-${{ runner.os }}-${{ runner.arch }}
 
     - name: Install Tools
       if: steps.cache-tools.outputs.cache-hit != 'true'
       run: make tools
 
-    - name: env
+    - name: Env
       run: |
         make --version
-        echo ''
+        echo ""
         make env
 
-    - name: Check shell files
+    - name: Check Shell Files
       run: make ci-sh
 
-    - name: ci-gen-n-format
-      run: make ci-gen-n-format
-
-    - name: ci-mod
+    - name: Mod
       run: make ci-mod
 
+    - name: Generate Format and Check
+      run: make ci-gen-n-format
+
     - name: staticcheck
       run: make staticcheck
 
     - name: golangci-lint
-      run: make golangci-lint-github-actions
-
-    - name: Build
-      run: make build
+      run: make golangci-lint
 
     - name: Test
       run: make test

.golangci.yml

@@ -18,7 +18,6 @@ output:
       path: stderr
   print-issued-lines: true
   print-linter-name: true
-  uniq-by-line: true
 
 linters:
   enable-all: true

Makefile

@@ -55,10 +55,10 @@ env:
 	@echo ""
 
 .PHONY: checks
-checks: vet staticcheck gofumpt goimports golangci-lint-github-actions
+checks: vet staticcheck gofumpt goimports golangci-lint
 
 .PHONY: ci-gen-n-format
-ci-gen-n-format: goimports gofumpt
+ci-gen-n-format: mockery goimports gofumpt
 	./scripts/git-check-dirty
 
 .PHONY: ci-mod

internal/httpx/mock_http_client_test.go

@@ -1,14 +1,4 @@
-REPO_GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || true)
-REPO_GIT_COMMIT = $(shell git rev-parse HEAD 2>/dev/null || true)
-REPO_GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD 2>/dev/null || true)
-REPO_GIT_TAG = $(shell git describe --tags 2>/dev/null || true)
-
 MODULE := $(shell cat go.mod | grep -e "^module" | sed "s/^module //")
-X_FLAGS = \
-		-X '$(MODULE)/build.Branch=$(REPO_GIT_BRANCH)' \
-		-X '$(MODULE)/build.Commit=$(REPO_GIT_COMMIT)' \
-		-X '$(MODULE)/build.CommitShort=$(REPO_GIT_COMMIT_SHORT)' \
-		-X '$(MODULE)/build.Tag=$(REPO_GIT_TAG)'
 
 GO_PACKAGES = go list -tags='$(TAGS)' ./...
 GO_FOLDERS = go list -tags='$(TAGS)' -f '{{ .Dir }}' ./...
@@ -58,11 +48,19 @@ build: $(shell ls -d cmd/* | sed -e 's/\//./')
 clean:
 	rm -rf $(BUILD_OUTPUT)
 
+# https://pkg.go.dev/cmd/go/internal/test
 .PHONY: test
 test:
-	CGO_ENABLED=1 go test -timeout 60s -race -tags="$(TAGS)" -coverprofile cover.out -covermode atomic ./...
-	@go tool cover -func cover.out
-	@rm cover.out
+	CGO_ENABLED=1 go test -timeout 30s -tags '$(TAGS)' -race -coverprofile=coverage.txt -covermode=atomic ./...
+
+.PHONY: test-n-read
+test-n-read: test
+	@go tool cover -func coverage.txt
+
+.PHONY: bench
+bench: # runs all benchmarks
+	CGO_ENABLED=1 go test -benchmem -run=^Benchmark$$ -mod=readonly -count=1 -v -race -bench=. ./...
+
 
 .PHONY: run
 run:

internal/mock_daemon_config_option_test.go

@@ -1,11 +1,3 @@
-## https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html
-## in order for
-#.SECONDEXPANSION:
-
-## https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#index-not-intermediate-targets_002c-explicit
-## NOTINTERMEDIATE requires make >=4.4
-.NOTINTERMEDIATE:
-
 # https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
 # https://www.gnu.org/software/make/manual/make.html#Prerequisite-Types
 
@@ -21,7 +13,9 @@ tools: \
 	$(TOOLS_BIN)/staticcheck \
 	$(TOOLS_BIN)/golangci-lint \
 	$(TOOLS_BIN)/gofumpt \
-	$(TOOLS_BIN)/gojq
+	$(TOOLS_BIN)/gojq \
+	$(TOOLS_BIN)/shfmt \
+	$(TOOLS_BIN)/shellcheck
 
 .PHONY: clean-tools
 clean-tools:
@@ -45,17 +39,24 @@ define go_install
 	@echo ""
 endef
 
+# export GOMOD=$(shell pwd)/go_tools.mod
+# go get -modfile='go_tools.mod' -u ...
+define go_mod_ver
+$(shell go list -modfile='./tools/go.mod' -m $(1) | cut -d ' ' -f2)
+endef
+
+
 .PHONY: vet
 vet:
 	go vet `$(GO_PACKAGES)`
 	@echo ""
 
 ## <staticcheck>
 # https://github.com/dominikh/go-tools/releases    https://staticcheck.io/c
-STATICCHECK_CMD:=honnef.co/go/tools/cmd/staticcheck
-STATICCHECK_VER:=2024.1.1
+STATICCHECK_MOD:=honnef.co/go/tools
+STATICCHECK_VER:=$(call go_mod_ver,$(STATICCHECK_MOD))
 $(TOOLS_BIN)/staticcheck: $(TOOLS_DB)/staticcheck.$(STATICCHECK_VER).$(GO_VER).ver
-	$(call go_install,staticcheck,$(STATICCHECK_CMD),$(STATICCHECK_VER))
+	$(call go_install,staticcheck,$(STATICCHECK_MOD)/cmd/staticcheck,$(STATICCHECK_VER))
 
 .PHONY: staticcheck
 staticcheck: $(TOOLS_BIN)/staticcheck
@@ -65,52 +66,47 @@ staticcheck: $(TOOLS_BIN)/staticcheck
 
 ## <golangci-lint>
 # https://github.com/golangci/golangci-lint/releases
-GOLANGCI-LINT_CMD:=github.com/golangci/golangci-lint/cmd/golangci-lint
-GOLANGCI-LINT_VER:=v1.63.4
+GOLANGCI-LINT_MOD:=github.com/golangci/golangci-lint
+GOLANGCI-LINT_VER:=$(call go_mod_ver,$(GOLANGCI-LINT_MOD))
 $(TOOLS_BIN)/golangci-lint: $(TOOLS_DB)/golangci-lint.$(GOLANGCI-LINT_VER).$(GO_VER).ver
 	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI-LINT_VER)
 
 .PHONY: golangci-lint
 golangci-lint: $(TOOLS_BIN)/golangci-lint
-	$(TOOLS_BIN)/golangci-lint run
-	@echo ''
-
-.PHONY: golangci-lint-github-actions
-golangci-lint-github-actions: $(TOOLS_BIN)/golangci-lint
 	golangci-lint run --out-format colored-line-number
 	@echo ''
 ## </golangci-lint>
 
 ## <goimports>
 # https://pkg.go.dev/golang.org/x/tools?tab=versions
-GOIMPORTS_CMD := golang.org/x/tools/cmd/goimports
-GOIMPORTS_VER := v0.28.0
+GOIMPORTS_MOD:=golang.org/x/tools
+GOIMPORTS_VER:=$(call go_mod_ver,$(GOIMPORTS_MOD))
 $(TOOLS_BIN)/goimports: $(TOOLS_DB)/goimports.$(GOIMPORTS_VER).$(GO_VER).ver
-	$(call go_install,goimports,$(GOIMPORTS_CMD),$(GOIMPORTS_VER))
+	$(call go_install,goimports,$(GOIMPORTS_MOD)/cmd/goimports,$(GOIMPORTS_VER))
 
 .PHONY: goimports
 goimports: $(TOOLS_BIN)/goimports
-	$(TOOLS_BIN)/goimports -w `$(GO_FILES)`
+	goimports -w `$(GO_FILES)`
 
 .PHONY: goimports.display
 goimports.display: $(TOOLS_BIN)/goimports
-	$(TOOLS_BIN)/goimports -d `$(GO_FILES)`
+	goimports -d `$(GO_FILES)`
 ## </goimports>
 
 ## <gofumpt>
 # https://github.com/mvdan/gofumpt/releases
-GOFUMPT_CMD:=mvdan.cc/gofumpt
-GOFUMPT_VER:=v0.7.0
+GOFUMPT_MOD:=mvdan.cc/gofumpt
+GOFUMPT_VER:=$(call go_mod_ver,$(GOFUMPT_MOD))
 $(TOOLS_BIN)/gofumpt: $(TOOLS_DB)/gofumpt.$(GOFUMPT_VER).$(GO_VER).ver
-	$(call go_install,gofumpt,$(GOFUMPT_CMD),$(GOFUMPT_VER))
+	$(call go_install,gofumpt,$(GOFUMPT_MOD),$(GOFUMPT_VER))
 
 .PHONY: gofumpt
 gofumpt: $(TOOLS_BIN)/gofumpt
-	$(TOOLS_BIN)/gofumpt -w `$(GO_FILES)`
+	gofumpt -w `$(GO_FILES)`
 
 .PHONY: gofumpt.display
 gofumpt.display:
-	$(TOOLS_BIN)/gofumpt -d `$(GO_FILES)`
+	gofumpt -d `$(GO_FILES)`
 ## </gofumpt>
 
 ## <gofmt>
@@ -125,21 +121,21 @@ gofmt.display:
 
 ## <gojq>
 # https://github.com/itchyny/gojq/releases
-GOJQ_CMD := github.com/itchyny/gojq/cmd/gojq
-GOJQ_VER := v0.12.17
+GOJQ_MOD:=github.com/itchyny/gojq
+GOJQ_VER:=$(call go_mod_ver,$(GOJQ_MOD))
 $(TOOLS_BIN)/gojq: $(TOOLS_DB)/gojq.$(GOJQ_VER).$(GO_VER).ver
-	$(call go_install,gojq,$(GOJQ_CMD),$(GOJQ_VER))
+	$(call go_install,gojq,$(GOJQ_MOD)/cmd/gojq,$(GOJQ_VER))
 
 .PHONY: gojq
 gojq: $(TOOLS_BIN)/gojq
 ## </gojq>
 
 ## <air>
 # https://github.com/air-verse/air/releases
-AIR_CMD:=github.com/air-verse/air
-AIR_VER:=v1.61.5
+AIR_MOD:=github.com/air-verse/air
+AIR_VER:=$(call go_mod_ver,$(AIR_MOD))
 $(TOOLS_BIN)/air: $(TOOLS_DB)/air.$(AIR_VER).$(GO_VER).ver
-	$(call go_install,air,$(AIR_CMD),$(AIR_VER))
+	$(call go_install,air,$(AIR_MOD),$(AIR_VER))
 
 .PHONY: air
 air: $(TOOLS_BIN)/air
@@ -148,10 +144,10 @@ air: $(TOOLS_BIN)/air
 
 ## <mockery>
 # https://github.com/vektra/mockery/releases
-MOCKERY_CMD:=github.com/vektra/mockery/v2
-MOCKERY_VER:=v2.50.2
+MOCKERY_MOD:=github.com/vektra/mockery/v2
+MOCKERY_VER:=$(call go_mod_ver,$(MOCKERY_MOD))
 $(TOOLS_BIN)/mockery: $(TOOLS_DB)/mockery.$(MOCKERY_VER).$(GO_VER).ver
-	$(call go_install,air,$(MOCKERY_CMD),$(MOCKERY_VER))
+	$(call go_install,air,$(MOCKERY_MOD),$(MOCKERY_VER))
 
 .PHONY: mockery
 mockery: $(TOOLS_BIN)/mockery
@@ -179,14 +175,19 @@ proto: $(TOOLS_BIN)/protoc $(TOOLS_BIN)/protoc-gen-go
 
 ## <shfmt>
 # https://github.com/mvdan/sh/releases
-SHFMT_CMD := mvdan.cc/sh/v3/cmd/shfmt
-SHFMT_VER := v3.10.0
+SHFMT_MOD:=mvdan.cc/sh/v3
+SHFMT_VER:=$(call go_mod_ver,$(SHFMT_MOD))
 $(TOOLS_BIN)/shfmt: $(TOOLS_DB)/shfmt.$(SHFMT_VER).$(GO_VER).ver
-	$(call go_install,shfmt,$(SHFMT_CMD),$(SHFMT_VER))
+	$(call go_install,shfmt,$(SHFMT_MOD)/cmd/shfmt,$(SHFMT_VER))
 
 .PHONY: shfmt
 shfmt: $(TOOLS_BIN)/shfmt
-	@./scripts/foreach-script $(TOOLS_BIN)/shfmt --simplify --language-dialect auto --case-indent --indent 2 --write
+	./scripts/foreach-script $(TOOLS_BIN)/shfmt \
+		--simplify \
+		--language-dialect auto \
+		--case-indent \
+		--indent 2 \
+		--write
 ## </shfmt>
 
 ## <shellcheck>
@@ -197,5 +198,9 @@ $(TOOLS_BIN)/shellcheck: $(TOOLS_DB)/shellcheck.$(SHELLCHECK_VER).ver | $(TOOLS_
 
 .PHONY: shellcheck
 shellcheck: $(TOOLS_BIN)/shellcheck
-	@./scripts/foreach-script $(TOOLS_BIN)/shellcheck --external-sources --format=tty --severity=info
+	./scripts/foreach-script $(TOOLS_BIN)/shellcheck \
+		--norc \
+		--external-sources \
+		--format=tty \
+		--enable=require-variable-braces,add-default-case
 ## </shellcheck>