fix: retry connections to gce metadata server #284

JustinBeckwith · 2018-02-14T06:04:20Z

Resolves #283.

codecov-io · 2018-02-14T06:05:36Z

Codecov Report

Merging #284 into master will increase coverage by 0.03%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##           master     #284      +/-   ##
==========================================
+ Coverage   91.67%   91.71%   +0.03%     
==========================================
  Files          13       13              
  Lines         829      833       +4     
  Branches      178      179       +1     
==========================================
+ Hits          760      764       +4     
  Misses         69       69

Impacted Files	Coverage Δ
src/auth/computeclient.ts	`95.45% <88.88%> (+0.45%)`	⬆️

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 78d6813...00a93c3. Read the comment docs.

package.json

@@ -24,7 +24,8 @@
    "gtoken": "^2.1.0",
    "jws": "^3.1.4",
    "lodash.isstring": "^4.0.1",
-    "lru-cache": "^4.1.1"
+    "lru-cache": "^4.1.1",
+    "retry-axios": "^0.3.0"


src/auth/computeclient.ts

@@ -68,8 +74,11 @@ export class Compute extends OAuth2Client {
    try {
      // TODO: In 2.0, we should remove the ability to configure the tokenUrl,
      // and switch this over to use the gcp-metadata package instead.
-      res = await this.transporter.request<CredentialRequest>(


src/auth/computeclient.ts

+      res = await ax.request<CredentialRequest>({
+        url,
+        headers: {'Metadata-Flavor': 'Google'},
+        raxConfig: {noResponseRetries: 8, retry: 8, instance: ax}


src/auth/computeclient.ts

+      res = await ax.request<CredentialRequest>({
+        url,
+        headers: {'Metadata-Flavor': 'Google'},
+        raxConfig: {noResponseRetries: 3, retry: 3, instance: ax}


src/auth/computeclient.ts

-          {url, headers: {'Metadata-Flavor': 'Google'}});
+      res = await ax.request<CredentialRequest>({
+        url,
+        headers: {'Metadata-Flavor': 'Google'},


test/test.compute.ts

+         nock(HOST_ADDRESS).get(tokenPath).reply(200, {
+           access_token: 'abc123',
+           expires_in: 10000
+         })


test/test.compute.ts

+         nock(HOST_ADDRESS).get(tokenPath).times(2).reply(500),
+         nock(HOST_ADDRESS).get(tokenPath).reply(200, {
+           access_token: 'abc123',
+           expires_in: 10000


JustinBeckwith · 2018-02-16T03:08:53Z

@ofrobots @jonparrott Does this look good?

src/auth/computeclient.ts

-          {url, headers: {'Metadata-Flavor': 'Google'}});
+      res = await ax.request<CredentialRequest>({
+        url,
+        headers: {[gcpMetadata.HEADER_NAME]: 'Google'},


ofrobots

LGTM once question addressed adequately.

theacodes

Conceptually looks fine to me.

JustinBeckwith added 2 commits February 13, 2018 21:58

fix: retry connections to gce metadata server

5a6dd5b

cleanup

1cb9ffc

JustinBeckwith requested review from ofrobots and a team February 14, 2018 06:04

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

theacodes reviewed Feb 14, 2018

View reviewed changes

pr feedback

bddfd42

ofrobots reviewed Feb 14, 2018

View reviewed changes

src/auth/computeclient.ts Outdated

{url, headers: {'Metadata-Flavor': 'Google'}});

res = await ax.request<CredentialRequest>({

url,

headers: {'Metadata-Flavor': 'Google'},

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ofrobots reviewed Feb 14, 2018

View reviewed changes

test/test.compute.ts Outdated

nock(HOST_ADDRESS).get(tokenPath).reply(200, {

access_token: 'abc123',

expires_in: 10000

})

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ofrobots reviewed Feb 14, 2018

View reviewed changes

test/test.compute.ts Outdated

nock(HOST_ADDRESS).get(tokenPath).times(2).reply(500),

nock(HOST_ADDRESS).get(tokenPath).reply(200, {

access_token: 'abc123',

expires_in: 10000

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

JustinBeckwith mentioned this pull request Feb 14, 2018

feat: export headers to reduce duplication googleapis/gcp-metadata#33

Merged

pr feedback

00a93c3

ofrobots reviewed Feb 16, 2018

View reviewed changes

ofrobots approved these changes Feb 16, 2018

View reviewed changes

theacodes approved these changes Feb 16, 2018

View reviewed changes

JustinBeckwith merged commit 7a951e0 into googleapis:master Feb 16, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: retry connections to gce metadata server #284

fix: retry connections to gce metadata server #284

JustinBeckwith commented Feb 14, 2018

codecov-io commented Feb 14, 2018 •

edited

Loading

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.

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.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

JustinBeckwith commented Feb 16, 2018

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ofrobots left a comment

theacodes left a comment

fix: retry connections to gce metadata server #284

fix: retry connections to gce metadata server #284

Conversation

JustinBeckwith commented Feb 14, 2018

codecov-io commented Feb 14, 2018 • edited Loading

Codecov Report

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.

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.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

JustinBeckwith commented Feb 16, 2018

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ofrobots left a comment

Choose a reason for hiding this comment

theacodes left a comment

Choose a reason for hiding this comment

codecov-io commented Feb 14, 2018 •

edited

Loading