Merge pull request #890 from stephenplusplus/spp--update-gce-images

compute: update gce-images to re-use auth client

Author: callmehiphop

lib/compute/index.js

@@ -110,18 +110,13 @@ function Compute(options) {
     return new Compute(options);
   }
 
-  var authConfig = {
+  this.makeAuthenticatedRequest_ = util.makeAuthenticatedRequestFactory({
     credentials: options.credentials,
     keyFile: options.keyFilename,
     scopes: SCOPES,
     email: options.email
-  };
-
-  // We store the authConfig for use with gceImages in Zone.
-  this.authConfig = authConfig;
+  });
 
-  this.makeAuthenticatedRequest_ =
-    util.makeAuthenticatedRequestFactory(authConfig);
   this.projectId = options.projectId;
 }
 

lib/compute/zone.js

@@ -84,7 +84,9 @@ function Zone(compute, name) {
   this.name = name;
   this.metadata = {};
 
-  this.gceImages = gceImages(compute.authConfig);
+  this.gceImages = gceImages({
+    authClient: compute.makeAuthenticatedRequest_.authClient
+  });
 }
 
 /**

package.json

@@ -89,7 +89,7 @@
     "dns-zonefile": "0.1.10",
     "duplexify": "^3.2.0",
     "extend": "^3.0.0",
-    "gce-images": "^0.1.0",
+    "gce-images": "^0.2.0",
     "gcs-resumable-upload": "^0.2.1",
     "google-auto-auth": "^0.2.0",
     "hash-stream-validation": "^0.1.0",

test/compute/index.js

@@ -144,17 +144,6 @@ describe('Compute', function() {
       fakeUtil.normalizeArguments = normalizeArguments;
     });
 
-    it('should localize authConfig', function() {
-      var compute = new Compute(options);
-
-      assert.deepEqual(compute.authConfig, {
-        credentials: options.credentials,
-        keyFile: options.keyFilename,
-        email: options.email,
-        scopes: ['https://www.googleapis.com/auth/compute']
-      });
-    });
-
     it('should create a makeAuthenticatedRequest method', function(done) {
       fakeUtil.makeAuthenticatedRequestFactory = function(options_) {
         assert.deepEqual(options_, {

test/compute/zone.js

@@ -60,7 +60,12 @@ describe('Zone', function() {
   var zone;
 
   var COMPUTE = {
-    authConfig: { a: 'b', c: 'd' }
+    makeAuthenticatedRequest_: {
+      authClient: {
+        a: 'b',
+        c: 'd'
+      }
+    }
   };
   var ZONE_NAME = 'us-central1-a';
 
@@ -111,7 +116,8 @@ describe('Zone', function() {
       var gceVal = 'ok';
 
       gceImagesOverride = function(authConfig) {
-        assert.strictEqual(authConfig, COMPUTE.authConfig);
+        var expectedAuthClient = COMPUTE.makeAuthenticatedRequest_.authClient;
+        assert.strictEqual(authConfig.authClient, expectedAuthClient);
         return gceVal;
       };