gitlab-fog-azure-rm 0.7.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff94ab3a5881a3709300b1a88ee3861f602a56aa675053e92a8b00f2fd9079a2
-  data.tar.gz: e7dbd521f7c7b0d1984ec6aa33005b12b7653741aaa4e9c80f46c66083180713
+  metadata.gz: 6a0941da3e69509575eca6b720890940f33e8617e32bbb37121e19c9e1087e33
+  data.tar.gz: '09b4913d90bcbba439e9501df86dcc5e4d3d012a57941e2bc7033e4ac7d97806'
 SHA512:
-  metadata.gz: c93fcf5a6bbaedceb13c75c3b19e75e1ce0f78c2d8909f6bb84ab9eedf08390520a69e0071667fdf0ac8c618b2476706b6e1a3231daa2f9671f5c0bb654125f7
-  data.tar.gz: 94abb45649b7c9d88f2a916a1a39887ad44a991c3f890df84e9ad3fb4aa73af02c5ea0f968fc1947a64e2af671fc73d53ed7f88ae0fea2196f9810c61e8e88e7
+  metadata.gz: 6df48a1e91089a7c7af40addf64716b712daee65ea431edc4cffc98f1912c85538c5547eddced2bf512bdee1fbcca1cdd43eb2eb76022055a837f07bdad54d8c
+  data.tar.gz: b4696c93d25c11b5344410a09cd8142eae252350030000c3f6d041b85f69273f2196fa1715e1428ce9105471d150f1d3b036834140813d148b5ff54883481c24

data/.rubocop_todo.yml

@@ -132,7 +132,6 @@ Naming/RescuedExceptionsVariableName:
 # SupportedStyles: separated, grouped
 Style/AccessorGrouping:
   Exclude:
-    - 'lib/fog/azurerm/requests/storage/multipart_save_block_blob.rb'
     - 'lib/fog/azurerm/requests/storage/save_page_blob.rb'
     - 'test/test_helper.rb'
 

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## Unreleased
+
+## 1.0.1
+
+- Fix URL generation for files with UTF-8 characters !21
+
+## 1.0.0
+
+- Fix multipart uploads not working and drop multipart_save_block_blob !19
+
+## 0.9.0
+
+- Fix TimeoutError deprecation !17
+- Update Azure storage libraries !16
+
+## 0.8.1
+
+- Fix `azure_storage_domain` not getting propagated properly !14
+
+## 0.8.0
+
+- Add `azure_storage_domain` for specifying custom domain !11
+
+## 0.7.0
+
+- Loosen mime-types version dependency !9
+- Drop azure_mgmt_storage and other dependencies !8
+
+## 0.6.0
+
+- Fix get_object_url !7
+- Add get_object_url method !6
+- Add support for copy_object !5
+- Add support for DELETE blob !4
+- Add support for PUT blobs !3
+- Add and update Rubocop files !2
+- Delete all code except blob storage-related functionality !1
+
 ## 0.5.2
 
 **Added**

data/gitlab-fog-azure-rm.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
   spec.add_development_dependency 'minitest', '~> 5.8.4'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 0.89'
+  spec.add_development_dependency 'rubocop', '~> 0.89.1'
   spec.add_development_dependency 'simplecov'
-  spec.add_dependency 'azure-storage', '~> 0.15.0.preview'
+  spec.add_dependency 'azure-storage-blob', '~> 2.0'
+  spec.add_dependency 'azure-storage-common', '~> 2.0'
   spec.add_dependency 'fog-core', '= 2.1.0'
   spec.add_dependency 'fog-json', '~> 1.2.0'
   spec.add_dependency 'mime-types'

data/lib/fog/azurerm/models/storage/file.rb

@@ -248,12 +248,7 @@ module Fog
         # Upload blob
         def save_blob(options)
           if options[:blob_type].nil? || options[:blob_type] == 'BlockBlob'
-            if Fog::Storage.get_body_size(body) <= SINGLE_BLOB_PUT_THRESHOLD
-              service.create_block_blob(directory.key, key, body, options)
-            else
-              service.multipart_save_block_blob(directory.key, key, body, options)
-              service.get_blob_properties(directory.key, key)
-            end
+            service.create_block_blob(directory.key, key, body, options)
           else
             service.save_page_blob(directory.key, key, body, options)
             service.get_blob_properties(directory.key, key)

