Merge branch 'main' into bump1210-apiary

googleapis · Dec 10, 2024 · b5e4f56 · b5e4f56
2 parents de34ed1 + 4347ca1
commit b5e4f56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/auth/grpctransport/directpath.go b/auth/grpctransport/directpath.go
@@ -66,12 +66,12 @@ func isTokenProviderDirectPathCompatible(tp auth.TokenProvider, o *Options) bool
 	if tok == nil {
 		return false
 	}
-	if o.InternalOptions != nil && o.InternalOptions.EnableNonDefaultSAForDirectPath {
-		return true
-	}
 	if tok.MetadataString("auth.google.tokenSource") != "compute-metadata" {
 		return false
 	}
+	if o.InternalOptions != nil && o.InternalOptions.EnableNonDefaultSAForDirectPath {
+		return true
+	}
 	if tok.MetadataString("auth.google.serviceAccount") != "default" {
 		return false
 	}

diff --git a/auth/grpctransport/directpath_test.go b/auth/grpctransport/directpath_test.go
@@ -41,14 +41,28 @@ func TestIsTokenProviderDirectPathCompatible(t *testing.T) {
 		},
 		{
 			name: "EnableNonDefaultSAForDirectPath",
-			tp:   &staticTP{tok: &auth.Token{Value: "fakeToken"}},
+			tp: &staticTP{
+				tok: token(map[string]interface{}{
+					"auth.google.tokenSource": "compute-metadata",
+				}),
+			},
 			opts: &Options{
 				InternalOptions: &InternalOptions{
 					EnableNonDefaultSAForDirectPath: true,
 				},
 			},
 			want: true,
 		},
+		{
+			name: "EnableNonDefaultSAForDirectPathButNotCompute",
+			tp:   &staticTP{},
+			opts: &Options{
+				InternalOptions: &InternalOptions{
+					EnableNonDefaultSAForDirectPath: true,
+				},
+			},
+			want: false,
+		},
 		{
 			name: "non-compute token source",
 			tp:   &staticTP{tok: token(map[string]interface{}{"auth.google.tokenSource": "NOT-compute-metadata"})},