chore: Update to use the file type enum

lqiu96 · lqiu96 · commit a1c9fc0ac71d · 2025-08-11T12:07:11.000-04:00
diff --git a/oauth2_http/java/com/google/auth/oauth2/AppEngineCredentials.java b/oauth2_http/java/com/google/auth/oauth2/AppEngineCredentials.java
@@ -125,7 +125,7 @@ private void init() throws IOException {
       this.signForApp = serviceClass.getMethod(SIGN_FOR_APP_METHOD, byte[].class);
       Class<?> signingResultClass = forName(SIGNING_RESULT_CLASS);
       this.getSignature = signingResultClass.getMethod(GET_SIGNATURE_METHOD);
-      this.type = "App Engine Credentials";
+      this.name = GoogleCredentialsInfo.APP_ENGINE_CREDENTIALS.getCredentialName();
     } catch (ClassNotFoundException
         | NoSuchMethodException
         | IllegalAccessException
diff --git a/oauth2_http/java/com/google/auth/oauth2/CloudShellCredentials.java b/oauth2_http/java/com/google/auth/oauth2/CloudShellCredentials.java
@@ -70,6 +70,7 @@ public static CloudShellCredentials create(int authPort) {
   private CloudShellCredentials(Builder builder) {
     super(builder);
     this.authPort = builder.getAuthPort();
+    this.name = GoogleCredentialsInfo.CLOUD_SHELL_CREDENTIALS.getCredentialName();
   }
 
   protected int getAuthPort() {
diff --git a/oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java
@@ -220,7 +220,7 @@ private ComputeEngineCredentials(ComputeEngineCredentials.Builder builder) {
     }
     this.transport = builder.getGoogleAuthTransport();
     this.bindingEnforcement = builder.getBindingEnforcement();
-    this.type = "Compute Engine Credentials";
+    this.name = GoogleCredentialsInfo.COMPUTE_ENGINE_CREDENTIALS.getCredentialName();
   }
 
   @Override
diff --git a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountAuthorizedUserCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountAuthorizedUserCredentials.java
@@ -81,9 +81,6 @@ public class ExternalAccountAuthorizedUserCredentials extends GoogleCredentials
 
   private static final long serialVersionUID = -2181779590486283287L;
 
-  static final String EXTERNAL_ACCOUNT_AUTHORIZED_USER_FILE_TYPE =
-      "external_account_authorized_user";
-
   private final String transportFactoryClassName;
   private final String audience;
   private final String tokenUrl;
@@ -117,7 +114,8 @@ private ExternalAccountAuthorizedUserCredentials(Builder builder) {
     this.clientId = builder.clientId;
     this.clientSecret = builder.clientSecret;
 
-    this.type = "External Account Authorized User Credentials";
+    this.name =
+        GoogleCredentialsInfo.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS.getCredentialName();
 
     Preconditions.checkState(
         getAccessToken() != null || canRefresh(),
diff --git a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
@@ -71,7 +71,6 @@ public abstract class ExternalAccountCredentials extends GoogleCredentials {
   private static final String CLOUD_PLATFORM_SCOPE =
       "https://www.googleapis.com/auth/cloud-platform";
 
-  static final String EXTERNAL_ACCOUNT_FILE_TYPE = "external_account";
   static final String EXECUTABLE_SOURCE_KEY = "executable";
 
   static final String DEFAULT_TOKEN_URL = "https://sts.{UNIVERSE_DOMAIN}/v1/token";
@@ -214,7 +213,7 @@ protected ExternalAccountCredentials(
     }
 
     this.metricsHandler = new ExternalAccountMetricsHandler(this);
-    this.type = "External Account Credentials";
+    this.name = GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getCredentialName();
   }
 
   /**
@@ -273,7 +272,7 @@ protected ExternalAccountCredentials(ExternalAccountCredentials.Builder builder)
             ? new ExternalAccountMetricsHandler(this)
             : builder.metricsHandler;
 
-    this.type = "External Account Credentials";
+    this.name = GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getCredentialName();
   }
 
   ImpersonatedCredentials buildImpersonatedCredentials() {
diff --git a/oauth2_http/java/com/google/auth/oauth2/GdchCredentials.java b/oauth2_http/java/com/google/auth/oauth2/GdchCredentials.java
@@ -96,7 +96,7 @@ public class GdchCredentials extends GoogleCredentials {
     this.caCertPath = builder.caCertPath;
     this.apiAudience = builder.apiAudience;
     this.lifetime = builder.lifetime;
-    this.type = "GDCH Credentials";
+    this.name = GoogleCredentialsInfo.GDCH_CREDENTIALS.getCredentialName();
   }
 
   /**
diff --git a/oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java b/oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java
@@ -62,21 +62,22 @@ public class GoogleCredentials extends OAuth2Credentials implements QuotaProject
 
   static final String QUOTA_PROJECT_ID_HEADER_KEY = "x-goog-user-project";
 
-  enum GoogleCredentialsType {
+  enum GoogleCredentialsInfo {
     USER_CREDENTIALS("User Credentials", "authorized_user"),
     SERVICE_ACCOUNT_CREDENTIALS("Service Account Credentials", "service_account"),
     GDCH_CREDENTIALS("GDCH Credentials", "gdch_service_account"),
     EXTERNAL_ACCOUNT_CREDENTIALS("External Account Credentials", "external_account"),
-    EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS("External Account Authorized User Credentials", "external_account_authorized_user"),
-    IMPERSONATED_CREDENTIALS("Impersonated Credentials","impersonated_service_account"),
+    EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS(
+        "External Account Authorized User Credentials", "external_account_authorized_user"),
+    IMPERSONATED_CREDENTIALS("Impersonated Credentials", "impersonated_service_account"),
     APP_ENGINE_CREDENTIALS("App Engine Credentials", null),
     CLOUD_SHELL_CREDENTIALS("Cloud Shell Credentials", null),
     COMPUTE_ENGINE_CREDENTIALS("Compute Engine Credentials", null);
 
     private final String credentialName;
     private final String fileType;
 
-    GoogleCredentialsType(String credentialName, String fileType) {
+    GoogleCredentialsInfo(String credentialName, String fileType) {
       this.credentialName = credentialName;
       this.fileType = fileType;
     }
@@ -90,12 +91,11 @@ public String getFileType() {
     }
   }
 
-
   /* The following package-private fields provide additional info for errors message */
   // Source of the credential (e.g. env var value or well know file location)
   String source;
   // User-friendly name of actual Credential class
-  String type;
+  String name;
   // Identity of the credential (not all credentials will have this)
   String principal;
 
@@ -242,35 +242,37 @@ public static GoogleCredentials fromStream(
       throw new IOException("Error reading credentials from stream, 'type' field not specified.");
     }
 
-    if (GoogleCredentialsType.USER_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.USER_CREDENTIALS.getFileType().equals(fileType)) {
       return UserCredentials.fromJson(fileContents, transportFactory);
     }
-    if (GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {
       return ServiceAccountCredentials.fromJson(fileContents, transportFactory);
     }
-    if (GoogleCredentialsType.GDCH_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.GDCH_CREDENTIALS.getFileType().equals(fileType)) {
       return GdchCredentials.fromJson(fileContents);
     }
-    if (GoogleCredentialsType.EXTERNAL_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {
       return ExternalAccountCredentials.fromJson(fileContents, transportFactory);
     }
-    if (GoogleCredentialsType.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS
+        .getFileType()
+        .equals(fileType)) {
       return ExternalAccountAuthorizedUserCredentials.fromJson(fileContents, transportFactory);
     }
-    if (GoogleCredentialsType.IMPERSONATED_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.IMPERSONATED_CREDENTIALS.getFileType().equals(fileType)) {
       return ImpersonatedCredentials.fromJson(fileContents, transportFactory);
     }
     throw new IOException(
         String.format(
             "Error reading credentials from stream, 'type' value '%s' not recognized."
                 + " Valid values are '%s', '%s', '%s', '%s', '%s', '%s'.",
             fileType,
-            GoogleCredentialsType.USER_CREDENTIALS.getFileType(),
-            GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType(),
-            GoogleCredentialsType.GDCH_CREDENTIALS.getFileType(),
-            GoogleCredentialsType.EXTERNAL_ACCOUNT_CREDENTIALS.getFileType(),
-            GoogleCredentialsType.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS.getFileType(),
-            GoogleCredentialsType.IMPERSONATED_CREDENTIALS.getFileType()));
+            GoogleCredentialsInfo.USER_CREDENTIALS.getFileType(),
+            GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getFileType(),
+            GoogleCredentialsInfo.GDCH_CREDENTIALS.getFileType(),
+            GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getFileType(),
+            GoogleCredentialsInfo.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS.getFileType(),
+            GoogleCredentialsInfo.IMPERSONATED_CREDENTIALS.getFileType()));
   }
 
   /**
@@ -543,11 +545,14 @@ GoogleCredentials withSource(String source) {
 
   /**
    * Provides additional information regarding credential initialization source
+   *
    * <ul>
-   *   <li> credential source - Initialized via the GOOGLE_APPLICATION_CREDENTIALS env var or well known file type
-   *   <li> credential type - The type of credential created
-   *   <li> principal - Identity used for the credential
+   *   <li>credential source - Initialized via the GOOGLE_APPLICATION_CREDENTIALS env var or well
+   *       known file type
+   *   <li>credential name - The user-friendly name of the credential created
+   *   <li>principal - Identity used for the credential
    * </ul>
+   *
    * These fields are populated on a best-effort basis and may be populated missing
    *
    * @return Map of information regarding how the Credential was initialized
@@ -557,8 +562,8 @@ public Map<String, String> getCredentialInfo() {
     if (!Strings.isNullOrEmpty(source)) {
       infoMap.put("Credential Source", source);
     }
-    if (!Strings.isNullOrEmpty(type)) {
-      infoMap.put("Credential Type", type);
+    if (!Strings.isNullOrEmpty(name)) {
+      infoMap.put("Credential Name", name);
     }
     if (!Strings.isNullOrEmpty(principal)) {
       infoMap.put("Principal", principal);
diff --git a/oauth2_http/java/com/google/auth/oauth2/ImpersonatedCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ImpersonatedCredentials.java
@@ -95,8 +95,6 @@
 public class ImpersonatedCredentials extends GoogleCredentials
     implements ServiceAccountSigner, IdTokenProvider {
 
-  static final String IMPERSONATED_CREDENTIALS_FILE_TYPE = "impersonated_service_account";
-
   private static final long serialVersionUID = -2133257318957488431L;
   private static final String RFC3339 = "yyyy-MM-dd'T'HH:mm:ssX";
   private static final int TWELVE_HOURS_IN_SECONDS = 43200;
@@ -399,9 +397,11 @@ static ImpersonatedCredentials fromJson(
     }
 
     GoogleCredentials sourceCredentials;
-    if (GoogleCredentialsType.USER_CREDENTIALS.getFileType().equals(sourceCredentialsType)) {
+    if (GoogleCredentialsInfo.USER_CREDENTIALS.getFileType().equals(sourceCredentialsType)) {
       sourceCredentials = UserCredentials.fromJson(sourceCredentialsJson, transportFactory);
-    } else if (GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType().equals(sourceCredentialsType)) {
+    } else if (GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS
+        .getFileType()
+        .equals(sourceCredentialsType)) {
       sourceCredentials =
           ServiceAccountCredentials.fromJson(sourceCredentialsJson, transportFactory);
     } else {
@@ -480,7 +480,7 @@ private ImpersonatedCredentials(Builder builder) throws IOException {
       throw new IllegalStateException("lifetime must be less than or equal to 43200");
     }
 
-    this.type = "Impersonated Credentials";
+    this.name = GoogleCredentialsInfo.IMPERSONATED_CREDENTIALS.getCredentialName();
     this.principal = builder.targetPrincipal;
 
     // Do not expect explicit universe domain, throw exception if the explicit universe domain
diff --git a/oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java
@@ -150,7 +150,7 @@ public class ServiceAccountCredentials extends GoogleCredentials
     this.lifetime = builder.lifetime;
     this.useJwtAccessWithScope = builder.useJwtAccessWithScope;
     this.defaultRetriesEnabled = builder.defaultRetriesEnabled;
-    this.type = "Service Account Credentials";
+    this.name = GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getCredentialName();
     this.principal = builder.clientEmail;
   }
 
diff --git a/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java
@@ -296,14 +296,17 @@ public static ServiceAccountJwtAccessCredentials fromStream(
     if (fileType == null) {
       throw new IOException("Error reading credentials from stream, 'type' field not specified.");
     }
-    if (GoogleCredentials.GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentials.GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS
+        .getFileType()
+        .equals(fileType)) {
       return fromJson(fileContents, defaultAudience);
     }
     throw new IOException(
         String.format(
             "Error reading credentials from stream, 'type' value '%s' not recognized."
                 + " Expecting '%s'.",
-            fileType, GoogleCredentials.GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType()));
+            fileType,
+            GoogleCredentials.GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getFileType()));
   }
 
   private LoadingCache<JwtClaims, JwtCredentials> createCache() {
diff --git a/oauth2_http/java/com/google/auth/oauth2/UserCredentials.java b/oauth2_http/java/com/google/auth/oauth2/UserCredentials.java
@@ -97,7 +97,7 @@ private UserCredentials(Builder builder) {
         (builder.tokenServerUri == null) ? OAuth2Utils.TOKEN_SERVER_URI : builder.tokenServerUri;
     this.transportFactoryClassName = this.transportFactory.getClass().getName();
 
-    this.type = "User Credentials";
+    this.name = GoogleCredentialsInfo.USER_CREDENTIALS.getCredentialName();
 
     Preconditions.checkState(
         builder.getAccessToken() != null || builder.refreshToken != null,
@@ -177,14 +177,14 @@ public static UserCredentials fromStream(
     if (fileType == null) {
       throw new IOException("Error reading credentials from stream, 'type' field not specified.");
     }
-    if (GoogleCredentialsType.USER_CREDENTIALS.getFileType().equals(fileType)) {
+    if (GoogleCredentialsInfo.USER_CREDENTIALS.getFileType().equals(fileType)) {
       return fromJson(fileContents, transportFactory);
     }
     throw new IOException(
         String.format(
             "Error reading credentials from stream, 'type' value '%s' not recognized."
                 + " Expecting '%s'.",
-            fileType, GoogleCredentialsType.USER_CREDENTIALS.getFileType()));
+            fileType, GoogleCredentialsInfo.USER_CREDENTIALS.getFileType()));
   }
 
   /** Refreshes the OAuth2 access token by getting a new access token from the refresh token */
@@ -312,7 +312,7 @@ private GenericData doRefreshAccessToken() throws IOException {
    */
   private InputStream getUserCredentialsStream() throws IOException {
     GenericJson json = new GenericJson();
-    json.put("type", GoogleCredentialsType.USER_CREDENTIALS.getFileType());
+    json.put("type", GoogleCredentialsInfo.USER_CREDENTIALS.getFileType());
     if (refreshToken != null) {
       json.put("refresh_token", refreshToken);
     }
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/AwsCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/AwsCredentialsTest.java
@@ -1346,7 +1346,8 @@ static InputStream writeAwsCredentialsStream(String stsUrl, String regionUrl, St
     json.put("subject_token_type", "subjectTokenType");
     json.put("token_url", stsUrl);
     json.put("token_info_url", "tokenInfoUrl");
-    json.put("type", ExternalAccountCredentials.EXTERNAL_ACCOUNT_FILE_TYPE);
+    json.put(
+        "type", GoogleCredentials.GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getFileType());
 
     GenericJson credentialSource = new GenericJson();
     credentialSource.put("environment_id", "aws1");
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java b/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java
@@ -765,7 +765,7 @@ public void getDefaultCredentials_envVarSet_serviceAccountCredentials_correctCre
             "Env Var %s set to %s",
             DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, serviceAccountPath),
         credentialInfo.get("Credential Source"));
-    assertEquals("Service Account Credentials", credentialInfo.get("Credential Type"));
+    assertEquals("Service Account Credentials", credentialInfo.get("Credential Name"));
     assertEquals(SA_CLIENT_EMAIL, credentialInfo.get("Principal"));
   }
 
@@ -790,7 +790,7 @@ public void getDefaultCredentials_envVarSet_userCredential_correctCredentialInfo
         String.format(
             "Env Var %s set to %s", DefaultCredentialsProvider.CREDENTIAL_ENV_VAR, userPath),
         credentialInfo.get("Credential Source"));
-    assertEquals("User Credentials", credentialInfo.get("Credential Type"));
+    assertEquals("User Credentials", credentialInfo.get("Credential Name"));
     assertNull(credentialInfo.get("Principal"));
   }
 
@@ -816,7 +816,7 @@ public void getDefaultCredentials_wellKnownFile_userCredential_correctCredential
     assertEquals(
         String.format("Well Known File at %s", wellKnownFile.getCanonicalPath()),
         credentialInfo.get("Credential Source"));
-    assertEquals("User Credentials", credentialInfo.get("Credential Type"));
+    assertEquals("User Credentials", credentialInfo.get("Credential Name"));
     assertNull(credentialInfo.get("Principal"));
   }
 
