overhaul Compute Engine

Author: stephenplusplus

lib/bigquery/dataset.js

@@ -63,7 +63,6 @@ function Dataset(bigQuery, id) {
   });
 
   this.bigQuery = bigQuery;
-  this.id = id;
 }
 
 nodeutil.inherits(Dataset, ServiceObject);
@@ -97,7 +96,7 @@ nodeutil.inherits(Dataset, ServiceObject);
  * var bigquery = gcloud.bigquery({
  *   projectId: 'grape-spaceship-123'
  * });
- * var dataset = bigquery.dataset();
+ * var dataset = bigquery.dataset('institutions');
  *
  * dataset.createTable(tableConfig, function(err, table, apiResponse) {});
  */

lib/bigquery/job.js

@@ -62,7 +62,7 @@ function Job(bigQuery, id) {
     parent: bigQuery,
     baseUrl: '/jobs',
     id: id,
-    inherit: ['getMetadata']
+    inherit: []
   });
 
   this.bigQuery = bigQuery;

lib/common/service-object.js

@@ -20,6 +20,7 @@
 
 'use strict';
 
+var exec = require('methmeth');
 var is = require('is');
 
 /**
@@ -61,12 +62,10 @@ function ServiceObject(config) {
   this.id = config.id; // Name or ID (e.g. dataset ID, bucket name, etc.)
   this.createMethod = config.createMethod;
 
-  if (config.inherit) {
+  if (config.exclude) {
     var allMethods = Object.keys(ServiceObject.prototype);
-    allMethods.splice(allMethods.indexOf('request'), 1);
-
     allMethods.forEach(function(methodName) {
-      if (config.inherit.indexOf(methodName) === -1) {
+      if (config.exclude.indexOf(methodName) > -1) {
         self[methodName] = undefined;
       }
     });
@@ -120,10 +119,12 @@ ServiceObject.prototype.create = function(options, callback) {
  * @param {object} callback.apiResponse - The full API response.
  */
 ServiceObject.prototype.delete = function(callback) {
-  this.request({
+  var reqOpts = {
     method: 'DELETE',
     uri: ''
-  }, function(err, resp) {
+  };
+
+  ServiceObject.prototype.request.call(this, reqOpts, function(err, resp) {
     callback(err, resp);
   });
 };
@@ -161,9 +162,11 @@ ServiceObject.prototype.get = function(callback) {
 ServiceObject.prototype.getMetadata = function(callback) {
   var self = this;
 
-  this.request({
+  var reqOpts = {
     uri: ''
-  }, function(err, resp) {
+  };
+
+  ServiceObject.prototype.request.call(this, reqOpts, function(err, resp) {
     if (err) {
       callback(err, null, resp);
       return;
@@ -178,17 +181,18 @@ ServiceObject.prototype.getMetadata = function(callback) {
 /**
  * Get or create this object. If it doesn't exist, it will be created.
  *
+ * @param {object=} options - Configuration object.
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
  * @param {object} callback.instance - The instance.
  * @param {object} callback.apiResponse - The full API response.
  */
-ServiceObject.prototype.getOrCreate = function(callback) {
+ServiceObject.prototype.getOrCreate = function(options, callback) {
   var self = this;
 
   this.get(function(err, instance, apiResponse) {
     if (err) {
-      self.create(callback);
+      self.create(options, callback);
       return;
     }
 
@@ -210,11 +214,13 @@ ServiceObject.prototype.setMetadata = function(metadata, callback) {
 
   callback = callback || util.noop;
 
-  this.request({
+  var reqOpts = {
     method: 'PATCH',
     uri: '',
     json: metadata
-  }, function(err, resp) {
+  };
+
+  ServiceObject.prototype.request.call(this, reqOpts, function(err, resp) {
     if (err) {
       callback(err, resp);
       return;
@@ -242,9 +248,12 @@ ServiceObject.prototype.request = function(reqOpts, callback) {
     reqOpts.uri
   ];
 
-  reqOpts.uri = uriComponents.map(function(uriComponent) {
-    return uriComponent.replace(/^\/*|\/*$/g, '');
-  }).join('/');
+  reqOpts.uri = uriComponents
+    .filter(exec('trim')) // Limit to non-empty strings.
+    .map(function(uriComponent) {
+      return uriComponent.replace(/^\/*|\/*$/g, '');
+    })
+    .join('/');
 
   this.parent.request(reqOpts, callback);
 };

lib/common/service.js

@@ -47,6 +47,8 @@ function Service(config, options) {
     scopes: config.scopes,
     email: options.email
   });
+
+  this.authClient = this.makeAuthenticatedRequest.authClient;
 }
 
 /**

lib/common/util.js

@@ -115,8 +115,16 @@ util.noop = noop;
 var ApiError = createErrorClass('ApiError', function(errorBody) {
   this.errors = errorBody.errors;
   this.code = errorBody.code;
-  this.message = errorBody.message || 'Error during request.';
+  this.message = errorBody.message;
   this.response = errorBody.response;
+
+  if (!this.message) {
+    if (errorBody.errors && errorBody.errors.length === 1) {
+      this.message = errorBody.errors[0].message;
+    } else {
+      this.message = 'Error during request.';
+    }
+  }
 });
 
 /**

lib/compute/address.js

@@ -20,6 +20,14 @@
 
 'use strict';
 
+var nodeutil = require('util');
+
+/**
+ * @type {module:common/serviceObject}
+ * @private
+ */
+var ServiceObject = require('../common/service-object.js');
+
 /**
  * @type {module:common/util}
  * @private
@@ -54,11 +62,88 @@ var util = require('../common/util.js');
  * var address = region.address('address1');
  */
 function Address(region, name) {
+  ServiceObject.call(this, {
+    parent: region,
+    baseUrl: '/addresses',
+    id: name,
+    createMethod: region.createAddress.bind(region),
+    exclude: ['setMetadata']
+  });
+
   this.region = region;
-  this.name = name;
-  this.metadata = {};
 }
 
+nodeutil.inherits(Address, ServiceObject);
+
+/**
+ * Create an address.
+ *
+ * @resource [Instances and Networks]{@link https://cloud.google.com/compute/docs/instances-and-network}
+ * @resource [Address Resource]{@link https://cloud.google.com/compute/docs/reference/v1/addresses}
+ * @resource [Addresses: insert API Documentation]{@link https://cloud.google.com/compute/docs/reference/v1/addresses/insert}
+ *
+ * @param {object=} options - See an
+ *     [Address resource](https://cloud.google.com/compute/docs/reference/v1/addresses).
+ * @param {function} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ * @param {module:compute/address} callback.address - The created Address
+ *     object.
+ * @param {module:compute/operation} callback.operation - An operation object
+ *     that can be used to check the status of the request.
+ * @param {object} callback.apiResponse - The full API response.
+ *
+ * @example
+ * address.create(function(err, address, operation, apiResponse) {
+ *   // `address` is an Address object.
+ *
+ *   // `operation` is an Operation object that can be used to check the status
+ *   // of the request.
+ * });
+ */
+Address.prototype.create = function() {
+  ServiceObject.prototype.create.apply(this, arguments);
+};
+
+/**
+ * Get an address if it exists. Also see {module:compute/address#getOrCreate}.
+ *
+ * @resource [Address Resource]{@link https://cloud.google.com/compute/docs/reference/v1/addresses}
+ *
+ * @param {function} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ * @param {module:compute/address} callback.address - The Address object.
+ * @param {object} callback.apiResponse - The full API response.
+ *
+ * @example
+ * address.get(function(err, address, apiResponse) {
+ *   // `address` is an Address object.
+ * });
+ */
+Address.prototype.get = function() {
+  ServiceObject.prototype.get.apply(this, arguments);
+};
+
+/**
+ * Get an address if it exists, otherwise create one.
+ *
+ * @resource [Instances and Networks]{@link https://cloud.google.com/compute/docs/instances-and-network}
+ * @resource [Address Resource]{@link https://cloud.google.com/compute/docs/reference/v1/addresses}
+ * @resource [Addresses: insert API Documentation]{@link https://cloud.google.com/compute/docs/reference/v1/addresses/insert}
+ *
+ * @param {function} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ * @param {module:compute/address} callback.address - The Address object.
+ * @param {object} callback.apiResponse - The full API response.
+ *
+ * @example
+ * address.getOrCreate(function(err, address, apiResponse) {
+ *   // `address` is an Address object.
+ * });
+ */
+Address.prototype.getOrCreate = function() {
+  ServiceObject.prototype.getOrCreate.apply(this, arguments);
+};
+
 /**
  * Delete the address.
  *
@@ -81,7 +166,10 @@ Address.prototype.delete = function(callback) {
 
   var region = this.region;
 
-  this.makeReq_('DELETE', '', null, null, function(err, resp) {
+  this.request({
+    method: 'DELETE',
+    uri: ''
+  }, function(err, resp) {
     if (err) {
       callback(err, null, resp);
       return;
@@ -108,38 +196,8 @@ Address.prototype.delete = function(callback) {
  * @example
  * address.getMetadata(function(err, metadata, apiResponse) {});
  */
-Address.prototype.getMetadata = function(callback) {
-  callback = callback || util.noop;
-
-  var self = this;
-
-  this.makeReq_('GET', '', null, null, function(err, resp) {
-    if (err) {
-      callback(err, null, resp);
-      return;
-    }
-
-    self.metadata = resp;
-
-    callback(null, self.metadata, resp);
-  });
-};
-
-/**
- * Make a new request object from the provided arguments and wrap the callback
- * to intercept non-successful responses.
- *
- * @private
- *
- * @param {string} method - Action.
- * @param {string} path - Request path.
- * @param {*} query - Request query object.
- * @param {*} body - Request body contents.
- * @param {function} callback - The callback function.
- */
-Address.prototype.makeReq_ = function(method, path, query, body, callback) {
-  path = '/addresses/' + this.name + path;
-  this.region.makeReq_(method, path, query, body, callback);
+Address.prototype.getMetadata = function() {
+  ServiceObject.prototype.getMetadata.apply(this, arguments);
 };
 
 module.exports = Address;