refactor: remove duplicate tok.Token() (GoogleCloudPlatform#915)

Author: jackwotherspoon

internal/cloudsql/lazy_test.go

@@ -153,10 +153,7 @@ func TestLazyRefreshCacheUpdateRefresh(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Q: Why should the token provider be called twice?
-	// A: Because the refresh code retrieves a token first (1 call) and then
-	//    refreshes it (1 call) for a total of 2 calls.
-	if got, want := spy.callCount(), 2; got != want {
+	if got, want := spy.callCount(), 1; got != want {
 		t.Fatalf(
 			"auth.TokenProvider call count, got = %v, want = %v",
 			got, want,

internal/cloudsql/refresh.go

@@ -171,14 +171,6 @@ func fetchEphemeralCert(
 				tokErr,
 			)
 		}
-		tok, tokErr = tp.Token(ctx)
-		if tokErr != nil {
-			return tls.Certificate{}, errtype.NewRefreshError(
-				"failed to get Oauth2 token",
-				inst.String(),
-				tokErr,
-			)
-		}
 		req.AccessToken = tok.Value
 	}
 	resp, err := retry50x(ctx, func(ctx2 context.Context) (*sqladmin.GenerateEphemeralCertResponse, error) {

internal/cloudsql/refresh_test.go

@@ -240,15 +240,13 @@ func TestRefreshAdjustsCertExpiry(t *testing.T) {
 		{
 			desc: "when the token's expiration comes BEFORE the cert",
 			resps: []tokenResp{
-				{tok: &auth.Token{}},
 				{tok: &auth.Token{Expiry: t1}},
 			},
 			wantExpiry: t1,
 		},
 		{
 			desc: "when the token's expiration comes AFTER the cert",
 			resps: []tokenResp{
-				{tok: &auth.Token{}},
 				{tok: &auth.Token{Expiry: t2}},
 			},
 			wantExpiry: certExpiry,
@@ -293,14 +291,6 @@ func TestRefreshWithIAMAuthErrors(t *testing.T) {
 			resps:     []tokenResp{{tok: nil, err: errors.New("fetch failed")}},
 			wantCount: 1,
 		},
-		{
-			desc: "when refreshing a token fails",
-			resps: []tokenResp{
-				{tok: &auth.Token{}, err: nil},
-				{tok: nil, err: errors.New("refresh failed")},
-			},
-			wantCount: 2,
-		},
 	}
 	cn := testInstanceConnName()
 	inst := mock.NewFakeCSQLInstance("my-project", "my-region", "my-instance")