chore: use gcp-metadata #278

JustinBeckwith · 2018-02-03T23:53:51Z

First draft of integrating the new and shiny gcp-metadata. First googleapis/gcp-metadata#24 needs to land, and we need to ship it :)

Resolves #190.

package.json

@@ -21,6 +21,7 @@
  ],
  "dependencies": {
    "axios": "^0.17.1",
+    "gcp-metadata": "^0.4.1",


src/auth/computeclient.ts

@@ -15,7 +15,7 @@
 */

 import {AxiosError, AxiosPromise, AxiosRequestConfig, AxiosResponse} from 'axios';
-
+import * as gcpMetadata from 'gcp-metadata';


src/auth/googleauth.ts

-      }
-      this.checkIsGCE = false;
-    }
+    this.checkIsGCE = await gcpMetadata.isAvailable();


src/auth/googleauth.ts

-          'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/?recursive=true',
-      headers: {'Metadata-Flavor': 'Google'}
-    });
+    const res = await gcpMetadata.instance(


test/test.googleauth.ts

-    'metadata-flavor': 'Google'
-  });
+const host = gcpMetadata.HOST_ADDRESS;
+const instancePath = '/computeMetadata/v1beta1/instance';


src/auth/computeclient.ts

@@ -60,11 +61,15 @@ export class Compute extends OAuth2Client {
   */
  protected async refreshToken(refreshToken?: string|
                               null): Promise<GetTokenResponse> {
-    const url = this.tokenUrl || Compute._GOOGLE_OAUTH2_TOKEN_URL;
+    const url =


codecov-io · 2018-02-07T17:55:11Z

Codecov Report

Merging #278 into master will increase coverage by 0.31%.
The diff coverage is 91.66%.

@@            Coverage Diff             @@
##           master     #278      +/-   ##
==========================================
+ Coverage   91.33%   91.64%   +0.31%     
==========================================
  Files          13       13              
  Lines         842      826      -16     
  Branches      185      177       -8     
==========================================
- Hits          769      757      -12     
+ Misses         73       69       -4

Impacted Files	Coverage Δ
src/auth/computeclient.ts	`95% <100%> (+0.26%)`	⬆️
src/auth/googleauth.ts	`85.25% <87.5%> (+0.57%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a21d244...92c463b. Read the comment docs.

JustinBeckwith · 2018-02-07T18:24:16Z

@ofrobots this is ready for a look 🎉

ofrobots

w/ nits

package.json

@@ -21,6 +21,7 @@
  ],
  "dependencies": {
    "axios": "^0.17.1",
+    "gcp-metadata": "^0.4.1",


src/auth/googleauth.ts

-      }
-      this.checkIsGCE = false;
-    }
+    this.checkIsGCE = await gcpMetadata.isAvailable();


JustinBeckwith added 2 commits February 3, 2018 15:46

chore: use gcp-metadata

fd67aa6

fixup

353b352

JustinBeckwith requested review from ofrobots and a team February 3, 2018 23:53

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 3, 2018

ofrobots reviewed Feb 5, 2018

View reviewed changes

JustinBeckwith added 2 commits February 6, 2018 19:31

update stuff

cf1cf62

stuff

9be140c

JustinBeckwith commented Feb 7, 2018

View reviewed changes

real module

5b83113

ofrobots approved these changes Feb 8, 2018

View reviewed changes

feedback

92c463b

JustinBeckwith merged commit 3c9efe5 into googleapis:master Feb 8, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: use gcp-metadata #278

chore: use gcp-metadata #278

JustinBeckwith commented Feb 3, 2018

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

codecov-io commented Feb 7, 2018 •

edited

Loading

JustinBeckwith commented Feb 7, 2018

ofrobots left a comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

chore: use gcp-metadata #278

chore: use gcp-metadata #278

Conversation

JustinBeckwith commented Feb 3, 2018

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

codecov-io commented Feb 7, 2018 • edited Loading

Codecov Report

JustinBeckwith commented Feb 7, 2018

ofrobots left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

codecov-io commented Feb 7, 2018 •

edited

Loading