core: only recurse relevant request objects (#2100)

Author: stephenplusplus

packages/google-cloud-compute/package.json

@@ -63,7 +63,8 @@
     "concat-stream": "^1.5.0",
     "mocha": "^3.0.1",
     "propprop": "^0.3.0",
-    "proxyquire": "^1.7.10"
+    "proxyquire": "^1.7.10",
+    "uuid": "^3.0.1"
   },
   "scripts": {
     "publish-module": "node ../../scripts/publish.js compute",

packages/google-cloud-compute/src/vm.js

@@ -342,6 +342,11 @@ VM.prototype.detachDisk = function(disk, callback) {
       return;
     }
 
+    var diskName = common.util.replaceProjectIdToken(
+      disk.formattedName,
+      self.zone.compute.authClient.projectId
+    );
+
     var deviceName;
     var baseUrl = 'https://www.googleapis.com/compute/v1/';
     var disks = metadata.disks || [];
@@ -352,7 +357,7 @@ VM.prototype.detachDisk = function(disk, callback) {
       var attachedDisk = disks[i];
       var source = attachedDisk.source.replace(baseUrl, '');
 
-      if (source === disk.formattedName) {
+      if (source === diskName) {
         deviceName = attachedDisk.deviceName;
       }
     }

packages/google-cloud-compute/test/vm.js

@@ -23,6 +23,8 @@ var proxyquire = require('proxyquire');
 var ServiceObject = require('@google-cloud/common').ServiceObject;
 var util = require('@google-cloud/common').util;
 
+var utilCached = extend({}, util);
+
 var promisified = false;
 var fakeUtil = extend({}, util, {
   promisifyAll: function(Class) {
@@ -46,7 +48,12 @@ describe('VM', function() {
   var Disk;
   var DISK;
 
-  var COMPUTE = { projectId: 'project-id' };
+  var COMPUTE = {
+    authClient: {
+      projectId: 'project-id'
+    },
+    projectId: 'project-id'
+  };
   var ZONE = {
     compute: COMPUTE,
     name: 'us-central1-a',
@@ -70,6 +77,7 @@ describe('VM', function() {
   });
 
   beforeEach(function() {
+    extend(fakeUtil, utilCached);
     vm = new VM(ZONE, VM_NAME);
     DISK = new Disk(ZONE, 'disk-name');
   });
@@ -229,7 +237,7 @@ describe('VM', function() {
     beforeEach(function() {
       DEVICE_NAME = DISK.formattedName;
 
-      METADATA = METADATA = {
+      METADATA = {
         disks: [
           {
             source: DEVICE_NAME,
@@ -254,6 +262,36 @@ describe('VM', function() {
       });
     });
 
+    it('should replace projectId token in disk name', function(done) {
+      var REPLACED_DEVICE_NAME = 'replaced-device-name';
+
+      fakeUtil.replaceProjectIdToken = function(value, projectId) {
+        assert.strictEqual(value, DISK.formattedName);
+        assert.strictEqual(projectId, COMPUTE.authClient.projectId);
+        return REPLACED_DEVICE_NAME;
+      };
+
+      vm.getMetadata = function(callback) {
+        var metadata = {
+          disks: [
+            {
+              source: REPLACED_DEVICE_NAME,
+              deviceName: REPLACED_DEVICE_NAME
+            }
+          ]
+        };
+
+        callback(null, metadata, metadata);
+      };
+
+      vm.request = function(reqOpts) {
+        assert.strictEqual(reqOpts.qs.deviceName, REPLACED_DEVICE_NAME);
+        done();
+      };
+
+      vm.detachDisk(DISK, assert.ifError);
+    });
+
     it('should return an error if device name not found', function(done) {
       var metadata = {
         disks: [