Downgrade go pg

.github/workflows/golang-ci.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [ '1.21.3' ]
+        go: [ '1.21.12' ]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
@@ -17,12 +17,18 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Linting
+      run: make lint
     - name: Unit tests
       run: make test
     - name: (Experimental) Vulnerability Scan
       run: make vuln-scan
+    - name: Install Docker Compose
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y docker-compose
     - name: Integration tests
-      run: docker-compose run testserver make ci
+      run: docker-compose run testserver make integration
     - name: Send coverage
       uses: shogo82148/actions-goveralls@v1
       with:

.golangci.yml

@@ -0,0 +1,11 @@
+# for further options, see https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml
+run:
+  modules-download-mode: vendor
+  timeout: 4m
+issues:
+  include:
+    - EXC0005
+linters:
+  enable:
+    - gofumpt
+linters-settings:

Makefile

@@ -56,7 +56,7 @@ lint:
 	$(GO) run -mod=vendor github.com/golangci/golangci-lint/cmd/golangci-lint run --timeout 2m
 
 test:
-	$(GO) test $(GO_TEST_FLAGS) -short ./...
+	$(GO) test $(GO_TEST_FLAGS) -covermode=atomic -coverprofile=coverage.out -short ./...
 
 integration:
 	$(GO) test $(GO_TEST_FLAGS) -run TestIntegration ./...

backend/objstore/objstore.go

@@ -105,7 +105,6 @@ func registerHealthchecks() {
 		servicehealthcheck.RegisterHealthCheck("objstore", &HealthCheck{
 			Client: client,
 		})
-
 	})
 }
 

backend/postgres/errors.go

@@ -7,12 +7,10 @@ import (
 	"io"
 	"net"
 
-	"github.com/go-pg/pg/v10"
+	"github.com/go-pg/pg"
 )
 
-var (
-	ErrNotUnique = errors.New("not unique")
-)
+var ErrNotUnique = errors.New("not unique")
 
 func IsErrConnectionFailed(err error) bool {
 	// go-pg has this check internally for network errors

backend/postgres/errors_test.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/go-pg/pg/v10"
+	"github.com/go-pg/pg"
 	"github.com/stretchr/testify/require"
 
 	pbpostgres "github.com/pace/bricks/backend/postgres"

backend/postgres/health_postgres.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-pg/pg/v10/orm"
+	"github.com/go-pg/pg/orm"
 	"github.com/pace/bricks/maintenance/health/servicehealthcheck"
 )
 
@@ -56,7 +56,6 @@ func (h *HealthCheck) HealthCheck(ctx context.Context) servicehealthcheck.Health
 	// If no error occurred set the State of this Health Check to healthy
 	h.state.SetHealthy()
 	return h.state.GetState()
-
 }
 
 // CleanUp drops the test table.

backend/postgres/health_postgres_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-pg/pg/v10/orm"
+	"github.com/go-pg/pg/orm"
 	http2 "github.com/pace/bricks/http"
 	"github.com/pace/bricks/maintenance/errors"
 	"github.com/pace/bricks/maintenance/health/servicehealthcheck"

backend/postgres/metrics.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-pg/pg/v10"
+	"github.com/go-pg/pg"
 	"github.com/prometheus/client_golang/prometheus"
 )