From b263368c38dedbbeb6f76660914710473e9fdff4 Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Wed, 3 Oct 2018 15:59:04 -0700
Subject: [PATCH] chore(deps): use @google-cloud/projectify

---
 package.json |  1 +
 src/vm.js    |  3 ++-
 test/vm.js   | 20 ++++++++++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c6e8dedc..a46a8463 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
   "dependencies": {
     "@google-cloud/common": "^0.17.0",
     "@google-cloud/paginator": "^0.1.1",
+    "@google-cloud/projectify": "^0.3.0",
     "@google-cloud/promisify": "^0.3.1",
     "arrify": "^1.0.1",
     "async": "^2.6.1",
diff --git a/src/vm.js b/src/vm.js
index 0aa610d6..6d4216c2 100644
--- a/src/vm.js
+++ b/src/vm.js
@@ -23,6 +23,7 @@ const format = require('string-format-obj');
 const is = require('is');
 const util = require('util');
 const {promisifyAll} = require('@google-cloud/promisify');
+const {replaceProjectIdToken} = require('@google-cloud/projectify');
 
 const Disk = require('./disk.js');
 
@@ -432,7 +433,7 @@ VM.prototype.detachDisk = function(disk, callback) {
       return;
     }
 
-    const diskName = common.util.replaceProjectIdToken(
+    const diskName = replaceProjectIdToken(
       disk.formattedName,
       self.zone.compute.authClient.projectId
     );
diff --git a/test/vm.js b/test/vm.js
index 1f337388..73dde363 100644
--- a/test/vm.js
+++ b/test/vm.js
@@ -22,9 +22,7 @@ const nodeutil = require('util');
 const proxyquire = require('proxyquire');
 const {ServiceObject, util} = require('@google-cloud/common');
 const promisify = require('@google-cloud/promisify');
-
-const fakeUtil = extend({}, util);
-const utilCached = extend({}, util);
+const {replaceProjectIdToken} = require('@google-cloud/projectify');
 
 let promisified = false;
 const fakePromisify = extend({}, promisify, {
@@ -35,6 +33,14 @@ const fakePromisify = extend({}, promisify, {
   },
 });
 
+let replaceProjectIdTokenOverride;
+function fakeReplaceProjectIdToken() {
+  return (replaceProjectIdTokenOverride || replaceProjectIdToken).apply(
+    null,
+    arguments
+  );
+}
+
 function FakeServiceObject() {
   this.calledWith_ = arguments;
   ServiceObject.apply(this, arguments);
@@ -72,14 +78,16 @@ describe('VM', function() {
     VM = proxyquire('../src/vm.js', {
       '@google-cloud/common': {
         ServiceObject: FakeServiceObject,
-        util: fakeUtil,
       },
       '@google-cloud/promisify': fakePromisify,
+      '@google-cloud/projectify': {
+        replaceProjectIdToken: fakeReplaceProjectIdToken,
+      },
     });
   });
 
   beforeEach(function() {
-    extend(fakeUtil, utilCached);
+    replaceProjectIdTokenOverride = null;
     vm = new VM(ZONE, VM_NAME);
     DISK = new Disk(ZONE, 'disk-name');
   });
@@ -277,7 +285,7 @@ describe('VM', function() {
     it('should replace projectId token in disk name', function(done) {
       const REPLACED_DEVICE_NAME = 'replaced-device-name';
 
-      fakeUtil.replaceProjectIdToken = function(value, projectId) {
+      replaceProjectIdTokenOverride = function(value, projectId) {
         assert.strictEqual(value, DISK.formattedName);
         assert.strictEqual(projectId, COMPUTE.authClient.projectId);
         return REPLACED_DEVICE_NAME;