[patch] update module to v4 (#70)

yahoojapan · Jul 3, 2020 · 6f71f3f · 6f71f3f
1 parent 70e8370
commit 6f71f3f
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 48 deletions.
diff --git a/access/option.go b/access/option.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
 )
 
 var (

diff --git a/access/option_test.go b/access/option_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
 )
 
 func TestWithJWKProvider(t *testing.T) {

diff --git a/access/processor.go b/access/processor.go
@@ -23,7 +23,7 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
 )
 
 const (

diff --git a/access/processor_test.go b/access/processor_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/pkg/errors"
 
 	jwt "github.com/dgrijalva/jwt-go"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
 )
 
 // test data is generated by `access/asserts/private.pem`

diff --git a/authorizerd.go b/authorizerd.go
@@ -29,11 +29,11 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/yahoojapan/athenz-authorizer/v3/access"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/policy"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
-	"github.com/yahoojapan/athenz-authorizer/v3/role"
+	"github.com/yahoojapan/athenz-authorizer/v4/access"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/policy"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/role"
 )
 
 // Authorizerd represents a daemon for user to verify the role token

diff --git a/authorizerd_mock_test.go b/authorizerd_mock_test.go
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/yahoojapan/athenz-authorizer/v3/access"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
-	"github.com/yahoojapan/athenz-authorizer/v3/role"
+	"github.com/yahoojapan/athenz-authorizer/v4/access"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/role"
 )
 
 type ConfdMock struct {

diff --git a/authorizerd_test.go b/authorizerd_test.go
@@ -29,11 +29,11 @@ import (
 	"github.com/kpango/fastime"
 	"github.com/kpango/gache"
 	"github.com/pkg/errors"
-	"github.com/yahoojapan/athenz-authorizer/v3/access"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/policy"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
-	"github.com/yahoojapan/athenz-authorizer/v3/role"
+	"github.com/yahoojapan/athenz-authorizer/v4/access"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/policy"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/role"
 )
 
 func TestNew(t *testing.T) {

diff --git a/errors.go b/errors.go
@@ -19,8 +19,8 @@ package authorizerd
 import (
 	"errors"
 
-	"github.com/yahoojapan/athenz-authorizer/v3/policy"
-	"github.com/yahoojapan/athenz-authorizer/v3/role"
+	"github.com/yahoojapan/athenz-authorizer/v4/policy"
+	"github.com/yahoojapan/athenz-authorizer/v4/role"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/yahoojapan/athenz-authorizer/v3
+module github.com/yahoojapan/athenz-authorizer/v4
 
 go 1.14
 
@@ -11,6 +11,6 @@ require (
 	github.com/kpango/glg v1.5.1
 	github.com/lestrrat-go/jwx v1.0.2
 	github.com/pkg/errors v0.9.1
-	github.com/yahoo/athenz v1.9.9
+	github.com/yahoo/athenz v1.9.10
 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 )
diff --git a/go.sum b/go.sum
@@ -57,8 +57,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/yahoo/athenz v1.9.9 h1:O/deSn34pEFz6L0jWznJ4JGoxyCiTPoNKwAFVVLQJTk=
-github.com/yahoo/athenz v1.9.9/go.mod h1:LyE/c1Pe3bEsMB/ZavwGOH+D3MIS6GS7fLtdEbzJfaI=
+github.com/yahoo/athenz v1.9.10 h1:knKGFb/8FxPW1ZnlVNq/b4mPRj0WFTFk6DVNKS8gtLI=
+github.com/yahoo/athenz v1.9.10/go.mod h1:LyE/c1Pe3bEsMB/ZavwGOH+D3MIS6GS7fLtdEbzJfaI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zeebo/xxh3 v0.0.0-20191227220208-65f423c10688 h1:C5YYdD+oJh6KoLMePMeA/+PPy2vgsEb6UBBMIy4ug+s=
 github.com/zeebo/xxh3 v0.0.0-20191227220208-65f423c10688/go.mod h1:e/zZObEJWtkq6f+bAzme0xQJSGI75oxoeqS+f2I7YVI=

diff --git a/jwk/option.go b/jwk/option.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 var (

diff --git a/jwk/option_test.go b/jwk/option_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 func TestWithAthenzURL(t *testing.T) {

diff --git a/option.go b/option.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"time"
 
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 const (

diff --git a/option_test.go b/option_test.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/kpango/gache"
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 func TestWithEnablePubkeyd(t *testing.T) {

diff --git a/policy/daemon.go b/policy/daemon.go
@@ -30,7 +30,7 @@ import (
 	"github.com/kpango/glg"
 	"github.com/pkg/errors"
 	"github.com/yahoo/athenz/utils/zpe-updater/util"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 	"golang.org/x/sync/errgroup"
 )
 

diff --git a/policy/daemon_test.go b/policy/daemon_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/kpango/gache"
 	"github.com/pkg/errors"
 	"github.com/yahoo/athenz/utils/zpe-updater/util"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 func TestNew(t *testing.T) {

diff --git a/policy/fetcher_test.go b/policy/fetcher_test.go
@@ -35,7 +35,7 @@ import (
 	"github.com/pkg/errors"
 	authcore "github.com/yahoo/athenz/libs/go/zmssvctoken"
 	"github.com/yahoo/athenz/utils/zpe-updater/util"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 func Test_flushAndClose(t *testing.T) {

diff --git a/policy/option.go b/policy/option.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 var (

diff --git a/policy/option_test.go b/policy/option_test.go
@@ -23,8 +23,8 @@ import (
 	"time"
 
 	authcore "github.com/yahoo/athenz/libs/go/zmssvctoken"
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 func TestWithExpiryMargin(t *testing.T) {

diff --git a/policy/signed_policy.go b/policy/signed_policy.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/yahoo/athenz/utils/zpe-updater/util"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 // SignedPolicy represents the signed policy data

diff --git a/policy/signed_policy_test.go b/policy/signed_policy_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/pkg/errors"
 	authcore "github.com/yahoo/athenz/libs/go/zmssvctoken"
 	"github.com/yahoo/athenz/utils/zpe-updater/util"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 func TestSignedPolicy_Verify(t *testing.T) {

diff --git a/pubkey/option.go b/pubkey/option.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 var (

diff --git a/pubkey/option_test.go b/pubkey/option_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	urlutil "github.com/yahoojapan/athenz-authorizer/v3/internal/url"
+	urlutil "github.com/yahoojapan/athenz-authorizer/v4/internal/url"
 )
 
 func TestWithAthenzURL(t *testing.T) {

diff --git a/role/claim.go b/role/claim.go
@@ -17,7 +17,7 @@ limitations under the License.
 package role
 
 import (
-	"github.com/yahoojapan/athenz-authorizer/v3/access"
+	"github.com/yahoojapan/athenz-authorizer/v4/access"
 )
 
 // RoleJWTClaim represents role jwt claim data.

diff --git a/role/option.go b/role/option.go
@@ -17,8 +17,8 @@ limitations under the License.
 package role
 
 import (
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 var (

diff --git a/role/option_test.go b/role/option_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	authcore "github.com/yahoo/athenz/libs/go/zmssvctoken"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 func TestWithPubkeyProvider(t *testing.T) {

diff --git a/role/processor.go b/role/processor.go
@@ -21,8 +21,8 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 // Processor represents the role token parser interface.

diff --git a/role/processor_test.go b/role/processor_test.go
@@ -27,8 +27,8 @@ import (
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/kpango/fastime"
 	authcore "github.com/yahoo/athenz/libs/go/zmssvctoken"
-	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
-	"github.com/yahoojapan/athenz-authorizer/v3/pubkey"
+	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
+	"github.com/yahoojapan/athenz-authorizer/v4/pubkey"
 )
 
 // test data is generated by `role/asserts/private.pem`
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"time"
     	"github.com/pkg/errors"
-    	"github.com/yahoojapan/athenz-authorizer/v3/jwk"
+    	"github.com/yahoojapan/athenz-authorizer/v4/jwk"
     )
     var (
@@ Expand Down @@