switch v2 directory to have v2 naming, add GitHub CI setup

go-pkgz · Apr 4, 2024 · 4e32f30 · 4e32f30
1 parent 206a7a3
commit 4e32f30
Show file tree

Hide file tree

Showing 35 changed files with 203 additions and 65 deletions.
diff --git a/.github/workflows/ci-v2.yml b/.github/workflows/ci-v2.yml
@@ -0,0 +1,60 @@
+name: build-v2
+
+on:
+  push:
+    branches:
+    tags:
+    paths:
+      - ".github/workflows/ci-v2.yml"
+      - "v2/**"
+  pull_request:
+    paths:
+      - ".github/workflows/ci-v2.yml"
+      - "v2/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: disable and stop mono-xsp4.service (wtf?)
+        run: |
+          sudo systemctl stop mono-xsp4.service || true
+          sudo systemctl disable mono-xsp4.service || true
+
+      - name: set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+        id: go
+
+      - name: launch mongodb
+        uses: wbari/start-mongoDB@v0.2
+        with:
+          mongoDBVersion: "6.0"
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: build and test
+        run: |
+          go test -timeout=60s -v -race -p 1 -covermode=atomic -coverprofile=$GITHUB_WORKSPACE/profile.cov ./...
+          go build -race
+        working-directory: v2
+        env:
+          TZ: "America/Chicago"
+          ENABLE_MONGO_TESTS: "true"
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v4
+        with:
+          version: latest
+          args: --config ../.golangci.yml
+          working-directory: v2
+
+      - name: submit coverage
+        run: |
+          go install github.com/mattn/goveralls@latest
+          goveralls -service="github" -coverprofile=$GITHUB_WORKSPACE/profile.cov
+        env:
+          COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,13 @@ on:
   push:
     branches:
     tags:
+    paths-ignore:
+      - ".github/workflows/ci-v2.yml"
+      - "v2/**"
   pull_request:
+    paths-ignore:
+      - ".github/workflows/ci-v2.yml"
+      - "v2/**"
 
 jobs:
   build:
@@ -16,7 +22,7 @@ jobs:
           sudo systemctl stop mono-xsp4.service || true
           sudo systemctl disable mono-xsp4.service || true
 
-      - name: set up go 1.21
+      - name: set up go
         uses: actions/setup-go@v5
         with:
           go-version: "1.21"

diff --git a/v2/auth.go b/v2/auth.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/go-pkgz/rest"
 
-	"github.com/go-pkgz/auth/avatar"
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/middleware"
-	"github.com/go-pkgz/auth/provider"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/avatar"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/middleware"
+	"github.com/go-pkgz/auth/v2/provider"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // Client is a type of auth client

diff --git a/v2/auth_test.go b/v2/auth_test.go
@@ -17,10 +17,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/avatar"
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/provider"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/avatar"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/provider"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestNewService(t *testing.T) {