data/lib/fog/azurerm/requests/storage/create_block_blob.rb

@@ -8,37 +8,9 @@ module Fog
           msg = "create_block_blob #{blob_name} to the container #{container_name}. options: #{options}"
           Fog::Logger.debug msg
 
-          begin
-            if body.nil?
-              data = nil
-            elsif body.respond_to?(:read)
-              if body.respond_to?(:rewind)
-                begin
-                  body.rewind
-                rescue
-                  nil
-                end
-              end
-              data = body.read
-            else
-              data = Fog::Storage.parse_data(body)
-              options[:content_length] = data[:headers]['Content-Length']
-              options[:content_type] = data[:headers]['Content-Type']
-              data = data[:body]
-            end
-
-            raise ArgumentError.new('The maximum size for a block blob created via create_block_blob is 64 MB.') if !data.nil? && Fog::Storage.get_body_size(data) > 64 * 1024 * 1024
-            blob = @blob_client.create_block_blob(container_name, blob_name, data, options)
-          rescue Azure::Core::Http::HTTPError => ex
-            raise_azure_exception(ex, msg)
-          end
-
-          if data.nil?
-            Fog::Logger.debug "Create a block blob #{blob_name} successfully."
-          else
-            Fog::Logger.debug "Upload a block blob #{blob_name} successfully."
-          end
-          blob
+          @blob_client.create_block_blob(container_name, blob_name, body, options)
+        rescue Azure::Core::Http::HTTPError => ex
+          raise_azure_exception(ex, msg)
         end
       end
 

data/lib/fog/azurerm/requests/storage/delete_blob_https_url.rb

@@ -23,7 +23,7 @@ module Fog
             protocol: 'https'
           }
           token = @signature_client.generate_service_sas_token(relative_path, params)
-          uri = @blob_client.generate_uri(relative_path)
+          uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           "#{uri}?#{token}"
         end
       end

data/lib/fog/azurerm/requests/storage/get_blob_http_url.rb

@@ -22,7 +22,7 @@ module Fog
             expiry: expires.utc.iso8601
           }
           token = @signature_client.generate_service_sas_token(relative_path, params)
-          uri = @blob_client.generate_uri(relative_path)
+          uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           url = "#{uri}?#{token}"
           url.gsub('https:', 'http:')
         end

data/lib/fog/azurerm/requests/storage/get_blob_https_url.rb

@@ -23,7 +23,7 @@ module Fog
             protocol: 'https'
           }
           token = @signature_client.generate_service_sas_token(relative_path, params)
-          uri = @blob_client.generate_uri(relative_path)
+          uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           "#{uri}?#{token}"
         end
       end

data/lib/fog/azurerm/requests/storage/get_blob_url.rb

@@ -5,7 +5,7 @@ module Fog
       class Real
         # Get a public blob url from Azure blob storage
         def get_blob_url(container_name, blob_name, options = {})
-          uri = @blob_client.generate_uri("#{container_name}/#{blob_name}")
+          uri = @blob_client.generate_uri("#{container_name}/#{blob_name}", {}, { encode: true })
 
           if options[:scheme] == 'http'
             uri.to_s.gsub('https:', 'http:')

data/lib/fog/azurerm/requests/storage/get_container_url.rb

@@ -11,7 +11,7 @@ module Fog
         #
         def get_container_url(container_name, options = {})
           query = { 'comp' => 'list', 'restype' => 'container' }
-          uri = @blob_client.generate_uri(container_name, query)
+          uri = @blob_client.generate_uri(container_name, query, { encode: true })
 
           if options[:scheme] == 'http'
             uri.to_s.gsub('https:', 'http:')

data/lib/fog/azurerm/requests/storage/list_blobs.rb

@@ -21,7 +21,7 @@ module Fog
               Fog::Logger.debug msg
               temp = @blob_client.list_blobs(container_name, options)
               # Workaround for the issue https://github.com/Azure/azure-storage-ruby/issues/37
