Merge pull request #19 from vgarvardt/patch/4.3

Bumped base library version to 4.4

Author: vgarvardt

.golangci.yml renamed to .github/linters/.golangci.yml

@@ -3,11 +3,11 @@ run:
   timeout: 5m
 linters:
   disable-all: true
-  fast: false
   enable:
     - gofmt
-    - golint
+    - revive
     - goimports
+  fast: false
 linters-settings:
   gofmt:
     simplify: false

.github/workflows/codeql-analysis.yml

@@ -13,18 +13,13 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
 
+    permissions:
+      # required for all workflows
+      security-events: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head.
-          fetch-depth: 2
-
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/pr-lint.yml

@@ -0,0 +1,29 @@
+name: "PR: Lint"
+
+concurrency:
+  group: pr-lint-${{ github.head_ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+    branches: [ master, v3 ]
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: master
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/testing.yml

@@ -7,27 +7,15 @@ on:
     branches: [ master, v3 ]
 
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v1
-        with:
-          version: v1.27
-
   test:
     name: Test
     runs-on: ubuntu-latest
-    needs: [lint]
 
     services:
       postgres:
-        image: postgres:9.6-alpine
+        image: postgres:9.6
         ports:
-          - "5432"
+          - 5432:5432
         env:
           POSTGRES_USER: test
           POSTGRES_PASSWORD: test
@@ -47,7 +35,7 @@ jobs:
         if: success()
         run: go test -timeout 60s -cover ./... -coverprofile=coverage.txt -covermode=atomic
         env:
-          PG_URI: postgres://test:test@localhost:${{ job.services.postgres.ports[5432] }}/test?sslmode=disable
+          PG_URI: "postgres://test:test@localhost:5432/test?sslmode=disable"
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

go.mod

@@ -3,9 +3,9 @@ module github.com/vgarvardt/go-oauth2-pg/v4
 go 1.14
 
 require (
-	github.com/go-oauth2/oauth2/v4 v4.1.0
-	github.com/jackc/pgx/v4 v4.7.1
-	github.com/jmoiron/sqlx v1.2.0
-	github.com/stretchr/testify v1.6.1
+	github.com/go-oauth2/oauth2/v4 v4.4.2
+	github.com/jackc/pgx/v4 v4.14.1
+	github.com/jmoiron/sqlx v1.3.4
+	github.com/stretchr/testify v1.7.0
 	github.com/vgarvardt/go-pg-adapter v1.0.0
 )

go.sum

@@ -68,7 +68,7 @@ func NewTokenStore(adapter pgAdapter.Adapter, options ...TokenStoreOption) (*Tok
 	return store, err
 }
 
-// Close close the store
+// Close closes the store
 func (s *TokenStore) Close() error {
 	if !s.gcDisabled {
 		s.ticker.Stop()