fix(cba): Update newAuth path to use nil oauth2 client (#2684)

andyrzhao · web-flow · commit d925dcbb27f2 · 2024-07-11T15:13:36.000-05:00
diff --git a/transport/grpc/dial.go b/transport/grpc/dial.go
@@ -218,11 +218,6 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
 		defaultEndpointTemplate = ds.DefaultEndpoint
 	}
 
-	tokenURL, oauth2Client, err := internal.GetOAuth2Configuration(ctx, ds)
-	if err != nil {
-		return nil, err
-	}
-
 	pool, err := grpctransport.Dial(ctx, secure, &grpctransport.Options{
 		DisableTelemetry:      ds.TelemetryDisabled,
 		DisableAuthentication: ds.NoAuth,
@@ -237,8 +232,6 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
 			Audience:        aud,
 			CredentialsFile: ds.CredentialsFile,
 			CredentialsJSON: ds.CredentialsJSON,
-			TokenURL:        tokenURL,
-			Client:          oauth2Client,
 		},
 		InternalOptions: &grpctransport.InternalOptions{
 			EnableNonDefaultSAForDirectPath: ds.AllowNonDefaultServiceAccount,
diff --git a/transport/http/dial.go b/transport/http/dial.go
@@ -107,10 +107,6 @@ func newClientNewAuth(ctx context.Context, base http.RoundTripper, ds *internal.
 	if ds.RequestReason != "" {
 		headers.Set("X-goog-request-reason", ds.RequestReason)
 	}
-	tokenURL, oauth2Client, err := internal.GetOAuth2Configuration(ctx, ds)
-	if err != nil {
-		return nil, err
-	}
 	client, err := httptransport.NewClient(&httptransport.Options{
 		DisableTelemetry:      ds.TelemetryDisabled,
 		DisableAuthentication: ds.NoAuth,
@@ -125,8 +121,6 @@ func newClientNewAuth(ctx context.Context, base http.RoundTripper, ds *internal.
 			Audience:        aud,
 			CredentialsFile: ds.CredentialsFile,
 			CredentialsJSON: ds.CredentialsJSON,
-			TokenURL:        tokenURL,
-			Client:          oauth2Client,
 		},
 		InternalOptions: &httptransport.InternalOptions{
 			EnableJWTWithScope:      ds.EnableJwtWithScope,