-              raise temp unless temp.instance_of?(Azure::Service::EnumerationResults)
+              raise temp unless temp.instance_of?(Azure::Storage::Common::Service::EnumerationResults)
 
               blobs += temp unless temp.empty?
               break if temp.continuation_token.nil? || temp.continuation_token.empty?

data/lib/fog/azurerm/requests/storage/list_containers.rb

@@ -16,7 +16,7 @@ module Fog
               Fog::Logger.debug msg
               temp = @blob_client.list_containers(options)
               # Workaround for the issue https://github.com/Azure/azure-storage-ruby/issues/37
-              raise temp unless temp.instance_of?(Azure::Service::EnumerationResults)
+              raise temp unless temp.instance_of?(Azure::Storage::Common::Service::EnumerationResults)
 
               containers += temp unless temp.empty?
               break if temp.continuation_token.nil? || temp.continuation_token.empty?

data/lib/fog/azurerm/requests/storage/put_blob_https_url.rb

@@ -23,7 +23,7 @@ module Fog
             protocol: 'https'
           }
           token = @signature_client.generate_service_sas_token(relative_path, params)
-          uri = @blob_client.generate_uri(relative_path)
+          uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           "#{uri}?#{token}"
         end
       end

data/lib/fog/azurerm/requests/storage/wait_blob_copy_operation_to_finish.rb

@@ -18,7 +18,7 @@ module Fog
               break if copy_status != COPY_STATUS[:PENDING]
 
               elapse_time = Time.new - start_time
-              raise TimeoutError.new("The copy operation cannot be finished in #{timeout} seconds") if !timeout.nil? && elapse_time >= timeout
+              raise Timeout::Error.new("The copy operation cannot be finished in #{timeout} seconds") if !timeout.nil? && elapse_time >= timeout
 
               copied_bytes, total_bytes = blob_props[:copy_progress].split('/').map(&:to_i)
               interval = copied_bytes.zero? ? 5 : (total_bytes - copied_bytes).to_f / copied_bytes * elapse_time

data/lib/fog/azurerm/storage.rb

@@ -12,6 +12,8 @@ module Fog
       # Recognizes when creating data client
       recognizes :azure_storage_account_name
       recognizes :azure_storage_access_key
+      recognizes :azure_storage_domain
+
       recognizes :debug
 
       request_path 'fog/azurerm/requests/storage'
@@ -55,7 +57,6 @@ module Fog
       request :put_blob_pages
       request :wait_blob_copy_operation_to_finish
       request :save_page_blob
-      request :multipart_save_block_blob
 
       model_path 'fog/azurerm/models/storage'
       model :directory
@@ -67,7 +68,8 @@ module Fog
       class Mock
         def initialize(_options = {})
           begin
-            require 'azure/storage'
+            require 'azure/storage/common'
+            require 'azure/storage/blob'
           rescue LoadError => e
             retry if require('rubygems')
             raise e.message
@@ -79,7 +81,8 @@ module Fog
       class Real
         def initialize(options)
           begin
-            require 'azure/storage'
+            require 'azure/storage/common'
+            require 'azure/storage/blob'
             require 'securerandom'
             @debug = ENV['DEBUG'] || options[:debug]
             require 'azure/core/http/debug_filter' if @debug
@@ -104,15 +107,23 @@ module Fog
 
           @azure_storage_account_name = options[:azure_storage_account_name]
           @azure_storage_access_key = options[:azure_storage_access_key]
+          @azure_storage_domain = options[:azure_storage_domain]
+
+          domain =
+            if @azure_storage_domain.nil? || @azure_storage_domain.empty?
+              get_blob_endpoint(@azure_storage_account_name, true, @environment)
+            else
+              get_blob_endpoint_with_domain(@azure_storage_account_name, true, @azure_storage_domain)
+            end
 
