gitlab-fog-azure-rm 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b58d858add0fa6eb3a7cd2e748232d32506f5d1c1c5ec91dc333137938804c8
-  data.tar.gz: 6863876c31c86b6d8e7eae3a03fb0ced679678ffd515e508e5f854379b878019
+  metadata.gz: 177b1f767e814e126cce9905dc11bd5b4384daaafb7292ae379a9f05c435b4ea
+  data.tar.gz: 19d21cd53ffd3a246e195009c4f709df9e4e955ae5c2dace73e4436f82f5ac4d
 SHA512:
-  metadata.gz: 47e8d612e9b2144f46badfc86f7df85a8b39fc35e6b95134a94a5b79cb43786286a0e565a5fbb52e9da9d2eec0510203fe1bb0e5b769b0d32bd74313991b4a6b
-  data.tar.gz: ff4911539b4736ad2dc4d1cd3d541904cf75ac2695c65e2317077cd9200b1aedcac35a3b39e30a2d456d35e8c8b8b6b4d6c6d88d64c63ba9577c9297bd1f270f
+  metadata.gz: aa5d061efb46aee21a8c74d949f7ba5c1632019ccda79799cfe70775f40b6a3448d0f4c01fc12b0c82863419c74a673a68992ca9582317a1df45c42d3ffd5dad
+  data.tar.gz: 8d45eb802da36f53c8aa7a67a49f609de9e39be351af967237166da94c52bda5e474cbb7633200f18bc9386341591d8880df9cda8cd7e5a055beb6f0ad09e13c

data/.rubocop_todo.yml

@@ -43,7 +43,6 @@ Layout/EndOfLine:
 Layout/HashAlignment:
   Exclude:
     - 'lib/fog/azurerm/models/storage/file.rb'
-    - 'lib/fog/azurerm/requests/storage/create_disk.rb'
     - 'test/test_helper.rb'
 
 # Offense count: 1
@@ -133,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'
 
@@ -227,7 +225,6 @@ Style/RescueStandardError:
   Exclude:
     - 'lib/fog/azurerm/models/storage/files.rb'
     - 'lib/fog/azurerm/requests/storage/create_block_blob.rb'
-    - 'lib/fog/azurerm/requests/storage/create_disk.rb'
     - 'lib/fog/azurerm/requests/storage/multipart_save_block_blob.rb'
     - 'lib/fog/azurerm/requests/storage/save_page_blob.rb'
     - 'lib/fog/azurerm/requests/storage/wait_blob_copy_operation_to_finish.rb'

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## Unreleased
+
+## 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

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.post_install_message = 'Thanks for installing!'
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
   spec.add_development_dependency 'minitest', '~> 5.8.4'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.89'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 0.89.1'
   spec.add_development_dependency 'simplecov'
-  spec.add_dependency 'azure_mgmt_storage', '~> 0.21'
-  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', '~> 3.2.2'
-  spec.add_dependency 'vhd', '0.0.4'
+  spec.add_dependency 'mime-types'
+  spec.add_dependency 'ms_rest_azure', '~> 0.12.0'
 end

data/lib/fog/azurerm/docs/storage.md

@@ -12,32 +12,6 @@ require 'fog/azurerm'
 
 ## Create Connection
 
-Next, create a connection to the Storage Service:
-
-```ruby
-fog_storage_service = Fog::Storage::AzureRM.new(
-  tenant_id: '<Tenant Id>',                                                          # Tenant Id of Azure Active Directory Application
-  client_id:    '<Client Id>',                                                       # Client Id of Azure Active Directory Application
-  client_secret: '<Client Secret>',                                                  # Client Secret of Azure Active Directory Application
-  subscription_id: '<Subscription Id>',                                              # Subscription Id of an Azure Account
-  azure_storage_account_name: '<Storage Account Name>',                              # Name of an Azure Storage Account
-  azure_storage_access_key: '<Storage Account Key>',                                 # Key of an Azure Storage Account
-  environment: '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'     # Azure cloud environment. Default is AzureCloud.
-)
-```
-
-If you only want to manage the storage accounts, you can create the connection without the storage account information:
-
-```ruby
-fog_storage_service = Fog::Storage::AzureRM.new(
-  tenant_id:        '<Tenant Id>',                                                         # Tenant Id of Azure Active Directory Application
-  client_id:        '<Client Id>',                                                         # Client Id of Azure Active Directory Application
-  client_secret:    '<Client Secret>',                                                     # Client Secret of Azure Active Directory Application
-  subscription_id:  '<Subscription Id>',                                                   # Subscription Id of an Azure Account
-  environment:      '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'      # Azure cloud environment. Default is AzureCloud.
-)
-```
-
 If you only want to manage the storage data, you can create the connection without the Azure subscription information:
 
 ```ruby
@@ -48,127 +22,6 @@ fog_storage_service = Fog::Storage::AzureRM.new(
 )
 ```
 
