@@ -21,15 +21,11 @@ package google_test
2121import (
2222 "context"
2323 "errors"
24- "fmt"
2524 "strings"
2625 "sync"
2726 "testing"
2827 "time"
2928
30- "cloud.google.com/go/auth"
31- "cloud.google.com/go/auth/credentials/idtoken"
32- "cloud.google.com/go/compute/metadata"
3329 "google.golang.org/grpc/codes"
3430 "google.golang.org/grpc/credentials"
3531 "google.golang.org/grpc/credentials/google"
@@ -66,23 +62,25 @@ func (m *stubBackoff) Backoff(int) time.Duration {
6662 return m .backoffDelay
6763}
6864
69- // stubTokenProvider implements auth.TokenProvider for unit testing.
65+ // stubTokenProvider implements ID token fetching for unit testing.
7066// It supplies mocked token payloads, simulates processing delay, and tracks
7167// invocation frequency to verify caching and backoff behaviors.
7268type stubTokenProvider struct {
7369 mu sync.Mutex
7470 err error
75- token * auth.Token
71+ tokenVal string
72+ expiry time.Time
7673 callCount int // tracks fetch attempts to verify caching and backoff behaviors.
7774}
7875
79- func (c * stubTokenProvider ) Token (context.Context ) (* auth. Token , error ) {
76+ func (c * stubTokenProvider ) fetch (context.Context , string ) (string , time. Time , error ) {
8077 c .mu .Lock ()
8178 c .callCount ++
82- token := c .token
79+ tokenVal := c .tokenVal
80+ expiry := c .expiry
8381 err := c .err
8482 c .mu .Unlock ()
85- return token , err
83+ return tokenVal , expiry , err
8684}
8785
8886func (c * stubTokenProvider ) setErr (err error ) {
@@ -91,10 +89,11 @@ func (c *stubTokenProvider) setErr(err error) {
9189 c .err = err
9290}
9391
94- func (c * stubTokenProvider ) setToken (token * auth. Token ) {
92+ func (c * stubTokenProvider ) setToken (tokenVal string , expiry time. Time ) {
9593 c .mu .Lock ()
9694 defer c .mu .Unlock ()
97- c .token = token
95+ c .tokenVal = tokenVal
96+ c .expiry = expiry
9897}
9998
10099func (c * stubTokenProvider ) getCallCount () int {
@@ -107,27 +106,23 @@ func (c *stubTokenProvider) getCallCount() int {
107106// configured with the specified token value, token expiry, error and delay.
108107func setupStubTokenProvider (token string , err error ) * stubTokenProvider {
109108 return & stubTokenProvider {
110- err : err ,
111- token : & auth.Token {
112- Value : token ,
113- Expiry : time .Now ().Add (1 * time .Hour ), // idtoken package works with hardcoded 1 hour token expiry.
114- },
109+ err : err ,
110+ tokenVal : token ,
111+ expiry : time .Now ().Add (1 * time .Hour ), // keep token valid and outside the preemptive refresh window
115112 }
116113}
117114
118115// setupTestGCPServiceAccountIdentityCreds constructs a GCP service account
119116// identity credentials instance with an injected stub token provider.
120117//
121- // It overrides internal.NewIDTokenCredentials to use the stubTokenProvider,
118+ // It overrides internal.IDTokenFetcher to use the stubTokenProvider,
122119// and registers a cleanup function to restore original hook after the test.
123120func setupTestGCPServiceAccountIdentityCreds (ctx context.Context , t * testing.T , stubToken * stubTokenProvider ) credentials.PerRPCCredentials {
124- // Override the ID token credentials to use stub token provider.
125- origNewIDTokenCredentials := internal .NewIDTokenCredentials
126- internal .NewIDTokenCredentials = func (* idtoken.Options ) (* auth.Credentials , error ) {
127- return auth .NewCredentials (& auth.CredentialsOptions {
128- TokenProvider : auth .NewCachedTokenProvider (stubToken , & auth.CachedTokenProviderOptions {})}), nil
121+ origIDTokenFetcher := internal .IDTokenFetcher
122+ internal .IDTokenFetcher = func () func (context.Context , string ) (string , time.Time , error ) {
123+ return stubToken .fetch
129124 }
130- t .Cleanup (func () { internal .NewIDTokenCredentials = origNewIDTokenCredentials })
125+ t .Cleanup (func () { internal .IDTokenFetcher = origIDTokenFetcher })
131126
132127 creds , err := google .NewServiceAccountIdentityCredentials (ctx , "audience" )
133128 if err != nil {
@@ -432,13 +427,8 @@ func (s) TestGCPServiceAccountIdentityCallCreds_EarlyExpiry(t *testing.T) {
432427 secondToken = "token-B"
433428 )
434429 stubToken := setupStubTokenProvider (firstToken , nil )
435- stubToken .setToken (
436- & auth.Token {
437- Value : firstToken ,
438- // Keeping it 1 minute as we subtract 30 seconds from the token expiry.
439- Expiry : time .Now ().Add (1 * time .Minute ),
440- },
441- )
430+ // Keeping token expiry 1 minute as we subtract 30 seconds from it.
431+ stubToken .setToken (firstToken , time .Now ().Add (1 * time .Minute ))
442432 ctx , cancel := context .WithTimeout (context .Background (), defaultTestTimeout )
443433 defer cancel ()
444434 creds := setupTestGCPServiceAccountIdentityCreds (ctx , t , stubToken )
@@ -461,7 +451,7 @@ func (s) TestGCPServiceAccountIdentityCallCreds_EarlyExpiry(t *testing.T) {
461451 }
462452
463453 // Update stub token provider to return a new token
464- stubToken .setToken (& auth. Token { Value : secondToken , Expiry : time .Now ().Add (1 * time .Hour )} )
454+ stubToken .setToken (secondToken , time .Now ().Add (1 * time .Hour ))
465455
466456 // The cached token has not expired yet but is stale (the current time is
467457 // past the preemptiveTokenRefresh window). GetRequestMetadata should
@@ -495,33 +485,32 @@ func (s) TestGCPServiceAccountIdentityCallCreds_EarlyExpiry(t *testing.T) {
495485 }
496486}
497487
498- // Test verifies that different types of errors from the metadata server are
499- // mapped to the correct gRPC status codes when returned through
500- // GetRequestMetadata.
501- func (s ) TestGCPServiceAccountIdentityCallCreds_ErrorMapping (t * testing.T ) {
488+ // Test verifies that errors returned by the underlying token fetcher function
489+ // are properly propagated to callers of GetRequestMetadata.
490+ func (s ) TestGCPServiceAccountIdentityCallCreds_ErrorPropagation (t * testing.T ) {
502491 tests := []struct {
503492 name string
504493 err error
505494 want codes.Code
506495 }{
507496 {
508497 name : "429_too_many_requests" ,
509- err : & metadata. Error { Code : 429 , Message : "too many requests" } ,
498+ err : status . Errorf ( codes . Unavailable , "credentials: failed to fetch ID token: HTTP status 429" ) ,
510499 want : codes .Unavailable ,
511500 },
512501 {
513502 name : "503_service_unavailable" ,
514- err : & metadata. Error { Code : 503 , Message : "unavailable" } ,
503+ err : status . Errorf ( codes . Unavailable , "credentials: failed to fetch ID token: HTTP status 503" ) ,
515504 want : codes .Unavailable ,
516505 },
517506 {
518507 name : "403_forbidden" ,
519- err : & metadata. Error { Code : 403 , Message : "forbidden" } ,
508+ err : status . Errorf ( codes . Unauthenticated , "credentials: failed to fetch ID token: HTTP status 403" ) ,
520509 want : codes .Unauthenticated ,
521510 },
522511 {
523512 name : "generic_protocol_error" ,
524- err : fmt .Errorf ("generic connection error" ),
513+ err : status .Errorf (codes . Unavailable , "generic connection error" ),
525514 want : codes .Unavailable ,
526515 },
527516 }
0 commit comments