Merge pull request #10 from fujiwara/fmt-errorf

fujiwara · web-flow · commit 964beb334f44 · 2023-09-27T12:02:28.000+09:00
use fmt.Errorf and bump Go version.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -5,14 +5,14 @@ jobs:
     strategy:
       matrix:
         go:
-          - 1.18
-          - 1.19
+          - "1.20"
+          - "1.21"
     name: Build
     runs-on: ubuntu-latest
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
         id: go
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,9 +14,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: "1.21"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:
diff --git a/go.mod b/go.mod
@@ -1,13 +1,12 @@
 module github.com/fujiwara/go-amzn-oidc
 
-go 1.14
+go 1.16
 
 require (
 	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/hashicorp/logutils v1.0.0
 	github.com/onsi/ginkgo v1.14.2 // indirect
 	github.com/onsi/gomega v1.10.3 // indirect
-	github.com/pkg/errors v0.9.1
 	github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516
 	github.com/shogo82148/go-retry v1.0.0
 )
diff --git a/go.sum b/go.sum
@@ -9,11 +9,9 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
@@ -28,8 +26,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516 h1:ofR1ZdrNSkiWcMsRrubK9tb2/SlZVWttAfqUjJi6QYc=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
 github.com/shogo82148/go-retry v1.0.0 h1:c487Qe+QYUffpUpPxrUN5fGJq6WVHSzGS4N3MNuR2OU=
@@ -65,9 +61,7 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
diff --git a/validator/validator.go b/validator/validator.go
@@ -4,14 +4,13 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
-	"github.com/pkg/errors"
 	"github.com/shogo82148/go-retry"
 )
 
@@ -69,20 +68,20 @@ func fetchPublicKey(ctx context.Context, keyURL string) (*ecdsa.PublicKey, error
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, keyURL, nil)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to new GET request for %s", keyURL)
+		return nil, fmt.Errorf("failed to new GET request for %s: %w", keyURL, err)
 	}
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get public key from %s", keyURL)
+		return nil, fmt.Errorf("failed to get public key from %s: %w", keyURL, err)
 	}
 	defer resp.Body.Close()
-	pem, err := ioutil.ReadAll(resp.Body)
+	pem, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get public key from %s", keyURL)
+		return nil, fmt.Errorf("failed to get public key from %s: %w", keyURL, err)
 	}
 	publicKey, err := jwt.ParseECPublicKeyFromPEM(pem)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to parse public key from %s", keyURL)
+		return nil, fmt.Errorf("failed to parse public key from %s: %w", keyURL, err)
 	}
 	publicKeysCache.Store(keyURL, publicKey)
 