diff --git a/v2/avatar/avatar.go b/v2/avatar/avatar.go
@@ -19,8 +19,8 @@ import (
 	"github.com/rrivera/identicon"
 	"golang.org/x/image/draw"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // Proxy provides http handler for avatars from avatar.Store

diff --git a/v2/avatar/avatar_test.go b/v2/avatar/avatar_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestAvatar_Put(t *testing.T) {

diff --git a/v2/avatar/store.go b/v2/avatar/store.go
@@ -19,7 +19,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // imgSfx for avatars

diff --git a/v2/go.mod b/v2/go.mod
@@ -1,4 +1,4 @@
-module github.com/go-pkgz/auth
+module github.com/go-pkgz/auth/v2
 
 go 1.21
 

diff --git a/v2/go.sum b/v2/go.sum
diff --git a/v2/middleware/auth.go b/v2/middleware/auth.go
@@ -10,9 +10,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/provider"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/provider"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // Authenticator is top level auth object providing middlewares

diff --git a/v2/middleware/auth_test.go b/v2/middleware/auth_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/provider"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/provider"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 var testJwtValid = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJ0ZXN0X3N5cyIsImV4cCI6Mjc4OTE5MTgyMiwianRpIjoicmFuZG9tIGlkIiwiaXNzIjoicmVtYXJrNDIiLCJuYmYiOjE1MjY4ODQyMjIsInVzZXIiOnsibmFtZSI6Im5hbWUxIiwiaWQiOiJwcm92aWRlcjFfaWQxIiwicGljdHVyZSI6Imh0dHA6Ly9leGFtcGxlLmNvbS9waWMucG5nIiwiaXAiOiIxMjcuMC4wLjEiLCJlbWFpbCI6Im1lQGV4YW1wbGUuY29tIiwiYXR0cnMiOnsiYm9vbGEiOnRydWUsInN0cmEiOiJzdHJhLXZhbCJ9fX0.orBYt_pVA4uvCCw0JMQLla3DA0mpjRTl_U9vT_wtI30"

diff --git a/v2/middleware/user_updater.go b/v2/middleware/user_updater.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"net/http"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // UserUpdater defines interface adding extras or modifying UserInfo in request context

diff --git a/v2/middleware/user_updater_test.go b/v2/middleware/user_updater_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestUserUpdate(t *testing.T) {

diff --git a/v2/provider/apple.go b/v2/provider/apple.go
@@ -26,8 +26,8 @@ import (
 	"github.com/go-pkgz/rest"
 	"github.com/golang-jwt/jwt"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 const (
@@ -41,7 +41,7 @@ const (
 	appleRequestContentType = "application/x-www-form-urlencoded"
 
 	// UserAgent required to every request to Apple REST API
-	defaultUserAgent = "github.com/go-pkgz/auth"
+	defaultUserAgent = "github.com/go-pkgz/auth/v2"
 
 	// AcceptJSONHeader is the content to accept from response
 	AcceptJSONHeader = "application/json"

diff --git a/v2/provider/apple_test.go b/v2/provider/apple_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 type customLoader struct{} // implement custom private key loader interface

diff --git a/v2/provider/custom_server.go b/v2/provider/custom_server.go
@@ -15,9 +15,9 @@ import (
 	goauth2 "github.com/go-oauth2/oauth2/v4/server"
 	"golang.org/x/oauth2"
 
-	"github.com/go-pkgz/auth/avatar"
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/avatar"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // CustomHandlerOpt are options to initialize a handler for oauth2 server

diff --git a/v2/provider/custom_server_test.go b/v2/provider/custom_server_test.go
@@ -22,8 +22,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestCustomProvider(t *testing.T) {

diff --git a/v2/provider/dev_provider.go b/v2/provider/dev_provider.go
@@ -11,9 +11,9 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/go-pkgz/auth/avatar"
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/avatar"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 const (

diff --git a/v2/provider/dev_provider_test.go b/v2/provider/dev_provider_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestDevProvider(t *testing.T) {

diff --git a/v2/provider/direct.go b/v2/provider/direct.go
@@ -11,8 +11,8 @@ import (
 	"github.com/go-pkgz/rest"
 	"github.com/golang-jwt/jwt"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 const (

diff --git a/v2/provider/direct_test.go b/v2/provider/direct_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestDirect_LoginHandler(t *testing.T) {

diff --git a/v2/provider/oauth1.go b/v2/provider/oauth1.go
@@ -12,8 +12,8 @@ import (
 	"github.com/go-pkgz/rest"
 	"github.com/golang-jwt/jwt"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // Oauth1Handler implements /login, /callback and /logout handlers for oauth1 flow

diff --git a/v2/provider/oauth1_test.go b/v2/provider/oauth1_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 const (

diff --git a/v2/provider/oauth2.go b/v2/provider/oauth2.go
@@ -13,8 +13,8 @@ import (
 	"github.com/golang-jwt/jwt"
 	"golang.org/x/oauth2"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 // Oauth2Handler implements /login, /callback and /logout handlers from aouth2 flow

diff --git a/v2/provider/oauth2_test.go b/v2/provider/oauth2_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
-	"github.com/go-pkgz/auth/logger"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/logger"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 var testJwtValid = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJ0ZXN0X3N5cyIsImV4cCI6Mjc4OTE5MTgyMiwianRpIjoicmFuZG9tIGlkIiwiaXNzIjoicmVtYXJrNDIiLCJuYmYiOjE1MjY4ODQyMjIsInVzZXIiOnsibmFtZSI6Im5hbWUxIiwiaWQiOiJpZDEiLCJwaWN0dXJlIjoiaHR0cDovL2V4YW1wbGUuY29tL3BpYy5wbmciLCJpcCI6IjEyNy4wLjAuMSIsImVtYWlsIjoibWVAZXhhbXBsZS5jb20iLCJhdHRycyI6eyJib29sYSI6dHJ1ZSwic3RyYSI6InN0cmEtdmFsIn19fQ.NN7TK-IbzpNgHMtld9-7BDypMGDZdMpwCmUMSfd31Zk"

diff --git a/v2/provider/providers.go b/v2/provider/providers.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/dghubble/oauth1"
 	"github.com/dghubble/oauth1/twitter"
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/facebook"
 	"golang.org/x/oauth2/github"

diff --git a/v2/provider/providers_test.go b/v2/provider/providers_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestProviders_NewGoogle(t *testing.T) {

diff --git a/v2/provider/sender/email.go b/v2/provider/sender/email.go
@@ -4,7 +4,7 @@ package sender
 import (
 	"time"
 
-	"github.com/go-pkgz/auth/logger"
+	"github.com/go-pkgz/auth/v2/logger"
 	"github.com/go-pkgz/email"
 )
 

diff --git a/v2/provider/sender/email_test.go b/v2/provider/sender/email_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-pkgz/auth/logger"
+	"github.com/go-pkgz/auth/v2/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/v2/provider/service.go b/v2/provider/service.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 const (

diff --git a/v2/provider/service_test.go b/v2/provider/service_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/go-pkgz/auth/token"
+	"github.com/go-pkgz/auth/v2/token"
 )
 
 func TestHandler(t *testing.T) {