-          azure_client = Azure::Storage::Client.create(storage_account_name: @azure_storage_account_name,
-                                                       storage_access_key: @azure_storage_access_key)
-          azure_client.storage_blob_host = get_blob_endpoint(@azure_storage_account_name, true, @environment)
-          @blob_client = azure_client.blob_client
-          @blob_client.with_filter(Azure::Storage::Core::Filter::ExponentialRetryPolicyFilter.new)
+          azure_client = Azure::Storage::Common::Client.create(storage_account_name: @azure_storage_account_name,
+                                                               storage_access_key: @azure_storage_access_key,
+                                                               storage_blob_host: domain)
+          @blob_client = Azure::Storage::Blob::BlobService.new(client: azure_client)
+          @blob_client.with_filter(Azure::Storage::Common::Core::Filter::ExponentialRetryPolicyFilter.new)
           @blob_client.with_filter(Azure::Core::Http::DebugFilter.new) if @debug
-          @signature_client = Azure::Storage::Core::Auth::SharedAccessSignature.new(@azure_storage_account_name,
-                                                                                    @azure_storage_access_key)
+          @signature_client = Azure::Storage::Common::Core::Auth::SharedAccessSignature.new(@azure_storage_account_name,
+                                                                                            @azure_storage_access_key)
         end
       end
     end

data/lib/fog/azurerm/utilities/general.rb

@@ -125,6 +125,11 @@ def get_blob_endpoint(storage_account_name, enable_https = false, environment =
   "#{protocol}://#{storage_account_name}.blob#{storage_endpoint_suffix(environment)}"
 end
 
+def get_blob_endpoint_with_domain(storage_account_name, enable_https = false, domain = 'blob.core.windows.net')
+  protocol = enable_https ? 'https' : 'http'
+  "#{protocol}://#{storage_account_name}.#{domain}"
+end
+
 def current_time
   time = Time.now.to_f.to_s
   time.split(/\W+/).join

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.7.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/rakefile

@@ -1,4 +1,6 @@
 require 'rake/testtask'
+require 'bundler/gem_tasks'
+
 task default: :cc_coverage
 task :test do
   ENV['COVERAGE'] = nil

data/test/models/storage/test_file.rb

@@ -76,10 +76,8 @@ class TestFile < Minitest::Test
   def test_save_method_with_large_block_blob_success
     @file.body = 'd' * (32 * 1024 * 1024 + 1) # SINGLE_BLOB_PUT_THRESHOLD is 32 * 1024 * 1024
 
-    @service.stub :multipart_save_block_blob, true do
-      @service.stub :get_blob_properties, @raw_cloud_blob do
-        assert @file.save
-      end
+    @service.stub :create_block_blob, @raw_cloud_blob do
+      assert @file.save
     end
   end
 

data/test/requests/storage/test_create_block_blob.rb

@@ -52,15 +52,6 @@ class TestCreateBlockBlob < Minitest::Test
     end
   end
 
-  def test_create_block_blob_exceed_max_body_size
-    data = []
-    data.stub :size, 64 * 1024 * 1024 + 1 do
-      assert_raises(ArgumentError) do
-        @service.create_block_blob('test_container', 'test_blob', data)
-      end
-    end
-  end
-
   def test_create_block_blob_http_exception
     http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
     @blob_client.stub :create_block_blob, http_exception do

data/test/requests/storage/test_get_blob_https_url.rb

@@ -17,7 +17,13 @@ class TestGetBlobHttpsUrl < Minitest::Test
   end
 
   def test_get_blob_https_url_success
-    @blob_client.stub :generate_uri, @url do
+    mock_generate_uri = Minitest::Mock.new
+
+    2.times do
+      mock_generate_uri.expect(:call, @url, ['test_container/test_blob', {}, { encode: true }])
+    end
+
+    @blob_client.stub :generate_uri, mock_generate_uri do
       @signature_client.stub :generate_service_sas_token, @token do
         assert_equal "#{@url}?#{@token}", @service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
         assert_equal "#{@url}?#{@token}", @service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
@@ -25,6 +31,22 @@ class TestGetBlobHttpsUrl < Minitest::Test
     end
   end
 
+  def test_get_blob_https_url_with_domain_success
+    service = Fog::Storage::AzureRM.new(storage_account_credentials_with_domain)
+    blob_client = service.instance_variable_get(:@blob_client)
+    signature_client = service.instance_variable_get(:@signature_client)
+
+    url = 'https://mockaccount.test.example.com/test_container/test_blob'
+    token = ApiStub::Requests::Storage::File.blob_url_token
+
+    blob_client.stub :generate_uri, url do
+      signature_client.stub :generate_service_sas_token, token do
+        assert_equal "#{url}?#{token}", service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+        assert_equal "#{url}?#{token}", service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
+      end
+    end
+  end
+
   def test_get_blob_https_url_mock
     assert_equal "#{@url}?#{@token}", @mock_service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
     assert_equal "#{@url}?#{@token}", @mock_service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)

