Merge pull request 'chore(deps): update dependency golangci/golangci-lint to v2.9.0' (#210) from renovate/golangci-golangci-lint-2.x into master

.dockerignore

@@ -0,0 +1 @@
+db-wait

.gitattributes

@@ -1,10 +0,0 @@
-# checkout alls text files with end of line = line feed
-* text eol=lf
-
-# Binary files should be checked in and out as binary
-*.png binary
-*.jpg binary
-*.eot binary
-*.ttf binary
-*.pkcs8 binary
-*.pkcs12 binary

.gitea/workflows/golang-linters.yaml

@@ -0,0 +1,29 @@
+name: "Lint Golang files"
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+  workflow_dispatch: {}
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    name: "Run golang CI linter"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
+    steps:
+    - uses: actions/checkout@v6.0.2
+    - uses: actions/setup-go@v6.2.0
+      with:
+        go-version: ${{ matrix.go }}
+    - uses: golangci/golangci-lint-action@v9.2.0
+      with:
+        version: v2.9.0 # renovate: datasource=github-releases depName=golangci/golangci-lint

.gitea/workflows/golang-tests.yaml

@@ -1,4 +1,4 @@
-name: Golang Tests
+name: "Run Golang tests"
 
 on:
   pull_request:
@@ -6,16 +6,37 @@ on:
   push:
     branches: [ '**' ]
     tags-ignore: [ '**' ]
+  workflow_dispatch: {}
 
 jobs:
-  unittest:
+  # integration-test:
-    runs-on:
+  #   name: "Run integration tests"
-    - ubuntu-latest
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       go: [ stable ]
+  #       os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
+  #   steps:
+  #   - uses: actions/checkout@v4.3.0
+  #   - uses: actions/setup-go@v5.5.0
+  #     with:
+  #       go-version: ${{ matrix.go }}
+  #   - env:
+  #       GOPROXY: ${{ vars.GOPROXY }}
+  #     run: make test/integration
+
+  unit-test:
+    name: "Run unit tests"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6.0.2
-    - uses: actions/setup-go@v5.5.0
+    - uses: actions/setup-go@v6.2.0
       with:
-        go-version: stable
+        go-version: ${{ matrix.go }}
     - env:
         GOPROXY: ${{ vars.GOPROXY }}
       run: make test/unit

.gitea/workflows/markdown-linters.yaml

@@ -1,20 +1,19 @@
-name: Markdown linter
+name: "Lint Markdown files"
 
 on:
   pull_request:
     types: [ "opened", "reopened", "synchronize" ]
   push:
-    branches: [ '**' ]
+    branches: [ '*' ]
-    tags-ignore: [ '**' ]
+    tags-ignore: [ '*' ]
   workflow_dispatch: {}
 
 jobs:
   markdown-lint:
-    container:
+    name: "Run markdown linter"
-      image: git.cryptic.systems/volker.raschek/markdownlint:0.45.0
+    runs-on: ubuntu-latest
-    runs-on:
-    - ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6.0.2
-    - name: Lint Markdown files
+    - uses: DavidAnson/markdownlint-cli2-action@v21.0.0
-      run: markdownlint --config .markdownlint.yaml .
+      with:
+        globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Release
+name: "Release"
 
 on:
   push:
@@ -9,15 +9,15 @@ permissions:
 
 jobs:
   release:
-    runs-on:
+    name: "Release application"
-    - ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6.0.2
-    - uses: docker/setup-qemu-action@v3.6.0
+    - uses: docker/setup-qemu-action@v3.7.0
-    - uses: actions/setup-go@v5.5.0
+    - uses: actions/setup-go@v6.2.0
       with:
         go-version: stable
-    - uses: docker/login-action@v3.4.0
+    - uses: docker/login-action@v3.7.0
       with:
         registry: git.cryptic.systems
         username: ${{ github.repository_owner }}
@@ -26,9 +26,9 @@ jobs:
         GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
         GONOSUMDB: ${{ vars.GONOSUMDB }}
         GOPROXY: ${{ vars.GOPROXY }}
-      uses: goreleaser/goreleaser-action@v6.3.0
+      uses: goreleaser/goreleaser-action@v6.4.0
       with:
-        version: "~> v2"
+        version: v2.13.3 # renovate: datasource=github-releases depName=goreleaser/goreleaser
         args: release --clean
 
   sync-to-hub-docker-io:

.gitea/workflows/update-docker-hub-description.yaml

@@ -4,16 +4,17 @@ on:
   push:
     branches: [ 'master' ]
     paths: [ 'README.md' ]
+  workflow_dispatch: {}
 
 jobs:
   update-description-on-hub-docker-io:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6.0.2
-    - uses: peter-evans/dockerhub-description@v4.0.2
+    - uses: peter-evans/dockerhub-description@v5.0.0
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}
         password: ${{ secrets.DOCKER_IO_PASSWORD }}
-        repository: volkerraschek/dcmerge
+        repository: volkerraschek/db-wait
         readme-filepath: README.md

.golangci.yaml

@@ -0,0 +1,13 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+  - errname
+  - gosec
+
+  exclusions:
+    rules: []
+    warn-unused: true
+
+run:
+  tests: true

go.mod

@@ -3,12 +3,12 @@ module git.cryptic.systems/volker.raschek/db-wait
 go 1.24
 
 require (
-	github.com/lib/pq v1.10.9
+	github.com/lib/pq v1.11.2
-	github.com/sijms/go-ora/v2 v2.8.24
+	github.com/sijms/go-ora/v2 v2.9.0
-	github.com/spf13/cobra v1.9.1
+	github.com/spf13/cobra v1.10.2
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
 )

go.sum

@@ -1,14 +1,14 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.11.2 h1:x6gxUeu39V0BHZiugWe8LXZYZ+Utk7hSJGThs8sdzfs=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.11.2/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sijms/go-ora/v2 v2.8.24 h1:TODRWjWGwJ1VlBOhbTLat+diTYe8HXq2soJeB+HMjnw=
+github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
-github.com/sijms/go-ora/v2 v2.8.24/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/dbwait/dbwait.go

@@ -64,8 +64,8 @@ LOOP:
 			case "postgres":
 				row := sqlDB.QueryRowContext(queryCtx, "SELECT 1 AS ROW")
 				err := row.Err()
-				switch {
+				switch err {
-				case err == nil:
+				case nil:
 					return nil
 				default:
 					fmt.Fprintf(os.Stderr, "%s: %s\n", time.Now().String(), err.Error())