Storage write streams should be able to use a pre-existing uri

Ben Stahl · stephenplusplus · commit 3d6fa8a164c7 · 2016-05-18T07:45:25.000-04:00
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -12,6 +12,7 @@
 # Keep the list alphabetically sorted.
 
 Anand Suresh <anandsuresh@gmail.com>
+Ben Stahl <bhstahl@gmail.com>
 Brett Bergmann <me@brettbergmann.com>
 Burcu Dogan <jbd@google.com>
 Hector Rovira <hrovira@gmail.com>
diff --git a/lib/storage/bucket.js b/lib/storage/bucket.js
@@ -968,6 +968,8 @@ Bucket.prototype.makePublic = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request
  * @param {module:storage/file} callback.file - The uploaded File.
  * @param {object} callback.apiResponse - The full API response.
+ * @param {string} options.uri - The URI for an already-created resumable
+ *     upload. See {module:storage/file#createResumableUpload}.
  * @param {string|boolean} options.validation - Possible values: `"md5"`,
  *     `"crc32c"`, or `false`. By default, data integrity is validated with an
  *     MD5 checksum for maximum reliability. CRC32c will provide better
diff --git a/lib/storage/file.js b/lib/storage/file.js
@@ -747,6 +747,8 @@ File.prototype.createResumableUpload = function(options, callback) {
  *     `options.predefinedAcl = 'private'`)
  * @param {boolean} options.public - Make the uploaded file public. (Alias for
  *     `options.predefinedAcl = 'publicRead'`)
+ * @param {string} options.uri - The URI for an already-created resumable
+ *     upload. See {module:storage/file#createResumableUpload}.
  * @param {string|boolean} options.validation - Possible values: `"md5"`,
  *     `"crc32c"`, or `false`. By default, data integrity is validated with an
  *     MD5 checksum for maximum reliability. CRC32c will provide better
@@ -1547,7 +1549,8 @@ File.prototype.startResumableUpload_ = function(dup, options) {
     metadata: options.metadata,
     predefinedAcl: options.predefinedAcl,
     private: options.private,
-    public: options.public
+    public: options.public,
+    uri: options.uri
   });
 
   uploadStream
diff --git a/package.json b/package.json
@@ -100,7 +100,7 @@
     "ent": "^2.2.0",
     "extend": "^3.0.0",
     "gce-images": "^0.2.0",
-    "gcs-resumable-upload": "^0.5.0",
+    "gcs-resumable-upload": "^0.6.0",
     "google-auto-auth": "^0.2.0",
     "google-proto-files": "^0.1.1",
     "grpc": "^0.14.1",
diff --git a/test/storage/file.js b/test/storage/file.js
@@ -994,7 +994,8 @@ describe('File', function() {
     it('should start a simple upload if specified', function(done) {
       var options = {
         metadata: METADATA,
-        resumable: false
+        resumable: false,
+        customValue: true
       };
       var writable = file.createWriteStream(options);
 
@@ -1009,7 +1010,8 @@ describe('File', function() {
     it('should start a resumable upload if specified', function(done) {
       var options = {
         metadata: METADATA,
-        resumable: true
+        resumable: true,
+        customValue: true
       };
       var writable = file.createWriteStream(options);
 
@@ -2180,7 +2182,8 @@ describe('File', function() {
           metadata: {},
           public: true,
           private: false,
-          predefinedAcl: 'allUsers'
+          predefinedAcl: 'allUsers',
+          uri: 'http://resumable-uri'
         };
 
         file.generation = 3;
@@ -2198,6 +2201,7 @@ describe('File', function() {
           assert.strictEqual(opts.predefinedAcl, options.predefinedAcl);
           assert.strictEqual(opts.private, options.private);
           assert.strictEqual(opts.public, options.public);
+          assert.strictEqual(opts.uri, options.uri);
 
           setImmediate(done);
           return through();

-Original file line number
+Diff line change
 # Keep the list alphabetically sorted.
 Anand Suresh <[email protected]>
 +Ben Stahl <[email protected]>
 Brett Bergmann <[email protected]>
 Burcu Dogan <[email protected]>
 Hector Rovira <[email protected]>