chore: use gcloud config-helper to get projectId (#194)

googleapis · Jan 8, 2018 · b3bda6b · b3bda6b
1 parent af01878
commit b3bda6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/auth/googleauth.ts b/src/auth/googleauth.ts
@@ -171,7 +171,7 @@ export class GoogleAuth {
     // TODO: make this a proper async function
     return new Promise((resolve, reject) => {
       exec(
-          'gcloud -q config list core/project --format=json',
+          'gcloud config config-helper --format json',
           (err, stdout, stderr) => {
             if (err) {
               reject(err);
@@ -537,7 +537,7 @@ export class GoogleAuth {
     try {
       const r = await this._getSDKDefaultProjectId();
       if (r.stdout) {
-        return JSON.parse(r.stdout).core.project;
+        return JSON.parse(r.stdout).configuration.properties.core.project;
       }
     } catch (e) {
       // Ignore any errors

diff --git a/test/test.googleauth.ts b/test/test.googleauth.ts
@@ -963,7 +963,9 @@ describe('GoogleAuth', () => {
        blockGoogleApplicationCredentialEnvironmentVariable(auth);
        auth._getSDKDefaultProjectId = () => {
          return Promise.resolve({
-           stdout: JSON.stringify({core: {project: fixedProjectId}}),
+           stdout: JSON.stringify({
+             configuration: {properties: {core: {project: fixedProjectId}}}
+           }),
            stderr: null
          });
        };