@@ -92,11 +91,11 @@ func fetchPublicKey(ctx context.Context, keyURL string) (*ecdsa.PublicKey, error
 func headerString(token *jwt.Token, name string) (string, error) {
 	_v, ok := token.Header[name]
 	if !ok {
-		return "", errors.Errorf("no %s in token header", name)
+		return "", fmt.Errorf("no %s in token header", name)
 	}
 	v, ok := _v.(string)
 	if !ok {
-		return "", errors.Errorf("no %s string in token header", name)
+		return "", fmt.Errorf("no %s string in token header", name)
 	}
 	return v, nil
 }
@@ -112,12 +111,12 @@ func publicKeyURL(token *jwt.Token) (string, error) {
 		return "", err
 	}
 	if alg, _ := headerString(token, "alg"); alg != "ES256" {
-		return "", errors.New("alg must be ES256")
+		return "", fmt.Errorf("alg must be ES256")
 	}
 
 	parts := strings.Split(arn, ":")
 	if len(parts) < 4 {
-		return "", errors.Errorf("invalid arn format %s", arn)
+		return "", fmt.Errorf("invalid arn format %s", arn)
 	}
 	partition, region := parts[1], parts[3]
 	switch partition {
@@ -135,5 +134,5 @@ func publicKeyURL(token *jwt.Token) (string, error) {
 			kid,
 		), nil
 	}
-	return "", errors.Errorf("unsupported arn partition %s", arn)
+	return "", fmt.Errorf("unsupported arn partition %s", arn)
 }

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,13 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"crypto/ecdsa"`
`6`	`6`	`"fmt"`
`7`		`- "io/ioutil"`
	`7`	`+ "io"`
`8`	`8`	`"net/http"`
`9`	`9`	`"strings"`
`10`	`10`	`"sync"`
`11`	`11`	`"time"`
`12`	`12`
`13`	`13`	`"github.com/golang-jwt/jwt/v4"`
`14`		`- "github.com/pkg/errors"`
`15`	`14`	`"github.com/shogo82148/go-retry"`
`16`	`15`	`)`
`17`	`16`
`@@ -69,20 +68,20 @@ func fetchPublicKey(ctx context.Context, keyURL string) (*ecdsa.PublicKey, error`
`69`	`68`
`70`	`69`	`req, err := http.NewRequestWithContext(ctx, http.MethodGet, keyURL, nil)`
`71`	`70`	`if err != nil {`
`72`		`- return nil, errors.Wrapf(err, "failed to new GET request for %s", keyURL)`
	`71`	`+ return nil, fmt.Errorf("failed to new GET request for %s: %w", keyURL, err)`
`73`	`72`	`}`
`74`	`73`	`resp, err := client.Do(req)`
`75`	`74`	`if err != nil {`
`76`		`- return nil, errors.Wrapf(err, "failed to get public key from %s", keyURL)`
	`75`	`+ return nil, fmt.Errorf("failed to get public key from %s: %w", keyURL, err)`
`77`	`76`	`}`
`78`	`77`	`defer resp.Body.Close()`
`79`		`- pem, err := ioutil.ReadAll(resp.Body)`
	`78`	`+ pem, err := io.ReadAll(resp.Body)`
`80`	`79`	`if err != nil {`
`81`		`- return nil, errors.Wrapf(err, "failed to get public key from %s", keyURL)`
	`80`	`+ return nil, fmt.Errorf("failed to get public key from %s: %w", keyURL, err)`
`82`	`81`	`}`
`83`	`82`	`publicKey, err := jwt.ParseECPublicKeyFromPEM(pem)`
`84`	`83`	`if err != nil {`
`85`		`- return nil, errors.Wrapf(err, "failed to parse public key from %s", keyURL)`
	`84`	`+ return nil, fmt.Errorf("failed to parse public key from %s: %w", keyURL, err)`
`86`	`85`	`}`
`87`	`86`	`publicKeysCache.Store(keyURL, publicKey)`
`88`	`87`
`@@ -92,11 +91,11 @@ func fetchPublicKey(ctx context.Context, keyURL string) (*ecdsa.PublicKey, error`
`92`	`91`	`func headerString(token *jwt.Token, name string) (string, error) {`
`93`	`92`	`_v, ok := token.Header[name]`
`94`	`93`	`if !ok {`
`95`		`- return "", errors.Errorf("no %s in token header", name)`
	`94`	`+ return "", fmt.Errorf("no %s in token header", name)`
`96`	`95`	`}`
`97`	`96`	`v, ok := _v.(string)`
`98`	`97`	`if !ok {`
`99`		`- return "", errors.Errorf("no %s string in token header", name)`
	`98`	`+ return "", fmt.Errorf("no %s string in token header", name)`
`100`	`99`	`}`
`101`	`100`	`return v, nil`
`102`	`101`	`}`
`@@ -112,12 +111,12 @@ func publicKeyURL(token *jwt.Token) (string, error) {`
`112`	`111`	`return "", err`
`113`	`112`	`}`
`114`	`113`	`if alg, _ := headerString(token, "alg"); alg != "ES256" {`
`115`		`- return "", errors.New("alg must be ES256")`
	`114`	`+ return "", fmt.Errorf("alg must be ES256")`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`parts := strings.Split(arn, ":")`
`119`	`118`	`if len(parts) < 4 {`
`120`		`- return "", errors.Errorf("invalid arn format %s", arn)`
	`119`	`+ return "", fmt.Errorf("invalid arn format %s", arn)`
`121`	`120`	`}`
`122`	`121`	`partition, region := parts[1], parts[3]`
`123`	`122`	`switch partition {`
`@@ -135,5 +134,5 @@ func publicKeyURL(token *jwt.Token) (string, error) {`
`135`	`134`	`kid,`
`136`	`135`	`), nil`
`137`	`136`	`}`
`138`		`- return "", errors.Errorf("unsupported arn partition %s", arn)`
	`137`	`+ return "", fmt.Errorf("unsupported arn partition %s", arn)`
`139`	`138`	`}`