Merge pull request #3 from lithictech/ginkgov2

Bump to Go 1.16, and GinkgoV2

.github/workflows/pr-checks.yml

@@ -1,5 +1,7 @@
 name: PR Checks
-on: pull_request
+on:
+  pull_request:
+  push: { branches: [master] }
 jobs:
   run-tests:
     runs-on: ubuntu-latest
@@ -8,10 +10,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
-      - name: Set up Go 1.13.x
+      - name: Set up Go 1.16.x
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13.x
+          go-version: 1.16.x
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod

api/api_test.go

@@ -8,7 +8,7 @@ import (
 	. "github.com/lithictech/go-aperitif/api/echoapitest"
 	. "github.com/lithictech/go-aperitif/apitest"
 	"github.com/lithictech/go-aperitif/logctx"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/rgalanakis/golangal"
 	"github.com/sirupsen/logrus"

api/apiparams/apiparams_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/lithictech/go-aperitif/api/apiparams"
 	. "github.com/lithictech/go-aperitif/api/echoapitest"
 	. "github.com/lithictech/go-aperitif/apitest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/rgalanakis/golangal"
 	"net/http"

api/auth0jwt/auth0jwt_test.go

@@ -1,7 +1,7 @@
 package auth0jwt_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"testing"
 )

api/preflight/preflight_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/lithictech/go-aperitif/api/echoapitest"
 	"github.com/lithictech/go-aperitif/api/preflight"
 	. "github.com/lithictech/go-aperitif/apitest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/rgalanakis/golangal"
 	"testing"

api/spa/spa_test.go

@@ -5,7 +5,7 @@ import (
 	. "github.com/lithictech/go-aperitif/api/echoapitest"
 	"github.com/lithictech/go-aperitif/api/spa"
 	. "github.com/lithictech/go-aperitif/apitest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/rgalanakis/golangal"
 	"net/http"

async/async_test.go

@@ -2,7 +2,7 @@ package async_test
 
 import (
 	"github.com/lithictech/go-aperitif/async"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"testing"
 )

go.mod

@@ -1,6 +1,6 @@
 module github.com/lithictech/go-aperitif
 
-go 1.13
+go 1.16
 
 require (
 	github.com/auth0/go-jwt-middleware v0.0.0-20200507191422-d30d7b9ece63
@@ -10,13 +10,13 @@ require (
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/gommon v0.3.0 // indirect
-	github.com/onsi/ginkgo v1.12.2
-	github.com/onsi/gomega v1.10.1
+	github.com/onsi/ginkgo/v2 v2.3.1
+	github.com/onsi/gomega v1.22.0
 	github.com/pkg/errors v0.9.1
-	github.com/rgalanakis/golangal v0.0.0-20200710064529-eb44ace1b187
+	github.com/rgalanakis/golangal v1.1.0
 	github.com/rgalanakis/validator v0.0.0-20180731224108-4a34a8927f7c
 	github.com/sirupsen/logrus v1.6.0
 	github.com/valyala/fasttemplate v1.1.0 // indirect
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	google.golang.org/appengine v1.6.6 // indirect
 )

jwtee/jwtee_test.go

@@ -3,7 +3,7 @@ package jwtee_test
 import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/lithictech/go-aperitif/jwtee"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/rgalanakis/golangal"
 	"testing"

kronos/kronos_test.go

@@ -3,8 +3,7 @@ package kronos_test
 import (
 	"fmt"
 	"github.com/lithictech/go-aperitif/kronos"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"math/rand"
 	"time"

logctx/logctx_test.go

@@ -3,7 +3,7 @@ package logctx_test
 import (
 	"context"
 	"github.com/lithictech/go-aperitif/logctx"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 	"testing"

parallel/parallel_test.go

@@ -2,7 +2,7 @@ package parallel_test
 
 import (
 	"github.com/lithictech/go-aperitif/parallel"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sync"
 	"testing"

quiz/quiz.go

@@ -1,7 +1,7 @@
 package quiz
 
 import (
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"math/rand"
 	"os"
 	"strconv"

quiz/quiz_test.go

@@ -2,7 +2,7 @@ package quiz_test
 
 import (
 	"github.com/lithictech/go-aperitif/quiz"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"testing"
 )

stopwatch/stopwatch_test.go

@@ -2,7 +2,7 @@ package stopwatch_test
 
 import (
 	"github.com/lithictech/go-aperitif/stopwatch"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/test"

stringutil/stringutil_test.go

@@ -2,7 +2,7 @@ package stringutil_test
 
 import (
 	"github.com/lithictech/go-aperitif/stringutil"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"strings"
 	"testing"

validator/validator_test.go

@@ -3,7 +3,7 @@ package validator_test
 import (
 	"errors"
 	"github.com/lithictech/go-aperitif/validator"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"testing"
 	"time"