@@ -836,7 +836,7 @@ public void getDefaultCredentials_computeEngineCredentialscorrectCredentialInfo(
     assertEquals(
         String.format("Metadata Server URL set to %s", gceMetadataHost),
         credentials.getCredentialInfo().get("Credential Source"));
-    assertEquals("Compute Engine Credentials", credentialInfo.get("Credential Type"));
+    assertEquals("Compute Engine Credentials", credentialInfo.get("Credential Name"));
     assertNull(credentialInfo.get("Principal"));
   }
 
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountAuthorizedUserCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountAuthorizedUserCredentialsTest.java
@@ -32,7 +32,6 @@
 package com.google.auth.oauth2;
 
 import static com.google.auth.Credentials.GOOGLE_DEFAULT_UNIVERSE;
-import static com.google.auth.oauth2.ExternalAccountAuthorizedUserCredentials.EXTERNAL_ACCOUNT_AUTHORIZED_USER_FILE_TYPE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -1241,7 +1240,10 @@ public void serialize() throws IOException, ClassNotFoundException {
 
   static GenericJson buildJsonCredentials() {
     GenericJson json = new GenericJson();
-    json.put("type", EXTERNAL_ACCOUNT_AUTHORIZED_USER_FILE_TYPE);
+    json.put(
+        "type",
+        GoogleCredentials.GoogleCredentialsInfo.EXTERNAL_ACCOUNT_AUTHORIZED_USER_CREDENTIALS
+            .getFileType());
     json.put("audience", AUDIENCE);
     json.put("refresh_token", REFRESH_TOKEN);
     json.put("client_id", CLIENT_ID);
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTest.java
@@ -915,7 +915,7 @@ static GenericJson writeGdchServiceAccountJson(
     if (tokenServerUri != null) {
       json.put("token_uri", tokenServerUri.toString());
     }
-    json.put("type", GoogleCredentials.GoogleCredentialsType.GDCH_CREDENTIALS.getFileType());
+    json.put("type", GoogleCredentials.GoogleCredentialsInfo.GDCH_CREDENTIALS.getFileType());
     return json;
   }
 
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/GoogleCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/GoogleCredentialsTest.java
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/IdentityPoolCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/IdentityPoolCredentialsTest.java
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/PluggableAuthCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/PluggableAuthCredentialsTest.java
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountJwtAccessCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountJwtAccessCredentialsTest.java
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public static CloudShellCredentials create(int authPort) {`
`70`	`70`	`private CloudShellCredentials(Builder builder) {`
`71`	`71`	`super(builder);`
`72`	`72`	`this.authPort = builder.getAuthPort();`
	`73`	`+ this.name = GoogleCredentialsInfo.CLOUD_SHELL_CREDENTIALS.getCredentialName();`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`protected int getAuthPort() {`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ private ComputeEngineCredentials(ComputeEngineCredentials.Builder builder) {`
`220`	`220`	`}`
`221`	`221`	`this.transport = builder.getGoogleAuthTransport();`
`222`	`222`	`this.bindingEnforcement = builder.getBindingEnforcement();`
`223`		`- this.type = "Compute Engine Credentials";`
	`223`	`+ this.name = GoogleCredentialsInfo.COMPUTE_ENGINE_CREDENTIALS.getCredentialName();`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ public abstract class ExternalAccountCredentials extends GoogleCredentials {`
`71`	`71`	`private static final String CLOUD_PLATFORM_SCOPE =`
`72`	`72`	`"https://www.googleapis.com/auth/cloud-platform";`
`73`	`73`
`74`		`- static final String EXTERNAL_ACCOUNT_FILE_TYPE = "external_account";`
`75`	`74`	`static final String EXECUTABLE_SOURCE_KEY = "executable";`
`76`	`75`
`77`	`76`	`static final String DEFAULT_TOKEN_URL = "https://sts.{UNIVERSE_DOMAIN}/v1/token";`
`@@ -214,7 +213,7 @@ protected ExternalAccountCredentials(`
`214`	`213`	`}`
`215`	`214`
`216`	`215`	`this.metricsHandler = new ExternalAccountMetricsHandler(this);`
`217`		`- this.type = "External Account Credentials";`
	`216`	`+ this.name = GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getCredentialName();`
`218`	`217`	`}`
`219`	`218`
`220`	`219`	`/**`
`@@ -273,7 +272,7 @@ protected ExternalAccountCredentials(ExternalAccountCredentials.Builder builder)`
`273`	`272`	`? new ExternalAccountMetricsHandler(this)`
`274`	`273`	`: builder.metricsHandler;`
`275`	`274`
`276`		`- this.type = "External Account Credentials";`
	`275`	`+ this.name = GoogleCredentialsInfo.EXTERNAL_ACCOUNT_CREDENTIALS.getCredentialName();`
`277`	`276`	`}`
`278`	`277`
`279`	`278`	`ImpersonatedCredentials buildImpersonatedCredentials() {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public class GdchCredentials extends GoogleCredentials {`
`96`	`96`	`this.caCertPath = builder.caCertPath;`
`97`	`97`	`this.apiAudience = builder.apiAudience;`
`98`	`98`	`this.lifetime = builder.lifetime;`
`99`		`- this.type = "GDCH Credentials";`
	`99`	`+ this.name = GoogleCredentialsInfo.GDCH_CREDENTIALS.getCredentialName();`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public class ServiceAccountCredentials extends GoogleCredentials`
`150`	`150`	`this.lifetime = builder.lifetime;`
`151`	`151`	`this.useJwtAccessWithScope = builder.useJwtAccessWithScope;`
`152`	`152`	`this.defaultRetriesEnabled = builder.defaultRetriesEnabled;`
`153`		`- this.type = "Service Account Credentials";`
	`153`	`+ this.name = GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getCredentialName();`
`154`	`154`	`this.principal = builder.clientEmail;`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -296,14 +296,17 @@ public static ServiceAccountJwtAccessCredentials fromStream(`
`296`	`296`	`if (fileType == null) {`
`297`	`297`	`throw new IOException("Error reading credentials from stream, 'type' field not specified.");`
`298`	`298`	`}`
`299`		`- if (GoogleCredentials.GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType().equals(fileType)) {`
	`299`	`+ if (GoogleCredentials.GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS`
	`300`	`+ .getFileType()`
	`301`	`+ .equals(fileType)) {`
`300`	`302`	`return fromJson(fileContents, defaultAudience);`
`301`	`303`	`}`
`302`	`304`	`throw new IOException(`
`303`	`305`	`String.format(`
`304`	`306`	`"Error reading credentials from stream, 'type' value '%s' not recognized."`
`305`	`307`	`+ " Expecting '%s'.",`
`306`		`- fileType, GoogleCredentials.GoogleCredentialsType.SERVICE_ACCOUNT_CREDENTIALS.getFileType()));`
	`308`	`+ fileType,`
	`309`	`+ GoogleCredentials.GoogleCredentialsInfo.SERVICE_ACCOUNT_CREDENTIALS.getFileType()));`
`307`	`310`	`}`
`308`	`311`
`309`	`312`	`private LoadingCache<JwtClaims, JwtCredentials> createCache() {`