chore(deps): updated go, alpine, frontend/webapp and golangci lint (#1063)

* deps: go 1.24 & alpine 3.21

* deps: update

* fix: golangci-lint config

* ci: fix golangci-lint version

* ci: upgraded golangci-lint-action to v8.0.0

* deps: pin go into 1.24.3

* fix: updated openbsd test version to 7.7

* ci: updated cross-platform-actions

* ci: updated cross-platform-action to latest master

* ci: force openbsd to update quirks to 7.7

* ci: revert quirks change

* fix: freebsd downloads golang directly

* merge master

* chore: checking the go binary

* chore: give executable permissions

* chore: freebsd -> openbsd

* deps: updated webapp deps

* deps: updated frontend deps

* deps: updated go deps

* ci: updated openbsd golang version

* deps: updated alpine to 3.22

* deps: updated golangci-lint

* deps: pinned swag to 1.16.4

* ci: ignore openbsd failures

* test(e2e): enhance container log handling and cleanup

* test(e2e): disable ryiuk

Author: fmartingr

.github/workflows/_golangci-lint.yml

@@ -13,7 +13,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # 8.0.0
         with:
-          version: "v2.1.6"
+          version: "v2.5.0"
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/_test.yml

@@ -21,7 +21,7 @@ jobs:
         options: >-
           --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
-        - 5432:5432
+          - 5432:5432
       mariadb:
         image: mariadb:10.5.27
         env:
@@ -32,7 +32,7 @@ jobs:
         options: >-
           --health-cmd="/usr/local/bin/healthcheck.sh --connect" --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
-        - 3306:3306
+          - 3306:3306
       mysql:
         image: mysql:8.0.40
         env:
@@ -46,43 +46,43 @@ jobs:
           --health-timeout=5s
           --health-retries=3
         ports:
-        - 3307:3306
+          - 3307:3306
 
     name: Go unit tests (ubuntu-latest)
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-    - name: Setup go
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-      with:
-        go-version-file: ./go.mod
-
-    - name: Set up gotestfmt
-      uses: gotesttools/gotestfmt-action@8b4478c7019be847373babde9300210e7de34bfb # v2.2.0
-
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg
-        key: golangci-lint.cache-{platform-arch}-{interval_number}-{go.mod_hash}
-        restore-keys: |
-          golangci-lint.cache-{interval_number}-
-          golangci-lint.cache-
-
-    - run: make unittest
-      env:
-        SHIORI_TEST_PG_URL: "postgres://shiori:shiori@localhost:5432/shiori?sslmode=disable"
-        SHIORI_TEST_MYSQL_URL: "shiori:shiori@(localhost:3306)/shiori"
-        SHIORI_TEST_MARIADB_URL: "shiori:shiori@(localhost:3307)/shiori"
-        CGO_ENABLED: 1 # go test -race requires cgo
-
-    - run: go build -tags osusergo,netgo -ldflags="-s -w -X main.version=$(git describe --tags) -X main.date=$(date --iso-8601=seconds)"
-
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # 5.4.3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Setup go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        with:
+          go-version-file: ./go.mod
+
+      - name: Set up gotestfmt
+        uses: gotesttools/gotestfmt-action@8b4478c7019be847373babde9300210e7de34bfb # v2.2.0
+
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg
+          key: golangci-lint.cache-{platform-arch}-{interval_number}-{go.mod_hash}
+          restore-keys: |
+            golangci-lint.cache-{interval_number}-
+            golangci-lint.cache-
+
+      - run: make unittest
+        env:
+          SHIORI_TEST_PG_URL: "postgres://shiori:shiori@localhost:5432/shiori?sslmode=disable"
+          SHIORI_TEST_MYSQL_URL: "shiori:shiori@(localhost:3306)/shiori"
+          SHIORI_TEST_MARIADB_URL: "shiori:shiori@(localhost:3307)/shiori"
+          CGO_ENABLED: 1 # go test -race requires cgo
+
+      - run: go build -tags osusergo,netgo -ldflags="-s -w -X main.version=$(git describe --tags) -X main.date=$(date --iso-8601=seconds)"
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # 5.4.3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   test-windows-macos:
     strategy:
@@ -91,41 +91,41 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: Go unit tests (${{ matrix.os }})
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-    - name: Setup go
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-      with:
-        go-version-file: ./go.mod
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg
-        key: golangci-lint.cache-{platform-arch}-{interval_number}-{go.mod_hash}
-        restore-keys: |
-          golangci-lint.cache-{interval_number}-
-          golangci-lint.cache-
+      - name: Setup go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        with:
+          go-version-file: ./go.mod
 
-    - run: make unittest GO_TEST_FLAGS="-tags test_sqlite_only -race -v -count=1"
-      env:
-        CGO_ENABLED: 1 # go test -race requires cgo
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg
+          key: golangci-lint.cache-{platform-arch}-{interval_number}-{go.mod_hash}
+          restore-keys: |
+            golangci-lint.cache-{interval_number}-
+            golangci-lint.cache-
+
+      - run: make unittest GO_TEST_FLAGS="-tags test_sqlite_only -race -v -count=1"
+        env:
+          CGO_ENABLED: 1 # go test -race requires cgo
 
-    - run: go build -tags osusergo,netgo -ldflags="-s -w -X main.version=$(git describe --tags) -X main.date=$(date --iso-8601=seconds)"
+      - run: go build -tags osusergo,netgo -ldflags="-s -w -X main.version=$(git describe --tags) -X main.date=$(date --iso-8601=seconds)"
 
   # Please note BSD support is offered on a best-effort basis, this check is not blocking but for us to be aware of issues.
   # This test also does not take into consideration the go version specified in the go.mod file and just uses the
   # latest version available in the openbsd package repository.
   test-bsd:
+    continue-on-error: true
     runs-on: ubuntu-latest
     strategy:
       matrix:
         os:
           - name: openbsd
             architecture: x86-64
-            version: '7.5'
-
+            version: "7.7"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
@@ -141,5 +141,7 @@ jobs:
           cpu_count: 1
           run: |
             sudo pkg_add -u
-            sudo pkg_add gmake git go
+            sudo pkg_add gmake git
+            curl -L https://go.dev/dl/go1.25.1.openbsd-amd64.tar.gz | sudo tar -C /usr/local -xzf -
+            export PATH=$PATH:/usr/local/go/bin
             gmake unittest GO_TEST_FLAGS="-tags test_sqlite_only -v -count=1"

.golangci.bck.yml

@@ -0,0 +1,30 @@
+# Docs: https://golangci-lint.run/usage/configuration/#config-file
+run:
+  timeout: 5m
+
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  exclude-dirs:
+    - internal/mocks
+
+linters-settings:
+  gofmt:
+    simplify: true
+  govet:
+    enable-all: true
+    disable:
+      - fieldalignment
+
+linters:
+  disable-all: true
+  enable:
+    - copyloopvar
+    - gofmt
+    - gosimple
+    # - govet # Re-enable when all shadow declarations are fixed
+    - ineffassign
+    - predeclared
+    - staticcheck
+    - unconvert
+    - unused

Makefile

@@ -16,7 +16,7 @@ LDFLAGS += -s -w -X main.version=$(BUILD_HASH) -X main.date=$(BUILD_TIME)
 # Build (container)
 CONTAINER_RUNTIME := docker
 CONTAINERFILE_NAME := Dockerfile
-CONTAINER_ALPINE_VERSION := 3.21
+CONTAINER_ALPINE_VERSION := 3.22
 BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/arm/v7
 
 # This is used for local development only, forcing linux to create linux only images but with the arch

bun.lockb

@@ -2,7 +2,9 @@ package e2eutil
 
 import (
 	"context"
+	"io"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -77,11 +79,60 @@ func NewShioriContainer(t *testing.T, tag string) ShioriContainer {
 	container, err := testcontainers.GenericContainer(context.Background(), containerDefinition)
 	require.NoError(t, err)
 	t.Cleanup(func() {
-		require.NoError(t, container.Terminate(context.Background()))
+		// Print container logs on test failure for debugging
+		if t.Failed() {
+			printContainerLogs(t, container, "Container logs on test failure:")
+		}
+
+		// Terminate container with error handling
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer cancel()
+		if err := container.Terminate(ctx); err != nil {
+			// Log the error but don't fail the test cleanup
+			t.Logf("Warning: Failed to terminate container: %v", err)
+		}
 	})
 
 	return ShioriContainer{
 		t:         t,
 		Container: container,
 	}
 }
+
+// printContainerLogs prints the container logs for debugging purposes
+func printContainerLogs(t *testing.T, container testcontainers.Container, prefix string) {
+	if container == nil {
+		t.Logf("%s Container is nil, cannot retrieve logs", prefix)
+		return
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	logs, err := container.Logs(ctx)
+	if err != nil {
+		t.Logf("%s Failed to get container logs: %v", prefix, err)
+		return
+	}
+	defer logs.Close()
+
+	logBytes, err := io.ReadAll(logs)
+	if err != nil {
+		t.Logf("%s Failed to read container logs: %v", prefix, err)
+		return
+	}
+
+	if len(logBytes) == 0 {
+		t.Logf("%s No container logs available", prefix)
+		return
+	}
+
+	// Split logs into lines and add prefix
+	logLines := strings.Split(strings.TrimSpace(string(logBytes)), "\n")
+	t.Logf("%s", prefix)
+	for i, line := range logLines {
+		if line != "" {
+			t.Logf("  [%d] %s", i+1, line)
+		}
+	}
+}