data/test/requests/storage/test_get_blob_url.rb

@@ -12,9 +12,14 @@ class TestGetBlobUrl < Minitest::Test
   def test_get_blob_url_success
     service = Fog::Storage::AzureRM.new(storage_account_credentials)
     blob_client = service.instance_variable_get(:@blob_client)
+
+    mock_generate_uri = Minitest::Mock.new
     url = ApiStub::Requests::Storage::File.blob_https_url
+    2.times do
+      mock_generate_uri.expect(:call, url, ['test_container/test_blob', {}, { encode: true }])
+    end
 
-    blob_client.stub :generate_uri, url do
+    blob_client.stub :generate_uri, mock_generate_uri do
       assert_equal url, service.get_blob_url('test_container', 'test_blob')
 
       options = { scheme: 'http' }

data/test/requests/storage/test_list_blobs.rb

@@ -13,11 +13,11 @@ class TestListBlobs < Minitest::Test
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_list = ApiStub::Requests::Storage::File.blob_list
-    @blobs1 = Azure::Service::EnumerationResults.new
+    @blobs1 = Azure::Storage::Common::Service::EnumerationResults.new
     @blobs1.continuation_token = 'marker'
     @blobs1.push(@blob_list[0])
     @blobs1.push(@blob_list[1])
-    @blobs2 = Azure::Service::EnumerationResults.new
+    @blobs2 = Azure::Storage::Common::Service::EnumerationResults.new
     @blobs2.push(@blob_list[2])
     @blobs2.push(@blob_list[3])
   end

data/test/requests/storage/test_list_containers.rb

@@ -13,11 +13,11 @@ class TestListContainers < Minitest::Test
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @containers = ApiStub::Requests::Storage::Directory.container_list
-    @containers1 = Azure::Service::EnumerationResults.new
+    @containers1 = Azure::Storage::Common::Service::EnumerationResults.new
     @containers1.continuation_token = 'marker'
     @containers1.push(@containers[0])
     @containers1.push(@containers[1])
-    @containers2 = Azure::Service::EnumerationResults.new
+    @containers2 = Azure::Storage::Common::Service::EnumerationResults.new
     @containers2.push(@containers[2])
   end
 

data/test/requests/storage/test_wait_blob_copy_operation_to_finish.rb

@@ -106,7 +106,7 @@ class TestWaitBlobCopyOperationToFinish < Minitest::Test
 
     @service.stub :get_blob_properties, multiple_values do
       @service.stub :delete_blob, true do
-        assert_raises(TimeoutError) do
+        assert_raises(Timeout::Error) do
           @service.wait_blob_copy_operation_to_finish('test_container', 'test_blob', copy_id, copy_status, 2)
         end
       end

data/test/test_helper.rb

@@ -36,6 +36,14 @@ def storage_account_credentials
   }
 end
 
+def storage_account_credentials_with_domain
+  storage_account_credentials.merge(
+    {
+      azure_storage_domain: 'test.example.com'
+    }
+  )
+end
+
 # Mock Class for Blob
 class MockBlob
   def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -68,14 +68,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: 0.89.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: 0.89.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -91,19 +91,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: azure-storage
+  name: azure-storage-blob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0.preview
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0.preview
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: azure-storage-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,6 @@ files:
 - lib/fog/azurerm/requests/storage/get_object_url.rb
 - lib/fog/azurerm/requests/storage/list_blobs.rb
 - lib/fog/azurerm/requests/storage/list_containers.rb
