Bump deps (#12)

.github/workflows/lint.yml

@@ -0,0 +1,18 @@
+name: Lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  golangci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.15.x, 1.16.x]
+        go-version: [1.17.x, 1.18.x]
     services:
       postgres:
         image: postgres
@@ -25,16 +25,6 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-      - name: Fetch staticcheck
-        uses: engineerd/[email protected]
-        with:
-          name: staticcheck
-          fromGitHubReleases: true
-          repo: dominikh/go-tools
-          version: latest
-          urlTemplate: "https://github.com/dominikh/go-tools/releases/download/2020.2.3/staticcheck_linux_amd64.tar.gz"
-          pathInArchive: staticcheck/staticcheck
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache dependencies
@@ -52,5 +42,3 @@ jobs:
         run: make test
         env:
           DATABASE_DSN: postgresql://postgres:s3cret@localhost:${{ job.services.postgres.ports[5432] }}/postgres?sslmode=disable
-      - name: Run staticcheck
-        run: make staticcheck

.golangci.yml

@@ -0,0 +1,6 @@
+linters-settings:
+  errcheck:
+    exclude-functions:
+      - (*database/sql.Tx).Rollback
+      - (*github.com/bsm/accord.Handle).Discard
+      - (github.com/bsm/accord/internal/cache.BatchWriter).Discard

.goreleaser.yml

@@ -8,7 +8,7 @@ builds:
       - darwin
       - linux
     goarch:
-      - 386
+      - "386"
       - amd64
       - arm
       - arm64
@@ -25,7 +25,7 @@ dockers:
   - goarch: amd64
     image_templates:
       - blacksquaremedia/accord:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64
-    use_buildx: true
+    use: buildx
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -37,7 +37,7 @@ dockers:
   - goarch: arm64
     image_templates:
       - blacksquaremedia/accord:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64
-    use_buildx: true
+    use: buildx
     build_flag_templates:
       - "--pull"
       - "--label=org.opencontainers.image.created={{.Date}}"

Makefile

@@ -5,8 +5,8 @@ test:
 
 .PHONY: default test
 
-staticcheck:
-	staticcheck ./...
+lint:
+	golangci-lint run
 
 release-snapshot:
 	goreleaser --rm-dist --snapshot

accord_test.go

@@ -3,8 +3,8 @@ package accord_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 // ------------------------------------------------------------------------

backend/direct/direct_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/bsm/accord/backend/direct"
 	"github.com/bsm/accord/backend/mock"
 	"github.com/bsm/accord/rpc"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 	"github.com/google/uuid"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("ServerBypass", func() {

backend/internal/testdata/lint.go

@@ -7,9 +7,9 @@ import (
 	"github.com/bsm/accord"
 	"github.com/bsm/accord/backend"
 	"github.com/bsm/accord/rpc"
+	G "github.com/bsm/ginkgo/v2"
+	Ω "github.com/bsm/gomega"
 	"github.com/google/uuid"
-	G "github.com/onsi/ginkgo"
-	Ω "github.com/onsi/gomega"
 )
 
 // BehavesLikeBackendData contains a subject

backend/mock/mock_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/bsm/accord/backend/internal/testdata"
 	"github.com/bsm/accord/backend/mock"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 var _ = Describe("Backend", func() {

backend/postgres/postgres_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/bsm/accord/backend/internal/testdata"
 	"github.com/bsm/accord/backend/postgres"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 	"github.com/joho/godotenv"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("Backend", func() {

client_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/bsm/accord"
 	"github.com/bsm/accord/backend/direct"
 	"github.com/bsm/accord/backend/mock"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 var _ = Describe("Client", func() {
@@ -39,7 +39,7 @@ var _ = Describe("Client", func() {
 	})
 
 	AfterEach(func() {
-		handle.Discard()
+		_ = handle.Discard()
 		Expect(subject.Close()).To(Succeed())
 		Expect(os.RemoveAll(tempDir)).To(Succeed())
 	})

go.mod

@@ -1,16 +1,30 @@
 module github.com/bsm/accord
 
-go 1.15
+go 1.17
 
 require (
-	github.com/Masterminds/squirrel v1.5.0
+	github.com/Masterminds/squirrel v1.5.2
+	github.com/bsm/ginkgo/v2 v2.1.3
+	github.com/bsm/gomega v1.18.1
 	github.com/dgraph-io/badger v1.6.2
 	github.com/golang/protobuf v1.5.2
-	github.com/google/uuid v1.2.0
-	github.com/joho/godotenv v1.3.0
-	github.com/lib/pq v1.10.2
-	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.12.0
-	google.golang.org/grpc v1.38.0
-	google.golang.org/protobuf v1.26.0
+	github.com/google/uuid v1.3.0
+	github.com/joho/godotenv v1.4.0
+	github.com/lib/pq v1.10.4
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.28.0
+)
+
+require (
+	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/dgraph-io/ristretto v0.0.2 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+	github.com/pkg/errors v0.8.1 // indirect
+	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
+	golang.org/x/text v0.3.0 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 )