fix(deps): update dependency gcp-metadata to v1 (#975)

* fix(deps): update dependency gcp-metadata to v1 * fix nock paths * use HOST_ADDRESS
googleapis · Feb 26, 2019 · ea9cb4b · ea9cb4b
1 parent 29bb15c
commit ea9cb4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
     "console-log-level": "^1.4.0",
     "continuation-local-storage": "^3.2.1",
     "extend": "^3.0.0",
-    "gcp-metadata": "^0.9.0",
+    "gcp-metadata": "^1.0.0",
     "hex2dec": "^1.0.1",
     "is": "^3.2.0",
     "methods": "^1.1.1",

diff --git a/test/nocks.ts b/test/nocks.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {HOST_ADDRESS} from 'gcp-metadata';
 import * as nock from 'nock';
 
 const accept = () => true;
@@ -36,7 +37,7 @@ export function projectId(status: number|(() => string), reply?: () => string) {
     reply = status;
     status = 200;
   }
-  return nock('http://metadata.google.internal')
+  return nock(HOST_ADDRESS)
       .get('/computeMetadata/v1/project/project-id')
       .once()
       .reply(status, reply, {'Metadata-Flavor': 'Google'});
@@ -48,7 +49,7 @@ export function instanceId(
     reply = status;
     status = 200;
   }
-  return nock('http://metadata.google.internal')
+  return nock(HOST_ADDRESS)
       .get('/computeMetadata/v1/instance/id')
       .once()
       .reply(status, reply, {'Metadata-Flavor': 'Google'});
@@ -59,7 +60,7 @@ export function hostname(status: number|(() => string), reply?: () => string) {
     reply = status;
     status = 200;
   }
-  return nock('http://metadata.google.internal')
+  return nock(HOST_ADDRESS)
       .get('/computeMetadata/v1/instance/hostname')
       .once()
       .reply(status, reply, {'Metadata-Flavor': 'Google'});

diff --git a/test/test-no-self-tracing.ts b/test/test-no-self-tracing.ts
@@ -17,6 +17,7 @@
 'use strict';
 
 import {FORCE_NEW} from '../src/util';
+import {HOST_ADDRESS} from 'gcp-metadata';
 
 var assert = require('assert');
 var nock = require('nock');
@@ -32,7 +33,7 @@ nock.disableNetConnect();
 
 describe('test-no-self-tracing', function() {
   it('should not trace metadata queries', function(done) {
-    var scope = nock('http://metadata.google.internal')
+    var scope = nock(HOST_ADDRESS)
                 .get('/computeMetadata/v1/instance/hostname').reply(200)
                 .get('/computeMetadata/v1/instance/id').reply(200);
     require('../..').start({[FORCE_NEW]: true});
@@ -46,7 +47,7 @@ describe('test-no-self-tracing', function() {
   });
 
   it('should not trace publishes', function(done) {
-    var metadataScope = nock('http://metadata.google.internal')
+    var metadataScope = nock(HOST_ADDRESS)
                 .get('/computeMetadata/v1/instance/hostname').reply(200)
                 .get('/computeMetadata/v1/instance/id').reply(200);
     var apiScope = nock('https://cloudtrace.googleapis.com')