gitlab-fog-azure-rm 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e159dfc8b3cace029e335019a550572fd139b03621711088ef223f87989b0b97
-  data.tar.gz: aaebbcfd822283723b45ebb2db3a1588a67ca90b26cd1ddc319630f21131338d
+  metadata.gz: dee64342b22c3eb8a2a9ef9798f78a2b29ca94754f8cd5989cdd54f85e02fa2e
+  data.tar.gz: fca636a203da2fb799fca4b3a9728a70c79c064d4501af0e9ab161e3b0d2f220
 SHA512:
-  metadata.gz: 28dd5cd1ed31cad829892047887b48790f78370fa2b2e56fd5f5aa57140347cb7f31db8fc03d37552ffdfe0bcda6a6a219541b713d9b286c7d0a833934785ebe
-  data.tar.gz: 7604dd353e7d0345943e4d90bdc77184ca293deb605d1d3682a293107ae55c38026cde9e88f5ddee3c60c709046dd742a5d08864b8b601fa7609a33d8c807e55
+  metadata.gz: e67e3cd13e9e244e49048b173d07b979a582da5c1fe371740e0609baecb47caf87d4f02886d1951ce108fe392f9d0520178540e3b7aeb96f4a00f18da0b50571
+  data.tar.gz: 21c78c8d3407104297f2ed6d9cbf841188d2d87e03f10c35a6bd3fae67baee3cfd7661d5c69251bc1a3b6d01b7a2add98cbbed0bd6d67910fcfae489a6ac28b4

data/.gitlab-ci.yml

@@ -1,3 +1,6 @@
+include:
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
+
 default:
   image: "ruby:${RUBY_VERSION}"
 
@@ -21,3 +24,12 @@ rubocop:
     - bundle exec rubocop
   variables:
     RUBY_VERSION: "2.7"
+
+integration:
+  services:
+    - alias: azurite
+      name: mcr.microsoft.com/azure-storage/azurite
+  script:
+    - bundle exec rake integration
+  variables:
+    RUBY_VERSION: "3.2"

data/.rubocop_todo.yml

@@ -86,7 +86,7 @@ Lint/Void:
 # Offense count: 30
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 63
+  Max: 66
 
 # Offense count: 11
 # Configuration parameters: CountComments, CountAsOne.

data/gitlab-fog-azure-rm.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.89.1'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webrick', '~> 1.8'
   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 'fog-core', '~> 2.1'
+  spec.add_dependency 'fog-json', '~> 1.2'
   spec.add_dependency 'mime-types'
 end

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