-- lib/fog/azurerm/requests/storage/multipart_save_block_blob.rb
 - lib/fog/azurerm/requests/storage/put_blob_block.rb
 - lib/fog/azurerm/requests/storage/put_blob_https_url.rb
 - lib/fog/azurerm/requests/storage/put_blob_metadata.rb
@@ -291,7 +304,6 @@ files:
 - test/requests/storage/test_get_container_url.rb
 - test/requests/storage/test_list_blobs.rb
 - test/requests/storage/test_list_containers.rb
-- test/requests/storage/test_multipart_save_block_blob.rb
 - test/requests/storage/test_put_blob_block.rb
 - test/requests/storage/test_put_blob_https_url.rb
 - test/requests/storage/test_put_blob_metadata.rb
@@ -326,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Blob Storage with CarrierWave and

data/lib/fog/azurerm/requests/storage/multipart_save_block_blob.rb

@@ -1,110 +0,0 @@
-module Fog
-  module Storage
-    class AzureRM
-      # This class provides the actual implementation for service calls.
-      class Real
-        # This class is used to store chunk data for block blob before uploading.
-        class BlockChunk
-          attr_reader :id # For debug
-          attr_reader :block_id
-          attr_reader :data
-
-          def initialize(id, block_id, data)
-            @id = id
-            @block_id = block_id
-            @data = data
-          end
-        end
-
-        # This class is a stream to read chunk data.
-        class BlockFileStream
-          attr_reader :blocks
-
-          def initialize(body)
-            if body.respond_to?(:read)
-              if body.respond_to?(:rewind)
-                begin
-                  body.rewind
-                rescue => ex
-                  Fog::Logger.debug "multipart_save_block_blob - body responds to :rewind but throws an exception when calling :rewind: #{ex.inspect}"
-                end
-              end
-              @stream = body
-            else
-              @stream = StringIO.new(body)
-            end
-            @mutex = Mutex.new
-            @blocks = []
-          end
-
-          def read(size)
-            block_id = Base64.strict_encode64(random_string(32))
-            data = nil
-            id = 0
-            @mutex.synchronize do
-              data = @stream.read(size)
-              return nil if data.nil?
-              @blocks << [block_id]
-              id = @blocks.size
-            end
-            BlockChunk.new(id, block_id, data)
-          end
-        end
-
-        def multipart_save_block_blob(container_name, blob_name, body, options)
-          threads_num = options.delete(:worker_thread_num)
-          threads_num = UPLOAD_BLOB_WORKER_THREAD_COUNT if threads_num.nil? || !threads_num.is_a?(Integer) || threads_num < 1
-
-          begin
-            # Initiate the upload
-            Fog::Logger.debug "Creating the block blob #{container_name}/#{blob_name}. options: #{options}"
-            content_md5 = options.delete(:content_md5)
-            create_block_blob(container_name, blob_name, nil, options)
-
-            # Uploading parts
-            Fog::Logger.debug "Starting to upload parts for the block blob #{container_name}/#{blob_name}."
-            iostream = BlockFileStream.new(body)
-
-            threads = []
-            threads_num.times do |id|
-              thread = Thread.new do
-                Fog::Logger.debug "Created upload thread #{id}."
-                while (chunk = iostream.read(MAXIMUM_CHUNK_SIZE))
-                  Fog::Logger.debug "Upload thread #{id} is uploading #{chunk.id}, size: #{chunk.data.size}, options: #{options}."
-                  put_blob_block(container_name, blob_name, chunk.block_id, chunk.data, options)
-                end
-                Fog::Logger.debug "Upload thread #{id} finished."
-              end
-              thread.abort_on_exception = true
-              threads << thread
-            end
-
-            threads.each(&:join)
-            # Complete the upload
-            options[:content_md5] = content_md5 unless content_md5.nil?
-            Fog::Logger.debug "Commiting the block blob #{container_name}/#{blob_name}. options: #{options}"
-            commit_blob_blocks(container_name, blob_name, iostream.blocks, options)
-          rescue
-            # Abort the upload & reraise
-            begin
-              delete_blob(container_name, blob_name)
-            rescue => ex
-              Fog::Logger.debug "Cannot delete the blob: #{container_name}/#{blob_name} after multipart_save_block_blob failed. #{ex.inspect}"
-            end
-            raise
-          end
-
-          Fog::Logger.debug "Successfully save the block blob: #{container_name}/#{blob_name}."
-          true
-        end
-      end
-
-      # This class provides the mock implementation for unit tests.
-      class Mock
-        def multipart_save_block_blob(*)
-          true
-        end
-      end
-    end
-  end
-end