-## Check Name Availability 
-
-This operation checks that account name is valid and is not already in use. _Storage Account Type_ is an optional parameter
-
-```ruby
-fog_storage_service.storage_accounts.check_name_availability('<Storage Account Name>', '<Storage Account Type>')
-```
-
-## Check Storage Account Existence
-
-```ruby
-fog_storage_service.storage_accounts.check_storage_account_exists('<Resource Group Name>', '<Storage Account Name>')
-```
-
-## Create Storage Account
-
-Create a new storage account. Replication attribute for Standard and Premium account types are as follows 
-
-##### Standard 
-
-1. LRS (Standard Locally-redundant storage)
-2. ZRS (Standard Zone-redundant storage)
-3. GRS (Standard Geo-redundant storage)
-4. RAGRS (Standard Read access geo-redundant storage)
-
-##### Premium
-1. LRS (Premium Locally-redundant storage)
-
-```ruby
-fog_storage_service.storage_accounts.create(
-  name:           '<Storage Account name>',
-  location:       '<Location>',
-  resource_group: '<Resource Group Name>',
-  account_type:   '<Standard/Premium>',                                   # [Optional] Default value 'Standard'. Allowed values can only be Standard or Premium
-  replication:    '<Replication Type>',                                    # [Optional] Default value 'LRS'
-  encryption:     <True/False>,                                           # [Optional] Enables encryption. Default is false.
-  tags:           { key1: 'value1', key2: 'value2', keyN: 'valueN' }       # [Optional]
-)
-```
-Premium Storage account store data on solid state drives (SSDs). For more details on standard and premium storage accounts, see [Introduction to Microsoft Azure Storage](https://azure.microsoft.com/en-us/documentation/articles/storage-introduction/) and [Premium Storage: High-Performance Storage for Azure Virtual Machine Workloads](https://azure.microsoft.com/en-us/documentation/articles/storage-premium-storage/).
-
-## List storage accounts
-
-##### List storage accounts in a subscription
-
-```ruby
-fog_storage_service.storage_accounts.each do |storage_acc|
-  puts "#{storage_acc.name}"
-  puts "#{storage_acc.location}"
-end
-```
-##### List storage accounts in a resource group
-
-```ruby
-storage_accounts  = fog_storage_service.storage_accounts(resource_group: '<Resource Group Name>')
-storage_accounts.each do |storage_acc|
-  puts "#{storage_acc.name}"
-  puts "#{storage_acc.location}"
-end
-```
-
-## Retrieve a single Storage Account
-
-Get a single record of Storage Account
-
-```ruby
-storage_acc = fog_storage_service
-                .storage_accounts
-                .get('<Resource Group Name>', '<Storage Account Name>')
-puts "#{storage_acc.name}"
-```
-
-## Enable encryption on Storage Account
-
-Get a single record of Storage Account and enable encryption on that Storage Account
-
-```ruby
-storage_acc = fog_storage_service
-                .storage_accounts
-                .get('<Resource Group Name>', '<Storage Account Name>')
-
-storage_acc.update(encryption: true)
-```
-
-## Get Access Keys
-
-Get access keys of a storage account
-
-```ruby
-keys_hash = storage_acc.get_access_keys
-keys_hash.each do |keys|
-  puts "#{keys.key_name}:  #{keys.value}"
-end
-```
-
-## Destroy a single Storage Account
-
-Get storage account object from the get method and then destroy that storage account.
-
-```ruby
-storage_acc.destroy
-```
-
-## Create a Disk
-
-Create a Disk in storage account. _disk_size_in_gb_ must be an integer and the range is [1, 1023].
-By default the disk will be created in the container 'vhds'. You can specify other container by set options[:container_name].
-
-```ruby
-fog_storage_service.create_disk('<Data Disk Name>', disk_size_in_gb, options = {})
-```
-
-## Delete a Disk
-
-Delete a Disk from a storage account. Disk must be in unlocked state i.e detached from server (virtual machine) to successfully perform this action.
-By default the disk will be deleted from the container 'vhds'. You can specify other container by set options[:container_name].
-
-```ruby
-fog_storage_service.delete_disk('<Data Disk Name>', options = {})
-```
-
 ## Check Storage Container Existence
 
 ```ruby

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/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/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,12 +12,11 @@ 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'
-      # Azure Storage Disk requests
-      request :delete_disk
-      request :create_disk
       # Azure Storage Container requests
       request :create_container
       request :release_container_lease
@@ -58,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
@@ -70,8 +68,8 @@ module Fog
       class Mock
         def initialize(_options = {})
           begin
-            require 'azure_mgmt_storage'
-            require 'azure/storage'
+            require 'azure/storage/common'
+            require 'azure/storage/blob'
           rescue LoadError => e
             retry if require('rubygems')
             raise e.message
@@ -83,10 +81,9 @@ module Fog
       class Real
         def initialize(options)
           begin
-            require 'azure_mgmt_storage'
-            require 'azure/storage'
+            require 'azure/storage/common'
+            require 'azure/storage/blob'
             require 'securerandom'
-            require 'vhd'
             @debug = ENV['DEBUG'] || options[:debug]
             require 'azure/core/http/debug_filter' if @debug
           rescue LoadError => e
@@ -110,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.6.0'.freeze
+    VERSION = '1.0.0'.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

@@ -25,6 +25,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_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.6.0
+  version: 1.0.0
 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: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -54,28 +54,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     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,33 +91,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: azure_mgmt_storage
+  name: azure-storage-blob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: azure-storage
+  name: azure-storage-common
   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: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -150,30 +150,30 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: vhd
+  name: ms_rest_azure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.12.0
 description: This is a stripped-down fork of fog-azure-rm that enables Azure Blob
   Storage to be used with CarrierWave and Fog.
 email: 
@@ -233,12 +233,10 @@ files:
 - lib/fog/azurerm/requests/storage/copy_object.rb
 - lib/fog/azurerm/requests/storage/create_block_blob.rb
 - lib/fog/azurerm/requests/storage/create_container.rb
-- lib/fog/azurerm/requests/storage/create_disk.rb
 - lib/fog/azurerm/requests/storage/create_page_blob.rb
 - lib/fog/azurerm/requests/storage/delete_blob.rb
 - lib/fog/azurerm/requests/storage/delete_blob_https_url.rb
 - lib/fog/azurerm/requests/storage/delete_container.rb
-- lib/fog/azurerm/requests/storage/delete_disk.rb
 - lib/fog/azurerm/requests/storage/delete_object_url.rb
 - lib/fog/azurerm/requests/storage/get_blob.rb
 - lib/fog/azurerm/requests/storage/get_blob_http_url.rb
@@ -251,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
@@ -293,12 +290,10 @@ files:
 - test/requests/storage/test_copy_blob_from_uri.rb
 - test/requests/storage/test_create_block_blob.rb
 - test/requests/storage/test_create_container.rb
-- test/requests/storage/test_create_disk.rb
 - test/requests/storage/test_create_page_blob.rb
 - test/requests/storage/test_delete_blob.rb
 - test/requests/storage/test_delete_blob_https_url.rb
 - test/requests/storage/test_delete_container.rb
-- test/requests/storage/test_delete_disk.rb
 - test/requests/storage/test_get_blob.rb
 - test/requests/storage/test_get_blob_http_url.rb
 - test/requests/storage/test_get_blob_https_url.rb
@@ -309,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

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

@@ -1,62 +0,0 @@
-module Fog
-  module Storage
-    class AzureRM
-      # This class provides the actual implementation for service calls.
-      class Real
-        # Create a disk in Azure storage.
-        #
-        # @param disk_name [String] Name of disk
-        # @param disk_size_in_gb [Integer] Disk size in GiB. Value range: [1, 1023]
-        # @param options  [Hash]
-        # @option options [String] container_name Sets name of the container which contains the disk. Default is 'vhds'.
-        #
-        # @return [Boolean]
-        #
-        def create_disk(disk_name, disk_size_in_gb, options = {})
-          msg = "Creating disk(#{disk_name}, #{disk_size_in_gb}). options: #{options}"
-          Fog::Logger.debug msg
-
-          raise ArgumentError, "disk_size_in_gb #{disk_size_in_gb} must be an integer" unless disk_size_in_gb.is_a?(Integer)
-          raise ArgumentError, "Azure minimum disk size is 1 GiB: #{disk_size_in_gb}" if disk_size_in_gb < 1
-          raise ArgumentError, "Azure maximum disk size is 1023 GiB: #{disk_size_in_gb}" if disk_size_in_gb > 1023
-
-          container_name = options.delete(:container_name)
-          container_name = 'vhds' if container_name.nil?
-          blob_name = "#{disk_name}.vhd"
-          vhd_size = disk_size_in_gb * 1024 * 1024 * 1024
-          blob_size = vhd_size + 512
-
-          opts = {
-            type:   :fixed,
-            name: '/tmp/footer.vhd', # Only used to initialize vhd, no local file is generated.
-            size: disk_size_in_gb
-          }
-          vhd_footer = Vhd::Library.new(opts).footer.values.join
-
-          begin
-            create_page_blob(container_name, blob_name, blob_size, options)
-            put_blob_pages(container_name, blob_name, vhd_size, blob_size - 1, vhd_footer, options)
-          rescue
-            begin
-              delete_blob(container_name, blob_name)
-            rescue => ex
-              Fog::Logger.debug "Cannot delete the blob: #{container_name}/#{blob_name} after create_disk failed. #{ex.inspect}"
-            end
-            raise
-          end
-
-          Fog::Logger.debug "Created a disk #{disk_name} successfully."
-          true
-        end
-      end
-
-      # This class provides the mock implementation for unit tests.
-      class Mock
-        def create_disk(*)
-          Fog::Logger.debug 'Disk created successfully.'
-          true
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module Fog
-  module Storage
-    class AzureRM
-      # This class provides the actual implementation for service calls.
-      class Real
-        # Delete a disk in Azure storage.
-        #
-        # @param disk_name [String] Name of disk
-        # @param options  [Hash]
-        # @option options [String] container_name Sets name of the container which contains the disk. Default is 'vhds'.
-        #
-        # @return [Boolean]
-        #
-        def delete_disk(disk_name, options = {})
-          msg = "Deleting disk(#{disk_name}). options: #{options}"
-          Fog::Logger.debug msg
-
-          container_name = options.delete(:container_name)
-          container_name = 'vhds' if container_name.nil?
-          delete_blob(container_name, "#{disk_name}.vhd")
-
-          Fog::Logger.debug "Successfully deleted Disk: #{disk_name}."
-          true
-        end
-      end
-
-      # This class provides the mock implementation for unit tests.
-      class Mock
-        def delete_disk(*)
-          Fog::Logger.debug 'Successfully deleted Disk'
-          true
-        end
-      end
-    end
-  end
-end

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_create_disk.rb

@@ -1,70 +0,0 @@
-require File.expand_path '../../test_helper', __dir__
-
-# Storage Data Disk Class
-class TestCreateDisk < Minitest::Test
-  # This class posesses the test cases for the request of create disk.
-  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_create_disk_success
-    @service.stub :create_page_blob, true do
-      @service.stub :put_blob_pages, true do
-        assert @service.create_disk('test_disk', 10)
-      end
-    end
-  end
-
-  def test_create_disk_in_another_container_success
-    @service.stub :create_page_blob, true do
-      @service.stub :put_blob_pages, true do
-        assert @service.create_disk('test_disk', 10, container_name: 'test_container')
-      end
-    end
-  end
-
-  def test_create_disk_with_invalid_size_exception
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 'invalid_size')
-    end
-
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 0)
-    end
-
-    assert_raises(ArgumentError) do
-      @service.create_disk('test_disk', 1024)
-    end
-  end
-
-  def test_create_disk_http_exception
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_page_blob, http_exception do
-      @service.stub :delete_blob, true do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.create_disk('test_disk', 10, container_name: 'test_container')
-        end
-      end
-    end
-  end
-
-  def test_create_disk_fail_when_delete_blob_http_exception
-    http_exception = ->(*) { raise Azure::Core::Http::HTTPError.new(@mocked_response) }
-    @service.stub :create_page_blob, http_exception do
-      @service.stub :delete_blob, http_exception do
-        assert_raises(Azure::Core::Http::HTTPError) do
-          @service.create_disk('test_disk', 10, container_name: 'test_container')
-        end
-      end
-    end
-  end
-
-  def test_create_disk_mock
-    assert @mock_service.create_disk('test_disk')
-  end
-end

data/test/requests/storage/test_delete_disk.rb

@@ -1,30 +0,0 @@
-require File.expand_path '../../test_helper', __dir__
-
-# Storage Data Disk Class
-class TestDeleteDisk < Minitest::Test
-  # This class posesses the test cases for the requests of deleting data disks.
-  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_delete_disk_success
-    @service.stub :delete_blob, true do
-      assert @service.delete_disk('test_disk')
-    end
-  end
-
-  def test_delete_disk_in_another_container_success
-    @service.stub :delete_blob, true do
-      assert @service.delete_disk('test_disk', container_name: 'test_container')
-    end
-  end
-
-  def test_delete_disk_mock
-    assert @mock_service.delete_disk('test_disk')
-  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