Restart delete resumable upload v3 test

google-cloud-storage/lib/google/cloud/storage/bucket.rb

@@ -717,6 +717,32 @@ def default_kms_key= new_default_kms_key
           patch_gapi! :encryption
         end
 
+        ##
+        # Restart resumable upload
+        # @param [String, ::File] file Path of the file on the filesystem to
+        #   upload. Can be an File object, or File-like object such as StringIO.
+        #   (If the object does not have path, a `path` argument must be also be
+        #   provided.)
+        # @param [String] upload_id Unique Id of a resumable upload
+        #
+        # @return [Hash(String => String)]
+        #   A Hash of file object returned from server.
+        #
+        # @example
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-bucket"
+        #   bucket.restart_resumable_upload file,upload_id
+
+        def restart_resumable_upload file, upload_id
+          ensure_service!
+          ensure_io_or_file_exists! file
+          raise ArgumentError, "Upload Id missing" unless upload_id
+          service.restart_resumable_upload name, file, upload_id
+        end
+
         ##
         # The period of time (in seconds) that files in the bucket must be
         # retained, and cannot be deleted, overwritten, or archived.
@@ -1410,6 +1436,26 @@ def delete if_metageneration_match: nil, if_metageneration_not_match: nil
                                 user_project: user_project
         end
 
+        ##
+        # Delete resumable upload
+        # @param [String] upload_id Unique Id of an resumable upload
+        #
+        # @return [Boolean] Returns `true` if the bucket was deleted.
+        #
+        # @example
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-bucket"
+        #   bucket.delete_resumable_upload upload_id
+
+        def delete_resumable_upload upload_id
+          ensure_service!
+          raise ArgumentError, "Upload Id missing" unless upload_id
+          service.delete_resumable_upload name, upload_id
+        end
+
         ##
         # Retrieves a list of files matching the criteria.
         #
@@ -1465,6 +1511,7 @@ def delete if_metageneration_match: nil, if_metageneration_not_match: nil
         #     puts file.name
         #   end
         #
+
         def files prefix: nil, delimiter: nil, token: nil, max: nil,
                   versions: nil, match_glob: nil, include_folders_as_prefixes: nil,
                   soft_deleted: nil

google-cloud-storage/lib/google/cloud/storage/service.rb

@@ -696,6 +696,18 @@ def delete_file bucket_name,
           end
         end
 
+        def restart_resumable_upload bucket_name, source, upload_id, options: {}
+          execute do
+            service.restart_resumable_upload bucket_name, source, upload_id, options: options
+          end
+        end
+
+        def delete_resumable_upload bucket_name, upload_id, options: {}
+          execute do
+            service.delete_resumable_upload bucket_name, upload_id, options: options
+          end
+        end
+
         ##
         # Restore soft deleted bucket
         def restore_bucket bucket_name,

google-cloud-storage/test/google/cloud/storage/bucket_test.rb

@@ -1408,6 +1408,69 @@
     end
   end
 
+  it "restarts a resumable upload with upload_id" do
+    new_file_name = random_file_path
+    upload_id= "TEST_ID"
+
+    Tempfile.open ["google-cloud", ".txt"] do |tmpfile|
+      tmpfile.write "Hello world"
+      tmpfile.rewind
+      mock = Minitest::Mock.new
+      expected_return_value = create_file_gapi(bucket.name, new_file_name)
+      mock.expect :restart_resumable_upload, expected_return_value,
+        [bucket.name, tmpfile, upload_id],
+        **resumable_upload_args(options: {})
+      bucket.service.mocked_service = mock
+      returned_value= bucket.restart_resumable_upload tmpfile, upload_id
+      assert_equal expected_return_value, returned_value
+      mock.verify
+    end
+  end
+
+  it "raises ArgumentError if upload_id is not provided to restart_resumable_upload" do
+    new_file_name = random_file_path
+    upload_id= "TEST_ID"
+
+    Tempfile.open ["google-cloud", ".txt"] do |tmpfile|
+      tmpfile.write "Hello world"
+      tmpfile.rewind
+      mock = Minitest::Mock.new
+      mock.expect :restart_resumable_upload, create_file_gapi(bucket.name, new_file_name),
+        [bucket.name, tmpfile, upload_id],
+        **resumable_upload_args(options: {})
+      bucket.service.mocked_service = mock
+      expect do
+        bucket.restart_resumable_upload tmpfile
+      end.must_raise ArgumentError
+    end
+  end
+
+  it "deletes a resumable upload with upload_id" do
+    upload_id = "TEST_ID"
+
+    mock = Minitest::Mock.new
+    expected_return_value = true
+    mock.expect :delete_resumable_upload, expected_return_value,
+      [bucket.name, upload_id],
+      **resumable_upload_args(options: {})
+    bucket.service.mocked_service = mock
+    returned_value = bucket.delete_resumable_upload upload_id
+    assert_equal expected_return_value, returned_value
+    mock.verify
+  end
+
+  it "Raises ArgumentError if upload_id is not provided to delete_resumable_upload" do
+    upload_id = "TEST_ID"
+    mock = Minitest::Mock.new
+    mock.expect :delete_resumable_upload, true,
+      [bucket.name, upload_id],
+      **resumable_upload_args(options: {})
+    bucket.service.mocked_service = mock
+    expect do
+      bucket.delete_resumable_upload
+    end.must_raise ArgumentError    
+  end
+
   def create_file_gapi bucket=nil, name = nil
     Google::Apis::StorageV1::Object.from_json random_file_hash(bucket, name).to_json
   end

google-cloud-storage/test/helper.rb

@@ -391,6 +391,12 @@ def insert_object_args name: nil,
     }
   end
 
+  def resumable_upload_args options: {}
+    {
+      options: options
+    }
+  end
+
   def get_object_args generation: nil,
                       if_generation_match: nil,
                       if_generation_not_match: nil,