feat: Support get CREDENTIAL_ENV_NAME from properties (#782)

This closes #781. Signed-off-by: tison <[email protected]> Signed-off-by: tison <[email protected]>
googleapis · Nov 23, 2022 · 2bb7d57 · 2bb7d57
1 parent ee64ef7
commit 2bb7d57
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -327,7 +327,11 @@ protected ServiceOptions(
     quotaProjectId =
         builder.quotaProjectId != null
             ? builder.quotaProjectId
-            : getValueFromCredentialsFile(System.getenv(CREDENTIAL_ENV_NAME), "quota_project_id");
+            : getValueFromCredentialsFile(getCredentialsPath(), "quota_project_id");
+  }
+
+  private static String getCredentialsPath() {
+    return System.getProperty(CREDENTIAL_ENV_NAME, System.getenv(CREDENTIAL_ENV_NAME));
   }
 
   /**
@@ -511,7 +515,7 @@ static boolean headerContainsMetadataFlavor(HttpResponse response) {
   }
 
   protected static String getServiceAccountProjectId() {
-    return getValueFromCredentialsFile(System.getenv(CREDENTIAL_ENV_NAME), "project_id");
+    return getValueFromCredentialsFile(getCredentialsPath(), "project_id");
   }
 
   @InternalApi("Visible for testing")