update air

Author: moukoublen

.air.toml

@@ -1,17 +1,28 @@
-# Config file for [Air](https://github.com/cosmtrek/air) in TOML format
+# Config file for [Air](https://github.com/air-verse/air) in TOML format
 
 # Working directory
 # . or absolute path, please note that the directories following must be under root.
 root = "."
 tmp_dir = ".airtmp"
 
 [build]
+# Array of commands to run before each build
+# pre_cmd = ["make dbg.goboilerplate"]
+
 # Just plain old shell command. You could use `make` as well.
-cmd = "make dbg.goboilerplate"  #"make dbg.goboilerplate" # skip build from air since we use dlv debug
+cmd = "make dbg.goboilerplate"
+
+# Array of commands to run after ^C
+#post_cmd = ["clean"]
+
 # Binary file yields from `cmd`.
-bin = "build/dlv" # use dlv wrapper script as "binary"
+#bin = "build/dlv" # use dlv wrapper script as "binary"
+bin = "output/goboilerplate"
+
 # Customize binary, can setup environment variables when run your app.
 #full_bin = "APP_ENV=dev APP_USER=air ./tmp/main"
+# Add additional arguments when running binary (bin/full_bin). Will run './tmp/main hello world'.
+#args_bin = ["hello", "world"]
 # Watch these filename extensions.
 include_ext = ["go", "tpl", "tmpl", "html", "mod", "sum"]
 # Ignore these filename extensions or directories.
@@ -41,13 +52,11 @@ stop_on_error = true
 # Send Interrupt signal before killing process (windows does not support this feature)
 send_interrupt = true
 # Delay after sending Interrupt signal
-kill_delay = 400 # ms
+kill_delay = 1000000000 # nanosecond
 # Rerun binary or not
 rerun = false
-# Delay after each executions
-rerun_delay = 400
-# Add additional arguments when running binary (bin/full_bin). Will run './tmp/main hello world'.
-#args_bin = ["hello", "world"]
+# Delay after each execution
+rerun_delay = 500
 
 [log]
 # Show log time
@@ -69,3 +78,9 @@ clean_on_exit = true
 [screen]
 clear_on_rebuild = false
 keep_scroll = true
+
+# Enable live-reloading on the browser.
+[proxy]
+  enabled = true
+  proxy_port = 8090
+  app_port = 8080

.vscode/cspell.json

@@ -4,7 +4,6 @@
   // words - list of words to be always considered correct
   "words": [
     "CMDNAME",
-    "cosmtrek",
     "covermode",
     "coverprofile",
     "CURDIR",

Makefile

@@ -107,7 +107,7 @@ image:
 		--output='$(DOCKER_BUILD_OUTPUT)' \
 		.
 
-DOCKER_COMPOSE_EXEC ?= $(DOCKER_EXEC) compose -f $(CURDIR)/deployments/compose/docker-compose.yml
+DOCKER_COMPOSE_EXEC ?= $(DOCKER_EXEC) compose -f $(CURDIR)/deployments/local/docker-compose.yml
 
 .PHONY: compose-up
 compose-up:
@@ -164,8 +164,8 @@ test:
 checks: vet staticcheck gofumpt goimports golangci-lint-github-actions
 
 .PHONY: run
-run: $(TOOLS_BIN)/gojq
-	$(GO_EXEC) run -mod=vendor ./cmd/goboilerplate | $(TOOLS_BIN)/gojq
+run:
+	$(GO_EXEC) run -mod=vendor ./cmd/goboilerplate
 
 .PHONY: ci-gen-n-format
 ci-gen-n-format: goimports gofumpt

README.md

@@ -7,7 +7,7 @@ The boilerplate consists of:
 * [GitHub Actions](https://github.com/features/actions) for linter checks and tests on each pr.
 * [Dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates) setup for updating dependencies.
 * [Visual Studio Code](https://code.visualstudio.com/) settings, tasks and launch configuration for building, debugging and testing the code.
-* Docker compose and development Dockerfile with hot-rebuild (using [air](https://github.com/cosmtrek/air)) and dlv debug server.
+* Docker compose and development Dockerfile with hot-rebuild (using [air](https://github.com/air-verse/air)) and dlv debug server.
 * Production Dockerfile
 
 ## How to use
@@ -63,7 +63,7 @@ Stops (if started) the containers specified by the docker compose file `deployme
 ___
 
 #### `air`
-Installs (if needed) [air](https://github.com/cosmtrek/air) under `TOOLS_BIN` folder (default is `./.tools/bin`) and runs `air -c .air.toml`. <br>
+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/dlv

@@ -1,4 +1,4 @@
-dlv \
+exec dlv \
   --listen='0.0.0.0:2345' \
   --backend="default" \
   --api-version=2 \
@@ -20,3 +20,6 @@ dlv \
 #   #--continue
 #   #--log \
 #   #--log-output='debugger,rpc,fncall'
+
+# BusyBox ps
+# ps -o pid,ppid,pgid,tty,comm,args

build/docker/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 ### https://hub.docker.com/r/docker/dockerfile
 
 # https://docs.docker.com/build/guide/mounts/

build/docker/debug.Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.10
 ### https://hub.docker.com/r/docker/dockerfile
 
 # https://hub.docker.com/_/golang
@@ -12,7 +12,7 @@ apk update
 apk add --no-cache make git bash ca-certificates
 
 go install github.com/go-delve/delve/cmd/dlv@latest
-go install github.com/cosmtrek/air@latest
+go install github.com/air-verse/air@latest
 
 git config --global --add safe.directory /wd
 

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

@@ -27,7 +27,7 @@ services:
       - APP_HTTP_OUTBOUND_TRAFFIC_LOG_LEVEL=2
       - APP_HTTP_READ_HEADER_TIMEOUT=3s
       - APP_SHUTDOWN_TIMEOUT=6s
-      - APP_LOG_LEVEL=0
+      - APP_LOG_LEVEL=DEBUG
 
 # volumes:
 #   gocache: {}

scripts/tools.mk

@@ -127,8 +127,8 @@ gojq: $(TOOLS_BIN)/gojq
 ## </gojq>
 
 ## <air>
-# https://github.com/cosmtrek/air/releases
-AIR_CMD:=github.com/cosmtrek/air
+# https://github.com/air-verse/air/releases
+AIR_CMD:=github.com/air-verse/air
 AIR_VER:=v1.52.3
 $(TOOLS_BIN)/air: $(TOOLS_DB)/air.$(AIR_VER).$(GO_VER).ver
 	$(call go_install,air,$(AIR_CMD),$(AIR_VER))