data/test/requests/storage/test_multipart_save_block_blob.rb

@@ -1,105 +0,0 @@
-require File.expand_path '../../test_helper', __dir__
-
-# Storage Blob Class
-class TestMultipartSaveBlockBlob < Minitest::Test
-  # This class posesses the test cases for the requests of saving storage block blob with multiple parts.
-  def setup
-    Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
-    Fog.unmock!
-    @mocked_response = mocked_storage_http_error
-
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
-  end
-
-  def test_multipart_save_block_blob_success
-    body = 'd' * 5 * 1024 * 1024 # MAXIMUM_CHUNK_SIZE is 4 * 1024 * 1024
-
-    @service.stub :create_block_blob, true do
-      @service.stub :put_blob_block, true do
-        @service.stub :commit_blob_blocks, true do
-          assert @service.multipart_save_block_blob('test_container', 'test_blob', body, worker_thread_num: 6, content_md5: 'oafL1+HS78x65+e39PGIIg==')
-        end
-      end
-    end
-  end
-
-  def test_multipart_save_block_blob_with_file_handle_success
-    i = 0
-    multiple_values = lambda do |*|
-      i += 1
-      return 'd' * 4 * 1024 * 1024 if i == 1
-      return 'd' * (1 * 1024 * 1024 + 1) if i == 2
-      return nil
-    end
-    temp_file = '/dev/null'
-    File.open(temp_file, 'r') do |file_handle|
-      file_handle.stub :read, multiple_values do
-        file_handle.stub :rewind, nil do
-          @service.stub :create_block_blob, @raw_cloud_blob do
-            @service.stub :put_blob_block, true do
-              @service.stub :commit_blob_blocks, true do
-                assert @service.multipart_save_block_blob('test_container', 'test_blob', file_handle, worker_thread_num: 0)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def test_multipart_save_block_blob_with_file_handle_do_not_support_rewind_success
-    i = 0
-    multiple_values = lambda do |*|
-      i += 1
-      return 'd' * 4 * 1024 * 1024 if i == 1
-      return 'd' * (1 * 1024 * 1024 + 1) if i == 2
-      return nil
-    end
-    temp_file = '/dev/null'
-    exception = ->(*) { raise 'do not support rewind' }
-    File.open(temp_file, 'r') do |file_handle|
-      file_handle.stub :read, multiple_values do
-        file_handle.stub :rewind, exception do
-          @service.stub :create_block_blob, @raw_cloud_blob do
-            @service.stub :put_blob_block, true do
-              @service.stub :commit_blob_blocks, true do
-                assert @service.multipart_save_block_blob('test_container', 'test_blob', file_handle, worker_thread_num: 'invalid')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def test_multipart_save_block_blob_http_exception
-    body = 'd' * 5 * 1024 * 1024 # MAXIMUM_CHUNK_SIZE is 4 * 1024 * 1024
-
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_block_blob, http_exception do
-      @service.stub :delete_blob, true do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.multipart_save_block_blob('test_container', 'test_blob', body, {})
-        end
-      end
-    end
-  end
-
-  def test_multipart_save_block_blob_fail_when_delete_blob_http_exception
-    body = 'd' * 5 * 1024 * 1024 # MAXIMUM_CHUNK_SIZE is 4 * 1024 * 1024
-
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_block_blob, http_exception do
-      @service.stub :delete_blob, http_exception do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.multipart_save_block_blob('test_container', 'test_blob', body, {})
-        end
-      end
-    end
-  end
-
-  def test_multipart_save_block_blob_mock
-    assert @mock_service.multipart_save_block_blob('test_container', 'test_blob', 'content', {})
-  end
-end