@@ -15,7 +15,7 @@ require 'fog/azurerm'
 If you only want to manage the storage data, you can create the connection without the Azure subscription information:
 
 ```ruby
-fog_storage_service = Fog::Storage::AzureRM.new(
+fog_storage_service = Fog::AzureRM::Storage.new(
   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.

data/lib/fog/azurerm/identity_encoding_filter.rb

@@ -0,0 +1,12 @@
+module Fog
+  module AzureRM
+    # This filter prevents Net::HTTP from inflating compressed response bodies
+    class IdentityEncodingFilter
+      def call(request, next_filter)
+        request.headers['Accept-Encoding'] ||= 'identity'
+
+        next_filter.call
+      end
+    end
+  end
+end

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

@@ -1,15 +1,15 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of listing containers.
       class Directories < Fog::Collection
         include Fog::AzureRM::Utilities::General
 
-        model Fog::Storage::AzureRM::Directory
+        model Fog::AzureRM::Storage::Directory
 
         # List all directories(containers) in the storage account.
         #
-        # @return [Fog::Storage::AzureRM::Directories]
+        # @return [Fog::AzureRM::Storage::Directories]
         #
         def all
           containers = service.list_containers
@@ -35,7 +35,7 @@ module Fog
         # @option options [String]  marker      Sets the identifier that specifies the portion of the list to be returned.
         # @option options [String]  prefix      Sets filters the results to return only files whose name begins with the specified prefix.
         #
-        # @return [Fog::Storage::AzureRM::Directory] A directory. Return nil if the directory does not exist.
+        # @return [Fog::AzureRM::Storage::Directory] A directory. Return nil if the directory does not exist.
         #
         def get(identity, options = {})
           remap_attributes(options, max_keys: :max_results)
@@ -64,7 +64,7 @@ module Fog
         end
 
         def delete_temporary_container(storage_account_name, access_key, container_name)
-          storage_data = Fog::Storage::AzureRM.new(azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+          storage_data = Fog::AzureRM::Storage.new(azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
           storage_data.delete_container(container_name)
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of create and delete a container.
       class Directory < Fog::Model
         VALID_ACLS = ['container', 'blob', 'unknown', nil].freeze
@@ -73,10 +73,10 @@ module Fog
         # If you have set max_results or max_keys when getting this directory by directories.get,
         # files may be incomplete. You need to use files.all to get all files under this directory.
         #
-        # @return [Fog::Storage::AzureRM::Files] Files.
+        # @return [Fog::AzureRM::Storage::Files] Files.
         #
         def files
-          @files ||= Fog::Storage::AzureRM::Files.new(directory: self, service: service)
+          @files ||= Fog::AzureRM::Storage::Files.new(directory: self, service: service)
         end
 
         # Set the container permission to public or private

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

@@ -1,8 +1,8 @@
 require 'mime/types'
 
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of create/save and
       # delete/destroy for Blob.
       class File < Fog::Model
@@ -149,7 +149,7 @@ module Fog
         # @param options              [Hash] options for copy_object method
         # @option options [Integer] timeout Sets to raise a TimeoutError if the copy does not finish in timeout seconds.
         #
-        # @return [Fog::Storage::AzureRM::File] New File.
+        # @return [Fog::AzureRM::Storage::File] New File.
         #
         def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
@@ -252,6 +252,9 @@ module Fog
           # as a query string, while Azure needs the content_disposition parameter
           # to generate a SAS token.
           options[:content_disposition] ||= options.dig(:query, 'response-content-disposition')
+          options[:content_type] ||= options.dig(:query, 'response-content-type')
+          options = options.dup
+          options.delete(:query)
           options
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of listing blobs.
       class Files < Fog::Collection
         include Fog::AzureRM::Utilities::General
@@ -12,7 +12,7 @@ module Fog
         attribute :next_marker,     aliases: %w(NextMarker next-marker)
         attribute :prefix,          aliases: 'Prefix'
 
-        model Fog::Storage::AzureRM::File
+        model Fog::AzureRM::Storage::File
 
         # List all files(blobs) under the directory.
         #
@@ -27,7 +27,7 @@ module Fog
         # @option options [String]  marker      Sets the identifier that specifies the portion of the list to be returned.
         # @option options [String]  prefix      Sets filters the results to return only files whose name begins with the specified prefix.
         #
-        # @return [Fog::Storage::AzureRM::Files] Return nil if the directory does not exist.
+        # @return [Fog::AzureRM::Storage::Files] Return nil if the directory does not exist.
         #
         def all(options = {})
           requires :directory
@@ -52,7 +52,7 @@ module Fog
 
         # Enumerate every file under the directory if block_given?
         #
-        # @return [Fog::Storage::AzureRM::Files]
+        # @return [Fog::AzureRM::Storage::Files]
         #
         alias each_file_this_page each
         def each
@@ -77,7 +77,7 @@ module Fog
         # @param options [Hash]
         # @option options [String]  block_size Sets buffer size when block_given? is true. Default is 32 MB
         #
-        # @return [Fog::Storage::AzureRM::File] A file. Return nil if the file does not exist.
+        # @return [Fog::AzureRM::Storage::File] A file. Return nil if the file does not exist.
         #
         def get(key, options = {}, &block)
           requires :directory
@@ -154,7 +154,7 @@ module Fog
         # @param key     [String] Name of file
         # @param options [Hash]
         #
-        # @return [Fog::Storage::AzureRM::File] A file. Return nil if the file does not exist.
+        # @return [Fog::AzureRM::Storage::File] A file. Return nil if the file does not exist.
         #
         def head(key, options = {})
           requires :directory
@@ -172,7 +172,7 @@ module Fog
         #
         #     required attributes: directory
         #
-        # @return [Fog::Storage::AzureRM::File] A file. You need to use File.save to upload this new file.
+        # @return [Fog::AzureRM::Storage::File] A file. You need to use File.save to upload this new file.
         #
         def new(attributes = {})
           requires :directory

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of create/save and
       # delete/destroy for storage account.
       class StorageAccount < Fog::Model
@@ -35,7 +35,7 @@ module Fog
           self.replication = ALLOWED_STANDARD_REPLICATION.first if replication.nil?
           validate_sku_name!
           storage_account = service.create_storage_account(storage_account_params)
-          merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
+          merge_attributes(Fog::AzureRM::Storage::StorageAccount.parse(storage_account))
         end
 
         def storage_account_params
@@ -55,7 +55,7 @@ module Fog
           storage_account_params = merge_attributes(storage_account_params).all_attributes
 
           storage_account = service.update_storage_account(storage_account_params)
-          merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
+          merge_attributes(Fog::AzureRM::Storage::StorageAccount.parse(storage_account))
         end
 
         def validate_sku_name!

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

@@ -1,10 +1,10 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class is giving implementation of all/list, get and
       # check name availability for storage account.
       class StorageAccounts < Fog::Collection
-        model Fog::Storage::AzureRM::StorageAccount
+        model Fog::AzureRM::Storage::StorageAccount
         attribute :resource_group
 
         def all
@@ -16,15 +16,15 @@ module Fog
             hash_of_storage_accounts = service.list_storage_accounts
           end
           hash_of_storage_accounts.each do |account|
-            accounts << Fog::Storage::AzureRM::StorageAccount.parse(account)
+            accounts << Fog::AzureRM::Storage::StorageAccount.parse(account)
           end
           load(accounts)
         end
 
         def get(resource_group_name, storage_account_name)
           storage_account = service.get_storage_account(resource_group_name, storage_account_name)
-          storage_account_fog = Fog::Storage::AzureRM::StorageAccount.new(service: service)
-          storage_account_fog.merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
+          storage_account_fog = Fog::AzureRM::Storage::StorageAccount.new(service: service)
+          storage_account_fog.merge_attributes(Fog::AzureRM::Storage::StorageAccount.parse(storage_account))
         end
 
         def check_name_availability(name, type = 'Microsoft.Storage/storageAccounts')

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def acquire_blob_lease(container_name, name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def acquire_container_lease(name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def check_container_exists(name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def commit_blob_blocks(container_name, blob_name, blocks, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def compare_container_blobs(container1, container2)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def copy_blob(destination_container, destination_blob, source_container, source_blob, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def copy_blob_from_uri(destination_container, destination_blob, source_blob_uri, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       # This is to make this library compatible with CarrierWave.
       class Real

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def create_block_blob(container_name, blob_name, body, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def create_container(name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def create_page_blob(container_name, blob_name, blob_size, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def delete_blob(container_name, blob_name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get a pre-signed URL to delete an object in Azure blob storage
@@ -22,7 +22,7 @@ module Fog
             expiry: expires.utc.iso8601,
             protocol: 'https'
           }
-          token = @signature_client.generate_service_sas_token(relative_path, params)
+          token = signature_client(expires).generate_service_sas_token(relative_path, params)
           uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           "#{uri}?#{token}"
         end
@@ -31,7 +31,7 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def delete_blob_https_url(*)
-          'https://sa.blob.core.windows.net/test_container/test_blob?token'
+          'https://mockaccount.blob.core.windows.net/test_container/test_blob?token'
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def delete_container(name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         alias delete_object delete_blob

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get a pre-signed URL to delete an object in Azure blob storage

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         BLOCK_SIZE = 32 * 1024 * 1024 # 32 MB

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get an expiring http blob url from Azure blob storage
@@ -23,17 +23,17 @@ module Fog
             expiry: expires.utc.iso8601,
             content_disposition: options[:content_disposition]
           }
-          token = @signature_client.generate_service_sas_token(relative_path, params)
+          token = signature_client(expires).generate_service_sas_token(relative_path, params)
           uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           url = "#{uri}?#{token}"
-          url.gsub('https:', 'http:')
+          url.sub('https:', 'http:')
         end
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
         def get_blob_http_url(*)
-          'http://sa.blob.core.windows.net/test_container/test_blob?token'
+          'http://mockaccount.blob.core.windows.net/test_container/test_blob?token'
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get an expiring https blob url from Azure blob storage
@@ -22,9 +22,10 @@ module Fog
             permissions: 'r',
             expiry: expires.utc.iso8601,
             protocol: 'https',
-            content_disposition: options[:content_disposition]
+            content_disposition: options[:content_disposition],
+            content_type: options[:content_type]
           }
-          token = @signature_client.generate_service_sas_token(relative_path, params)
+          token = signature_client(expires).generate_service_sas_token(relative_path, params)
           uri = @blob_client.generate_uri(relative_path, {}, { encode: true })
           "#{uri}?#{token}"
         end
@@ -33,7 +34,7 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def get_blob_https_url(*)
-          'https://sa.blob.core.windows.net/test_container/test_blob?token'
+          'https://mockaccount.blob.core.windows.net/test_container/test_blob?token'
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def get_blob_properties(container_name, name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get a public blob url from Azure blob storage
@@ -18,8 +18,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def get_blob_url(_container_name, _blob_name, options = {})
-          url = 'https://sa.blob.core.windows.net/test_container/test_blob'
-          url.gsub!('https:', 'http:') if options[:scheme] == 'http'
+          url = 'https://mockaccount.blob.core.windows.net/test_container/test_blob'
+          url.sub!('https:', 'http:') if options[:scheme] == 'http'
           url
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def get_container_acl(container_name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       class Real
         def get_container_properties(name, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get a public container url from Azure storage container
@@ -24,8 +24,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def get_container_url(_container_name, options = {})
-          url = 'https://sa.blob.core.windows.net/test_container?comp=list&restype=container'
-          url.gsub!('https:', 'http:') if options[:scheme] == 'http'
+          url = 'https://mockaccount.blob.core.windows.net/test_container?comp=list&restype=container'
+          url.sub!('https:', 'http:') if options[:scheme] == 'http'
           url
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         def get_object(...)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implemention for service calls.
       class Real
         # Get a public blob url from Azure blob storage

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AzureRM
+  module AzureRM
+    class Storage
       # This class provides the actual implementation for service calls.
       # https://msdn.microsoft.com/en-us/library/azure/dd135734.aspx
       class Real