cleanup for PR and failing test case

auth/bearer/middleware.go

@@ -18,14 +18,6 @@ type Signer interface {
 	SignWithBearerToken(context.Context, Token, Message) (Message, error)
 }
 
-// // SignerFunc provides a wrapper around a function to implement the Signer interface.
-// type SignerFunc func(context.Context, Token, Message) (Message, error)
-//
-// // SignWithBearerToken invokes the wrapped function to satisfy the Signer interface.
-// func (fn SignerFunc) SignWithBearerToken(ctx context.Context, token Token, message Message) (Message, error) {
-// 	return fn(ctx, token, message)
-// }
-
 // AuthenticationMiddleware provides the Finalize middleware step for signing
 // an request message with a bearer token.
 type AuthenticationMiddleware struct {

auth/bearer/token.go

@@ -19,7 +19,8 @@ func (t Token) Expired(now time.Time) bool {
 	if !t.CanExpire {
 		return false
 	}
-	return now.Round(0).Equal(t.Expires) || now.After(t.Expires)
+	now = now.Round(0)
+	return now.Equal(t.Expires) || now.After(t.Expires)
 }
 
 // TokenProvider provides interface for retrieving bearer tokens.

auth/bearer/token_cache.go

@@ -25,7 +25,6 @@ type TokenCacheOptions struct {
 	// flight, the next call to RetrieveBearerToken will block on that refresh
 	// to return.
 	RefreshBeforeExpires time.Duration
-	// TODO probably need RefreshBeforeExpires jitter factor
 
 	// The timeout the underlying TokenProvider's RetrieveBearerToken call must
 	// return within, or will be canceled. Defaults to 0, no timeout.
@@ -207,15 +206,3 @@ func (p *TokenCache) getCachedToken() (Token, bool) {
 
 	return *t, true
 }
-
-type suppressedContext struct {
-	context.Context
-}
-
-func (s *suppressedContext) Deadline() (deadline time.Time, ok bool) {
-	return time.Time{}, false
-}
-
-func (s *suppressedContext) Done() <-chan struct{} { return nil }
-
-func (s *suppressedContext) Err() error { return nil }

auth/bearer/token_cache_test.go

@@ -159,7 +159,7 @@ func TestTokenCache_cancelled(t *testing.T) {
 	}))
 
 	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	cancel()
 
 	// Retrieve that will have its context canceled, should return error, but
 	// underlying provider retrieve will continue to block in the background.
@@ -181,7 +181,6 @@ func TestTokenCache_cancelled(t *testing.T) {
 	}()
 
 	<-providerRunning
-	cancel()
 
 	// Retrieve that will be added to existing single flight group, (or create
 	// a new group). Returning valid token.