Dev (#370)

* delete go loop copy vars

* discriminator and mapping updates

* handler panic for rendering

* utility handler fn extraction

* extension grouping

* update golangcilint

* update styles

* remove e2e ci

* correct path for local pnpm

* pnpm v update

* column

* update test os

* fix wrong paths

* lint

Author: danicc097

.envrc

@@ -4,6 +4,7 @@
 export GOBIN=$PWD/bin/tools
 export PATH=$GOBIN:$PATH
 export PATH=$GOBIN/bin:$PATH
+export PATH=$PWD/bin/tools/bin:$PATH
 export PATH=$PWD/bin:$PATH
 export PATH=$PWD/bin/build:$PATH
 

.github/actions/setup/action.yaml

@@ -28,7 +28,7 @@ runs:
 
     - uses: pnpm/action-setup@v2
       with:
-        version: 8.3.1
+        version: 9.12.0
         run_install: false
 
     - name: Setup pnpm cache (1)

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ on:
 jobs:
   run:
     timeout-minutes: 60
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -89,15 +89,6 @@ jobs:
 
           project e2e.run
 
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: e2e/playwright-report/
-          retention-days: 5
-      # TODO: reuse actions/setup:
-      # https://stackoverflow.com/questions/65242830/in-a-github-actions-workflow-is-there-a-way-to-have-multiple-jobs-reuse-the-sam
-      # https://github.com/kmadof/github-actions-manual/blob/main/.github/actions/say-hello/action.yml
 
       - name: Build frontend
         run: |

.golangci.yml

@@ -1,9 +1,6 @@
 # https://github.com/MarioCarrion/todo-api-microservice-example/blob/main/.golangci.yml
-run:
-  skip-files: # ignore yaml error...
-    - ".*\\.xo\\.go$"
-    - ".*\\.gen\\.go$"
-    - ".*\\.pb\\.go$"
+# yaml-language-server: $schema=https://raw.githubusercontent.com/golangci/golangci-lint/refs/tags/v1.63.4/jsonschema/golangci.jsonschema.json
+
 linters:
   enable-all: true
   disable:
@@ -65,7 +62,6 @@ linters-settings:
         json: goCamel
         yaml: goCamel
   staticcheck:
-    go: "1.22"
     checks:
       - "all"
   gci:
@@ -117,6 +113,10 @@ linters-settings:
     ignorePackageGlobs:
       - github.com/danicc097/openapi-go-gin-postgres-sqlc/*
 issues:
+  exclude-files:
+    - ".*\\.xo\\.go$"
+    - ".*\\.gen\\.go$"
+    - ".*\\.pb\\.go$"
   exclude-rules:
     - path: "internal/testutil/*" # doesn't work with internal/... for some reason
       linters:

bin/.project.dependencies.sh

@@ -52,7 +52,7 @@ install.bin.column() {
     cp .libs/column ../bin/tools/
     cd ..
     rm -rf util-linux-2.*
-    column --version
+    column --version || column -v
   } 2>&4 | xlog >&3; } 4>&1 | xerr >&3; } 3>&1
 }
 

bin/project

@@ -285,7 +285,7 @@ x.install-tools() {
     commands=(
       "go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@v4.15.2"
       "go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.24.0"
-      "go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2"
+      "go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4"
       "go install github.com/tufin/oasdiff@v1.10.9"
       "go install golang.org/x/tools/cmd/goimports@latest"
       "go install mvdan.cc/gofumpt@latest"
@@ -1250,14 +1250,19 @@ x.lint.go() {
   # golangci-lint run --config=.golangci.yml --allow-parallel-runners --fast --fix &>/dev/null || true
 }
 
-exhaustruct_lint() {
+exhaustive_lint() {
   local lint_config=$(
     cat <<EOF
 linters:
   disable-all: true
   enable:
     - exhaustruct
+    - exhaustive
 linters-settings:
+  exhaustive:
+    explicit-exhaustive-switch: true
+    explicit-exhaustive-map: true
+    default-case-required: true
   exhaustruct:
     # lint struct usage in all packages that use them
     include:
@@ -1359,7 +1364,7 @@ x.test.backend.setup() {
 x.test.backend() {
   xsetup.backup
   { { {
-    exhaustruct_lint
+    exhaustive_lint
 
     x.test.xo
 

bin/templates/crud-api-tests.go.tmpl.bash

@@ -56,7 +56,6 @@ $(test -n "$with_project" && echo "		pj := models.ProjectNameDemo
 		},
 	}
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			ufixture := ff.CreateUser(context.Background(), servicetestutil.CreateUserParams{
@@ -217,7 +216,6 @@ done)
 		// },
 	}
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

bin/templates/crud-api.go.tmpl.bash

@@ -18,8 +18,6 @@ $(test -n "$with_project" && echo "	params.ProjectID = internal.ProjectIDByName[
 	${camel_name}, err := h.svc.${pascal_name}.Create(c, tx, &params)
 	if err != nil {
 		renderErrorResponse(c, "Could not create ${sentence_name}", err)
-
-		return nil, nil
 	}
 
 	res := ${pascal_name}Response{
@@ -36,8 +34,6 @@ func (h *StrictHandlers) Get${pascal_name}(c *gin.Context, request Get${pascal_n
 	${camel_name}, err := h.svc.${pascal_name}.ByID(c, tx, request.${pascal_name}ID)
 	if err != nil {
 		renderErrorResponse(c, "Could not create ${sentence_name}", err)
-
-		return nil, nil
 	}
 
 	res := ${pascal_name}Response{
@@ -56,8 +52,6 @@ func (h *StrictHandlers) Update${pascal_name}(c *gin.Context, request Update${pa
 	${camel_name}, err := h.svc.${pascal_name}.Update(c, tx, request.${pascal_name}ID, &params)
 	if err != nil {
 		renderErrorResponse(c, "Could not update ${sentence_name}", err)
-
-		return nil, nil
 	}
 
 	res := ${pascal_name}Response{
@@ -74,8 +68,6 @@ func (h *StrictHandlers) Delete${pascal_name}(c *gin.Context, request Delete${pa
 	_, err := h.svc.${pascal_name}.Delete(c, tx, request.${pascal_name}ID)
 	if err != nil {
 		renderErrorResponse(c, "Could not delete ${sentence_name}", err)
-
-		return nil, nil
 	}
 
 	return Delete${pascal_name}204Response{}, nil

bin/templates/crud-repo-tests.go.tmpl.bash

@@ -58,7 +58,6 @@ $(test -n "$with_project" && echo "	projectID := internal.ProjectIDByName[models
 		},
 	}
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -112,7 +111,6 @@ func Test${pascal_name}_${delete_method}(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -154,7 +152,6 @@ func Test${pascal_name}_ByIndexedQueries(t *testing.T) {
 		},
 	}
 	for _, tc := range uniqueTestCases {
-		tc := tc
 		runGenericFilterTests(t, tc)
 	}
 }

bin/templates/crud-service-tests.go.tmpl.bash

@@ -82,7 +82,6 @@ done)
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()