gitlab-fog-azure-rm 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82709fd688ebf33b9e680ace0a171e5d09e42bb915ce67d168987ee856d51486
-  data.tar.gz: c839a59a45628c372f99de77e434fd9b89b461c13d9f355519203c335a42abf9
+  metadata.gz: 9a3e5613e808f27ef9bcd2be6015eac3ffc43e55fe558b2c78b30b97164c3f78
+  data.tar.gz: d64eb6be36585d864bb5bb7fdcafdd5191a7bda376a4f84edc7e82c9bd972554
 SHA512:
-  metadata.gz: 881d85e23de95f1103ae67d789ef81fe9c0012e958bc807ca61e8cfdc045b45a7cc7ee4b8bae65187eb26cd17b5b05e4637d77b907f68f13ad108953ec8bcde7
-  data.tar.gz: e56e63c86e6f8f10f809dbe2b43dae36829f4b648bd0ad163ad3172f4d56ad06c26553aa0388f5707c05451fe887fac512b689bb630d0ef10cd7f8a16fa92976
+  metadata.gz: b5b884c2fc10a00a1c385522f2138492427ab50162df609fdfe1398f380c42184bb8a99bf8eae0fd50ff77521796f5371fd40b3222114a5f794368555c8408c7
+  data.tar.gz: c1a11715408b8c7eb825915e0ecf1dbfb584f831c85dcbb711973f1b2e22ac54de07f3bbbaf59273c525abe9fa6919385fed04c7e85de400ca727d5bbe19c7b2

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 ## Unreleased
 
+## 0.9.0
+
+- Fix TimeoutError deprecation !17
+- Update Azure storage libraries !16
+
 ## 0.8.1
 
-- Fix `azure_storage_domain` not getting propagated properly
+- Fix `azure_storage_domain` not getting propagated properly !14
 
 ## 0.8.0
 
-- Add `azure_storage_domain` for specifying custom domain
+- Add `azure_storage_domain` for specifying custom domain !11
 
 ## 0.7.0
 

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/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

@@ -69,7 +69,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
@@ -81,7 +82,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
@@ -115,14 +117,14 @@ module Fog
               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,
-                                                       storage_blob_host: domain)
-          @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/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-06 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