all around

Author: moukoublen

.golangci.yml

@@ -24,7 +24,6 @@ linters:
   enable-all: true
   disable:
     - exportloopref # deprecated
-    - execinquery # deprecated
     - exhaustruct # TODO: reconsider
     - depguard # TODO: reconsider
     - funlen # TODO: reconsider
@@ -37,7 +36,6 @@ linters:
     - godox
     - godot
     - gochecknoglobals
-    - gomnd
     - mnd
 
 issues:

Makefile

@@ -1,9 +1,7 @@
 SHELL := /usr/bin/env bash
 
+## https://www.gnu.org/software/make/manual/html_node/Parallel-Disable.html
 .NOTPARALLEL:
-.SECONDEXPANSION:
-## NOTINTERMEDIATE requires make >=4.4
-.NOTINTERMEDIATE:
 
 include $(CURDIR)/scripts/go.mk
 include $(CURDIR)/scripts/docker.mk

build/build.go

@@ -4,7 +4,7 @@ package build
 //
 //nolint:gochecknoglobals
 var (
-	Version     = ""
+	Version     = "0.0.1"
 	Branch      = ""
 	Commit      = ""
 	CommitShort = ""

build/docker/Dockerfile

@@ -1,10 +1,10 @@
-# syntax=docker/dockerfile:1.10
+# syntax=docker/dockerfile:1.12
 ### https://hub.docker.com/r/docker/dockerfile
 
 # https://docs.docker.com/build/guide/mounts/
 
 # https://hub.docker.com/_/golang
-FROM --platform=$BUILDPLATFORM golang:1.23.2-alpine3.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine3.21 AS builder
 RUN apk update && apk add --no-cache make git bash ca-certificates
 WORKDIR /app
 ARG TARGETOS TARGETARCH
@@ -15,7 +15,7 @@ RUN --mount=type=bind,target=. \
 
 #FROM scratch
 #COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs
-FROM alpine:3.20
+FROM alpine:3.21
 RUN apk add --no-cache ca-certificates
 WORKDIR /app
 COPY --from=builder /tmp/out/* /app/

build/docker/debug.Dockerfile

@@ -1,8 +1,8 @@
-# syntax=docker/dockerfile:1.10
+# syntax=docker/dockerfile:1.12
 ### https://hub.docker.com/r/docker/dockerfile
 
 # https://hub.docker.com/_/golang
-FROM golang:1.23.2-alpine3.20
+FROM golang:1.23.4-alpine3.21
 
 WORKDIR /wd
 

deployments/local/docker-compose.yml renamed to deployments/local/compose.local.yml

@@ -11,8 +11,8 @@
 | `cmd.<cmd dir name>` | Builds a specific cmd directory `<directory name>` and outputs the binary into `./output` folder using this pattern: `./cmd/<directory name> -> ./output/<directory name>`.
 | `dbg.<cmd dir name>` | Builds a specific cmd directory `<directory name>` (keeping debug symbols) and outputs the binary into `./output` folder using this pattern: `./cmd/<directory name> -> ./output/<directory name>`.
 | `clean`              | Deletes `./output` folder.
-| `compose-up`         | Deploys (rebuilds and recreates) the docker compose file `deployments/compose/docker-compose.yml` in attached mode. This docker compose file is intended for local development.<br>It uses the docker file `build/docker/debug.Dockerfile` and runs `air` target (see below), including hot-reload (rebuild on changes) and debug server.
-| `compose-down`       | Stops (if started) the containers specified by the docker compose file `deployments/compose/docker-compose.yml` removes containers, cleans up the volumes and delete local docker images.
+| `compose-up`         | Deploys (rebuilds and recreates) the docker compose file `deployments/compose.local.yml` in attached mode. This docker compose file is intended for local development.<br>It uses the docker file `build/docker/debug.Dockerfile` and runs `air` target (see below), including hot-reload (rebuild on changes) and debug server.
+| `compose-down`       | Stops (if started) the containers specified by the docker compose file `deployments/compose.local.yml` removes containers, cleans up the volumes and delete local docker images.
 | `air`                | Installs (if needed) [air](https://github.com/air-verse/air) under `TOOLS_BIN` folder (default is `./.tools/bin`) and runs `air -c .air.toml`.<br>Air watches for code file changes and rebuilds the binary according to the configuration `.air.toml`.<br>Current air configuration executes `cmd.goboilerplate` target (on each file change) and then runs the `./build/dlv` that starts the debug server (`dlv exec`) with the produced binary.
 | `build-image`        | Builds the docker image using the docker file `./build/docker/Dockerfile`.<br>This docker file is intended to be used as a production image.<br>Image name and tag are specified by `IMAGE_NAME` and `IMAGE_TAG`. Default values can be overwritten during execution (eg `make IMAGE_NAME=myimage IMAGE_TAG=1.0.0 image`).
 | `test`               | Runs go [test](https://pkg.go.dev/cmd/go/internal/test) with race conditions and prints cover report.

docs/makefile_targets.md

@@ -24,7 +24,7 @@ build-image:
 		--output='$(DOCKER_BUILD_OUTPUT)' \
 		.
 
-DOCKER_COMPOSE_EXEC ?= $(DOCKER_EXEC) compose -f $(CURDIR)/deployments/local/docker-compose.yml
+DOCKER_COMPOSE_EXEC ?= $(DOCKER_EXEC) compose -f $(CURDIR)/deployments/compose.local.yml
 
 .PHONY: compose-up
 compose-up:

scripts/docker.mk

@@ -1,14 +1,17 @@
 GO_EXEC ?= go
 export GO_EXEC
 
+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 //")
-VERSION ?= 0.0.0
 X_FLAGS = \
-		-X '$(MODULE)/build.Version=$(VERSION)' \
-		-X '$(MODULE)/build.Branch=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || true)' \
-		-X '$(MODULE)/build.Commit=$(shell git rev-parse HEAD 2>/dev/null || true)' \
-		-X '$(MODULE)/build.CommitShort=$(shell git rev-parse --short HEAD 2>/dev/null || true)' \
-		-X '$(MODULE)/build.Tag=$(shell git describe --tags 2>/dev/null || true)'
+		-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_EXEC) list -tags='$(TAGS)' -mod=vendor ./...
 GO_FOLDERS = $(GO_EXEC) list -tags='$(TAGS)' -mod=vendor -f '{{ .Dir }}' ./...

scripts/go.mk

@@ -1,3 +1,11 @@
+## 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
 
@@ -58,7 +66,7 @@ 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.61.0
+GOLANGCI-LINT_VER:=v1.62.2
 $(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)
 
@@ -76,7 +84,7 @@ golangci-lint-github-actions: $(TOOLS_BIN)/golangci-lint
 ## <goimports>
 # https://pkg.go.dev/golang.org/x/tools?tab=versions
 GOIMPORTS_CMD := golang.org/x/tools/cmd/goimports
-GOIMPORTS_VER := v0.26.0
+GOIMPORTS_VER := v0.28.0
 $(TOOLS_BIN)/goimports: $(TOOLS_DB)/goimports.$(GOIMPORTS_VER).$(GO_VER).ver
 	$(call go_install,goimports,$(GOIMPORTS_CMD),$(GOIMPORTS_VER))
 
@@ -118,7 +126,7 @@ gofmt.display:
 ## <gojq>
 # https://github.com/itchyny/gojq/releases
 GOJQ_CMD := github.com/itchyny/gojq/cmd/gojq
-GOJQ_VER := v0.12.16
+GOJQ_VER := v0.12.17
 $(TOOLS_BIN)/gojq: $(TOOLS_DB)/gojq.$(GOJQ_VER).$(GO_VER).ver
 	$(call go_install,gojq,$(GOJQ_CMD),$(GOJQ_VER))
 
@@ -129,7 +137,7 @@ gojq: $(TOOLS_BIN)/gojq
 ## <air>
 # https://github.com/air-verse/air/releases
 AIR_CMD:=github.com/air-verse/air
-AIR_VER:=v1.61.0
+AIR_VER:=v1.61.5
 $(TOOLS_BIN)/air: $(TOOLS_DB)/air.$(AIR_VER).$(GO_VER).ver
 	$(call go_install,air,$(AIR_CMD),$(AIR_VER))
 
@@ -141,7 +149,7 @@ air: $(TOOLS_BIN)/air
 ## <mockery>
 # https://github.com/vektra/mockery/releases
 MOCKERY_CMD:=github.com/vektra/mockery/v2
-MOCKERY_VER:=v2.46.2
+MOCKERY_VER:=v2.50.1
 $(TOOLS_BIN)/mockery: $(TOOLS_DB)/mockery.$(MOCKERY_VER).$(GO_VER).ver
 	$(call go_install,air,$(MOCKERY_CMD),$(MOCKERY_VER))
 
@@ -153,13 +161,13 @@ mockery: $(TOOLS_BIN)/mockery
 
 ## <protobuf>
 # https://github.com/protocolbuffers/protobuf/releases
-PROTOC_VER:=v28.2
+PROTOC_VER:=v29.2
 $(TOOLS_BIN)/protoc: $(TOOLS_DB)/protoc.$(PROTOC_VER).ver
 	./scripts/install-protoc --version $(PROTOC_VER) --destination $(TOOLS_DIR)
 
 # https://github.com/protocolbuffers/protobuf-go/releases
 PROTOC-GEN-GO_CMD:=google.golang.org/protobuf/cmd/protoc-gen-go
-PROTOC-GEN-GO_VER:=v1.35.1
+PROTOC-GEN-GO_VER:=v1.36.1
 $(TOOLS_BIN)/protoc-gen-go: $(TOOLS_DB)/protoc-gen-go.$(PROTOC-GEN-GO_VER).$(GO_VER).ver
 	$(call go_install,protoc-gen-go,$(PROTOC-GEN-GO_CMD),$(PROTOC-GEN-GO_VER))
 
@@ -172,7 +180,7 @@ 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.9.0
+SHFMT_VER := v3.10.0
 $(TOOLS_BIN)/shfmt: $(TOOLS_DB)/shfmt.$(SHFMT_VER).$(GO_VER).ver
 	$(call go_install,shfmt,$(SHFMT_CMD),$(SHFMT_VER))