use google-service-account

googleapis · Nov 6, 2014 · 81aba40 · 81aba40
1 parent fa5a471
commit 81aba40
Show file tree

Hide file tree

Showing 23 changed files with 521 additions and 929 deletions.
diff --git a/lib/bigquery/index.js b/lib/bigquery/index.js
@@ -24,12 +24,6 @@ var extend = require('extend');
 var streamEvents = require('stream-events');
 var through = require('through2');
 
-/**
- * @type module:common/connection
- * @private
- */
-var conn = require('../common/connection.js');
-
 /**
  * @type module:bigquery/dataset
  * @private
@@ -115,9 +109,9 @@ function BigQuery(options) {
 
   options = options || {};
 
-  this.connection_ = new conn.Connection({
+  this.makeAuthorizedRequest_ = util.makeAuthorizedRequest({
     credentials: options.credentials,
-    keyFilename: options.keyFilename,
+    keyFile: options.keyFilename,
     scopes: SCOPES
   });
 
@@ -565,9 +559,7 @@ BigQuery.prototype.makeReq_ = function(method, path, query, body, callback) {
     reqOpts.json = body;
   }
 
-  this.connection_.req(reqOpts, function(err, res, body) {
-    util.handleResp(err, res, body, callback);
-  });
+  this.makeAuthorizedRequest_(reqOpts, callback);
 };
 
 module.exports = BigQuery;
diff --git a/lib/bigquery/table.js b/lib/bigquery/table.js
@@ -305,7 +305,7 @@ Table.prototype.createWriteStream = function(metadata) {
 
   dup.once('writing', function() {
     util.makeWritableStream(dup, {
-      connection: that.bigQuery.connection_,
+      makeAuthorizedRequest: that.bigQuery.makeAuthorizedRequest_,
       metadata: {
         configuration: {
           load: metadata

diff --git a/lib/common/connection.js b/lib/common/connection.js