feat: Support get CREDENTIAL_ENV_NAME from properties (#782)

tisonkun · web-flow · commit 2bb7d576a3da · 2022-11-23T10:56:36.000-05:00
This closes #781. Signed-off-by: tison <wander4096@gmail.com> Signed-off-by: tison <wander4096@gmail.com>
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")

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,11 @@ protected ServiceOptions(`
`327`	`327`	`quotaProjectId =`
`328`	`328`	`builder.quotaProjectId != null`
`329`	`329`	`? builder.quotaProjectId`
`330`		`- : getValueFromCredentialsFile(System.getenv(CREDENTIAL_ENV_NAME), "quota_project_id");`
	`330`	`+ : getValueFromCredentialsFile(getCredentialsPath(), "quota_project_id");`
	`331`	`+ }`
	`332`	`+`
	`333`	`+ private static String getCredentialsPath() {`
	`334`	`+ return System.getProperty(CREDENTIAL_ENV_NAME, System.getenv(CREDENTIAL_ENV_NAME));`
`331`	`335`	`}`
`332`	`336`
`333`	`337`	`/**`
`@@ -511,7 +515,7 @@ static boolean headerContainsMetadataFlavor(HttpResponse response) {`
`511`	`515`	`}`
`512`	`516`
`513`	`517`	`protected static String getServiceAccountProjectId() {`
`514`		`- return getValueFromCredentialsFile(System.getenv(CREDENTIAL_ENV_NAME), "project_id");`
	`518`	`+ return getValueFromCredentialsFile(getCredentialsPath(), "project_id");`
`515`	`519`	`}`
`516`	`520`
`517`	`521`	`@InternalApi("Visible for testing")`