google: Wrap token sources in errWrappingTokenSource
Introduce new AuthenticationError type returned by errWrappingTokenSource.Token. The new error wrapper exposes a boolean method Temporary, identifying the underlying network error as retryable based on the following status codes: 500, 503, 408, or 429. Bump go.mod version to 1.15 refs: https://github.com/googleapis/google-api-go-client/issues/1445 Change-Id: I27c76cb0c71b918c25a640f40d0bd515b2e488fc Reviewed-on: https://go-review.googlesource.com/c/oauth2/+/403846 Reviewed-by: Cody Oss <codyoss@google.com> Reviewed-by: Tyler Bui-Palsulich <tbp@google.com>
This commit is contained in:
111
google/error_test.go
Normal file
111
google/error_test.go
Normal file
@@ -0,0 +1,111 @@
|
||||
// Copyright 2022 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package google
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
)
|
||||
|
||||
func TestAuthenticationError_Temporary(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
code int
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "temporary with 500",
|
||||
code: 500,
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "temporary with 503",
|
||||
code: 503,
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "temporary with 408",
|
||||
code: 408,
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "temporary with 429",
|
||||
code: 429,
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "temporary with 418",
|
||||
code: 418,
|
||||
want: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ae := &AuthenticationError{
|
||||
err: &oauth2.RetrieveError{
|
||||
Response: &http.Response{
|
||||
StatusCode: tt.code,
|
||||
},
|
||||
},
|
||||
}
|
||||
if got := ae.Temporary(); got != tt.want {
|
||||
t.Errorf("Temporary() = %v; want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestErrWrappingTokenSource_Token(t *testing.T) {
|
||||
tok := oauth2.Token{AccessToken: "MyAccessToken"}
|
||||
ts := errWrappingTokenSource{
|
||||
src: oauth2.StaticTokenSource(&tok),
|
||||
}
|
||||
got, err := ts.Token()
|
||||
if *got != tok {
|
||||
t.Errorf("Token() = %v; want %v", got, tok)
|
||||
}
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
type errTokenSource struct {
|
||||
err error
|
||||
}
|
||||
|
||||
func (s *errTokenSource) Token() (*oauth2.Token, error) {
|
||||
return nil, s.err
|
||||
}
|
||||
|
||||
func TestErrWrappingTokenSource_TokenError(t *testing.T) {
|
||||
re := &oauth2.RetrieveError{
|
||||
Response: &http.Response{
|
||||
StatusCode: 500,
|
||||
},
|
||||
}
|
||||
ts := errWrappingTokenSource{
|
||||
src: &errTokenSource{
|
||||
err: re,
|
||||
},
|
||||
}
|
||||
_, err := ts.Token()
|
||||
if err == nil {
|
||||
t.Fatalf("errWrappingTokenSource.Token() err = nil, want *AuthenticationError")
|
||||
}
|
||||
ae, ok := err.(*AuthenticationError)
|
||||
if !ok {
|
||||
t.Fatalf("errWrappingTokenSource.Token() err = %T, want *AuthenticationError", err)
|
||||
}
|
||||
wrappedErr := ae.Unwrap()
|
||||
if wrappedErr == nil {
|
||||
t.Fatalf("AuthenticationError.Unwrap() err = nil, want *oauth2.RetrieveError")
|
||||
}
|
||||
_, ok = wrappedErr.(*oauth2.RetrieveError)
|
||||
if !ok {
|
||||
t.Errorf("AuthenticationError.Unwrap() err = %T, want *oauth2.RetrieveError", err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user