gitlab-fog-azure-rm 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0e6fc125b778bb49c22a6fbfeb0ab779d99bfffaca5496df1834d2a0f69a86
-  data.tar.gz: 5f9ce8aa7d939260edc6047636e6fdfbebaeae6cd7fd611921aa7cc2a3c36056
+  metadata.gz: 26308fac90191e41fa3a0cfe59f7c02159c5ac5c846c2fc958038d1fbaa9bf34
+  data.tar.gz: 9b382c3381a912f1c847c7757576f467750d9fedfb08304fa47e663fb7f34ad0
 SHA512:
-  metadata.gz: 1578489ca552ed032d47387738f1b8807f467bac75b1d2446fe0ea547ed8b96b81d44c9af7c3134d50da7bb86158e757f8bb18ce4e3e998a9badfb5ce76a55e4
-  data.tar.gz: ff5993b7140d6e3dd0de19d776dd2666980f65a1cb0baeee5abc28ed98eb29a71386108763530f591cb768116493994fbdec1bd877a2c8939c31c6cb85535385
+  metadata.gz: f54b5e063064523fbb79ea1aea50ad6847a20c9ffc47a81ae95d1869d2c487b75b8205b567e7d9cf08d10ac1b0c083661003aef4df3762f81382805d2e950c02
+  data.tar.gz: fa98f14295c821d0d07321adc42080163fc774684a0f8e87611a1921b4a22cbd20d68e3938177840b12f2b96e30d377addd379841161657d704343602de8fcb4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.4.0
+
+-  Move all top-level constants and functions to Fog::AzureRM !30
+
 ## 1.3.0
 
 - Fix Ruby 3.0 compatibility !27

data/lib/fog/azurerm/config.rb

@@ -1 +1,5 @@
-LOCATION = 'eastus'.freeze
+module Fog
+  module AzureRM
+    LOCATION = 'eastus'.freeze
+  end
+end

data/lib/fog/azurerm/constants.rb

@@ -1,72 +1,76 @@
-AZURE_RESOURCE = 'https://management.azure.com'.freeze
-DEFAULT_ADDRESS_PREFIXES = ['10.2.0.0/16'].freeze
-SUBNET = 'Subnet'.freeze
-PUBLIC_IP = 'Public-IP-Address'.freeze
-NETWORK_SECURITY_GROUP = 'Network-Security-Group'.freeze
-STANDARD_STORAGE = 'Standard'.freeze
-PREMIUM_STORAGE = 'Premium'.freeze
-ALLOWED_STANDARD_REPLICATION = %w[LRS ZRS GRS RAGRS].freeze
-API_VERSION = '2016-06-01'.freeze
-FAULT_DOMAIN_COUNT = 2
-UPDATE_DOMAIN_COUNT = 5
-WINDOWS = 'windows'.freeze
-VPN = 'Vpn'.freeze
-MICROSOFT_PEERING = 'MicrosoftPeering'.freeze
-RESOURCE_GROUP_NAME = 4
-RESOURCE_PROVIDER_NAMESPACE = 6
-RESOURCE_TYPE = 7
-RESOURCE_NAME = 8
-ENDPOINT_PREFIX = 'Microsoft.Network/trafficManagerProfiles'.freeze
-DISK_PREFIX = 'Microsoft.Compute/disks'.freeze
-SNAPSHOT_PREFIX = 'Microsoft.Compute/snapshots'.freeze
-AZURE_ENDPOINTS = 'azureEndpoints'.freeze
-EXTERNAL_ENDPOINTS = 'externalEndpoints'.freeze
-NESTED_ENDPOINTS = 'nestedEndpoints'.freeze
-GLOBAL = 'global'.freeze
-UPLOAD_BLOB_WORKER_THREAD_COUNT = 8
-VM_NAME_POSITION = 8
-PRIMARY_NIC_INDEX = 0
+module Fog
+  module AzureRM
+    AZURE_RESOURCE = 'https://management.azure.com'.freeze
+    DEFAULT_ADDRESS_PREFIXES = ['10.2.0.0/16'].freeze
+    SUBNET = 'Subnet'.freeze
+    PUBLIC_IP = 'Public-IP-Address'.freeze
+    NETWORK_SECURITY_GROUP = 'Network-Security-Group'.freeze
+    STANDARD_STORAGE = 'Standard'.freeze
+    PREMIUM_STORAGE = 'Premium'.freeze
+    ALLOWED_STANDARD_REPLICATION = %w[LRS ZRS GRS RAGRS].freeze
+    API_VERSION = '2016-06-01'.freeze
+    FAULT_DOMAIN_COUNT = 2
+    UPDATE_DOMAIN_COUNT = 5
+    WINDOWS = 'windows'.freeze
+    VPN = 'Vpn'.freeze
+    MICROSOFT_PEERING = 'MicrosoftPeering'.freeze
+    RESOURCE_GROUP_NAME = 4
+    RESOURCE_PROVIDER_NAMESPACE = 6
+    RESOURCE_TYPE = 7
+    RESOURCE_NAME = 8
+    ENDPOINT_PREFIX = 'Microsoft.Network/trafficManagerProfiles'.freeze
+    DISK_PREFIX = 'Microsoft.Compute/disks'.freeze
+    SNAPSHOT_PREFIX = 'Microsoft.Compute/snapshots'.freeze
+    AZURE_ENDPOINTS = 'azureEndpoints'.freeze
+    EXTERNAL_ENDPOINTS = 'externalEndpoints'.freeze
+    NESTED_ENDPOINTS = 'nestedEndpoints'.freeze
+    GLOBAL = 'global'.freeze
+    UPLOAD_BLOB_WORKER_THREAD_COUNT = 8
+    VM_NAME_POSITION = 8
+    PRIMARY_NIC_INDEX = 0
 
-ENVIRONMENT_AZURE_CLOUD = 'AzureCloud'.freeze
-ENVIRONMENT_AZURE_CHINA_CLOUD = 'AzureChinaCloud'.freeze
-ENVIRONMENT_AZURE_US_GOVERNMENT = 'AzureUSGovernment'.freeze
-ENVIRONMENT_AZURE_GERMAN_CLOUD = 'AzureGermanCloud'.freeze
+    ENVIRONMENT_AZURE_CLOUD = 'AzureCloud'.freeze
+    ENVIRONMENT_AZURE_CHINA_CLOUD = 'AzureChinaCloud'.freeze
+    ENVIRONMENT_AZURE_US_GOVERNMENT = 'AzureUSGovernment'.freeze
+    ENVIRONMENT_AZURE_GERMAN_CLOUD = 'AzureGermanCloud'.freeze
 
-# MsRestAzure::AzureOperationError class Error Codes
-ERROR_CODE_RESOURCE_NOT_FOUND = 'ResourceNotFound'.freeze
-ERROR_CODE_NOT_FOUND = 'NotFound'.freeze
-ERROR_CODE_RESOURCE_GROUP_NOT_FOUND = 'ResourceGroupNotFound'.freeze
-ERROR_CODE_PARENT_RESOURCE_NOT_FOUND = 'ParentResourceNotFound'.freeze
+    # MsRestAzure::AzureOperationError class Error Codes
+    ERROR_CODE_RESOURCE_NOT_FOUND = 'ResourceNotFound'.freeze
+    ERROR_CODE_NOT_FOUND = 'NotFound'.freeze
+    ERROR_CODE_RESOURCE_GROUP_NOT_FOUND = 'ResourceGroupNotFound'.freeze
+    ERROR_CODE_PARENT_RESOURCE_NOT_FOUND = 'ParentResourceNotFound'.freeze
 
-PLATFORM_LINUX = 'linux'.freeze
+    PLATFORM_LINUX = 'linux'.freeze
 
-# State of the copy operation
-COPY_STATUS =
-  {
-    # The copy completed successfully.
-    SUCCESS: 'success',
-    # The copy is in progress
-    PENDING: 'pending'
-  }.freeze
+    # State of the copy operation
+    COPY_STATUS =
+      {
+        # The copy completed successfully.
+        SUCCESS: 'success',
+        # The copy is in progress
+        PENDING: 'pending'
+      }.freeze
 
-# https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
-# The maximum size for a block blob created via Put Blob is 64 MB. But for better performance, this size should be 32 MB.
-# If your blob is larger than 32 MB, you must upload it as a set of blocks.
-SINGLE_BLOB_PUT_THRESHOLD = 32 * 1024 * 1024
+    # https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
+    # The maximum size for a block blob created via Put Blob is 64 MB. But for better performance, this size should be 32 MB.
+    # If your blob is larger than 32 MB, you must upload it as a set of blocks.
+    SINGLE_BLOB_PUT_THRESHOLD = 32 * 1024 * 1024
 
-# Block blob: https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx
-# Page blob: https://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
-# Each block/page can be a different size, up to a maximum of 4 MB
-MAXIMUM_CHUNK_SIZE = 4 * 1024 * 1024
+    # Block blob: https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx
+    # Page blob: https://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
+    # Each block/page can be a different size, up to a maximum of 4 MB
+    MAXIMUM_CHUNK_SIZE = 4 * 1024 * 1024
 
-# The hash value of 4MB empty content
-HASH_OF_4MB_EMPTY_CONTENT = 'b5cfa9d6c8febd618f91ac2843d50a1c'.freeze
-REST_CLIENT_API_VERSION = %w[2014-04-01-preview 2016-05-01].freeze
-AS_SKU_CLASSIC = 'Classic'.freeze
-AS_SKU_ALIGNED = 'Aligned'.freeze
+    # The hash value of 4MB empty content
+    HASH_OF_4MB_EMPTY_CONTENT = 'b5cfa9d6c8febd618f91ac2843d50a1c'.freeze
+    REST_CLIENT_API_VERSION = %w[2014-04-01-preview 2016-05-01].freeze
+    AS_SKU_CLASSIC = 'Classic'.freeze
+    AS_SKU_ALIGNED = 'Aligned'.freeze
 
-# The tag key and tag value for creating a temporary storage account for generalized image
-TEMPORARY_STORAGE_ACCOUNT_TAG_KEY = 'generalized_image'.freeze
-TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE = 'delete'.freeze
+    # The tag key and tag value for creating a temporary storage account for generalized image
+    TEMPORARY_STORAGE_ACCOUNT_TAG_KEY = 'generalized_image'.freeze
+    TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE = 'delete'.freeze
 
-HTTP_NOT_FOUND = 404
+    HTTP_NOT_FOUND = 404
+  end
+end

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

@@ -3,6 +3,8 @@ module Fog
     class AzureRM
       # This class is giving implementation of listing containers.
       class Directories < Fog::Collection
+        include Fog::AzureRM::Utilities::General
+
         model Fog::Storage::AzureRM::Directory
 
         # List all directories(containers) in the storage account.

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

@@ -5,6 +5,8 @@ module Fog
       class Directory < Fog::Model
         VALID_ACLS = ['container', 'blob', 'unknown', nil].freeze
 
+        include Fog::AzureRM::Utilities::General
+
         attr_writer :acl
 
         identity  :key,                 aliases: %w(Name name)

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

@@ -6,6 +6,8 @@ module Fog
       # This class is giving implementation of create/save and
       # delete/destroy for Blob.
       class File < Fog::Model
+        include Fog::AzureRM::Utilities::General
+
         identity :key, aliases: %w(Name name Key)
 
         attr_writer :body

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

@@ -3,6 +3,8 @@ module Fog
     class AzureRM
       # This class is giving implementation of listing blobs.
       class Files < Fog::Collection
+        include Fog::AzureRM::Utilities::General
+
         attribute :directory
         attribute :delimiter,       aliases: 'Delimiter'
         attribute :marker,          aliases: 'Marker'

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

@@ -56,7 +56,7 @@ module Fog
 
         def save_page_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
+          threads_num = Fog::AzureRM::UPLOAD_BLOB_WORKER_THREAD_COUNT if threads_num.nil? || !threads_num.is_a?(Integer) || threads_num < 1
 
           begin
             blob_size = Fog::Storage.get_body_size(body)
@@ -74,9 +74,9 @@ module Fog
             threads_num.times do |id|
               thread = Thread.new do
                 Fog::Logger.debug "Created upload thread #{id}."
-                while (chunk = iostream.read(MAXIMUM_CHUNK_SIZE))
+                while (chunk = iostream.read(Fog::AzureRM::MAXIMUM_CHUNK_SIZE))
                   Fog::Logger.debug "Upload thread #{id} is uploading #{chunk.id}, start_range: #{chunk.start_range}, size: #{chunk.data.size}."
-                  put_blob_pages(container_name, blob_name, chunk.start_range, chunk.end_range, chunk.data, options) if Digest::MD5.hexdigest(chunk.data) != HASH_OF_4MB_EMPTY_CONTENT
+                  put_blob_pages(container_name, blob_name, chunk.start_range, chunk.end_range, chunk.data, options) if Digest::MD5.hexdigest(chunk.data) != Fog::AzureRM::HASH_OF_4MB_EMPTY_CONTENT
                 end
                 Fog::Logger.debug "Upload thread #{id} finished."
               end

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

@@ -6,7 +6,7 @@ module Fog
         def wait_blob_copy_operation_to_finish(container_name, blob_name, copy_id, copy_status, timeout = nil)
           begin
             start_time = Time.new
-            while copy_status == COPY_STATUS[:PENDING]
+            while copy_status == Fog::AzureRM::COPY_STATUS[:PENDING]
               blob = get_blob_properties(container_name, blob_name)
               blob_props = blob.properties
               if !copy_id.nil? && blob_props[:copy_id] != copy_id
@@ -15,7 +15,7 @@ module Fog
 
               copy_status_description = blob_props[:copy_status_description]
               copy_status = blob_props[:copy_status]
-              break if copy_status != COPY_STATUS[:PENDING]
+              break if copy_status != Fog::AzureRM::COPY_STATUS[:PENDING]
 
               elapse_time = Time.new - start_time
               raise Timeout::Error.new("The copy operation cannot be finished in #{timeout} seconds") if !timeout.nil? && elapse_time >= timeout
@@ -27,7 +27,7 @@ module Fog
               sleep(interval)
             end
 
-            if copy_status != COPY_STATUS[:SUCCESS]
+            if copy_status != Fog::AzureRM::COPY_STATUS[:SUCCESS]
               raise "Failed to copy to #{container_name}/#{blob_name}: \n\tcopy status: #{copy_status}\n\tcopy description: #{copy_status_description}"
             end
           rescue

data/lib/fog/azurerm/storage.rb

@@ -79,6 +79,8 @@ module Fog
 
       # This class provides the actual implementation for service calls.
       class Real
+        include Fog::AzureRM::Utilities::General
+
         def initialize(options)
           begin
             require 'azure/storage/common'

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

@@ -1,195 +1,204 @@
 require File.expand_path('../../custom_fog_errors.rb', __FILE__)
 
-# Pick Resource Group name from Azure Resource Id(String)
-def get_resource_group_from_id(id)
-  id.split('/')[4]
-end
-
-# Pick Virtual Network name from Subnet Resource Id(String)
-def get_virtual_network_from_id(subnet_id)
-  subnet_id.split('/')[8]
-end
+module Fog
+  module AzureRM
+    module Utilities
+      # General utilities mixin.
+      module General # rubocop:disable Metrics/ModuleLength
+        # Pick Resource Group name from Azure Resource Id(String)
+        def get_resource_group_from_id(id)
+          id.split('/')[4]
+        end
 
-# Pick Virtual Machine name from Virtual Machine Extension Id(String)
-def get_virtual_machine_from_id(vme_id)
-  vme_id.split('/')[VM_NAME_POSITION]
-end
+        # Pick Virtual Network name from Subnet Resource Id(String)
+        def get_virtual_network_from_id(subnet_id)
+          subnet_id.split('/')[8]
+        end
 
-# Extract Endpoint type from (String)
-def get_end_point_type(endpoint_type)
-  endpoint_type.split('/')[2]
-end
+        # Pick Virtual Machine name from Virtual Machine Extension Id(String)
+        def get_virtual_machine_from_id(vme_id)
+          vme_id.split('/')[VM_NAME_POSITION]
+        end
 
-def get_record_set_from_id(id)
-  id.split('/')[8]
-end
+        # Extract Endpoint type from (String)
+        def get_end_point_type(endpoint_type)
+          endpoint_type.split('/')[2]
+        end
 
-def get_type_from_recordset_type(type)
-  type.split('/')[2]
-end
+        def get_record_set_from_id(id)
+          id.split('/')[8]
+        end
 
-def get_hash_from_object(object)
-  hash = {}
-  object.instance_variables.each { |attr| hash[attr.to_s.delete('@')] = object.instance_variable_get(attr) }
-  hash
-end
+        def get_type_from_recordset_type(type)
+          type.split('/')[2]
+        end
 
-# Extract Traffic Manager Profile Name from Endpoint id(String)
-def get_traffic_manager_profile_name_from_endpoint_id(endpoint_id)
-  endpoint_id.split('/')[8]
-end
+        def get_hash_from_object(object)
+          hash = {}
+          object.instance_variables.each { |attr| hash[attr.to_s.delete('@')] = object.instance_variable_get(attr) }
+          hash
+        end
 
-# Pick Express Route Circuit name from Id(String)
-def get_circuit_name_from_id(circuit_id)
-  circuit_id.split('/')[8]
-end
+        # Extract Traffic Manager Profile Name from Endpoint id(String)
+        def get_traffic_manager_profile_name_from_endpoint_id(endpoint_id)
+          endpoint_id.split('/')[8]
+        end
 
-def get_record_type(type)
-  type.split('/').last
-end
+        # Pick Express Route Circuit name from Id(String)
+        def get_circuit_name_from_id(circuit_id)
+          circuit_id.split('/')[8]
+        end
 
-def raise_azure_exception(exception, msg)
-  raise Fog::AzureRM::CustomAzureCoreHttpError.new(exception) if exception.is_a?(Azure::Core::Http::HTTPError)
-  raise exception unless exception.is_a?(MsRestAzure::AzureOperationError)
+        def get_record_type(type)
+          type.split('/').last
+        end
 
-  azure_operation_error = Fog::AzureRM::CustomAzureOperationError.new(msg, exception)
-  azure_operation_error.print_subscription_limits_information if !azure_operation_error.request.nil? && !azure_operation_error.response.nil?
-  raise azure_operation_error
-end
+        def raise_azure_exception(exception, msg)
+          raise Fog::AzureRM::CustomAzureCoreHttpError.new(exception) if exception.is_a?(Azure::Core::Http::HTTPError)
+          raise exception unless exception.is_a?(MsRestAzure::AzureOperationError)
 
-# Make sure if input_params(Hash) contains all keys present in required_params(Array)
-def validate_params(required_params, input_params)
-  missing_params = required_params.select { |param| param unless input_params.key?(param) }
-  raise(ArgumentError, "Missing Parameters: #{missing_params.join(', ')} required for this operation") if missing_params.any?
-end
+          azure_operation_error = Fog::AzureRM::CustomAzureOperationError.new(msg, exception)
+          azure_operation_error.print_subscription_limits_information if !azure_operation_error.request.nil? && !azure_operation_error.response.nil?
+          raise azure_operation_error
+        end
 
-def get_resource_from_resource_id(resource_id, position)
-  data = resource_id.split('/') unless resource_id.nil?
+        # Make sure if input_params(Hash) contains all keys present in required_params(Array)
+        def validate_params(required_params, input_params)
+          missing_params = required_params.select { |param| param unless input_params.key?(param) }
+          raise(ArgumentError, "Missing Parameters: #{missing_params.join(', ')} required for this operation") if missing_params.any?
+        end
 
-  raise 'Invalid Resource ID' if data.count < 9 && data.count != 5
+        def get_resource_from_resource_id(resource_id, position)
+          data = resource_id.split('/') unless resource_id.nil?
 
-  data[position]
-end
+          raise 'Invalid Resource ID' if data.count < 9 && data.count != 5
 
-def random_string(length)
-  (0...length).map { ('a'..'z').to_a[rand(26)] }.join
-end
+          data[position]
+        end
 
-def active_directory_service_settings(environment = ENVIRONMENT_AZURE_CLOUD)
-  case environment
-  when ENVIRONMENT_AZURE_CHINA_CLOUD
-    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
-  when ENVIRONMENT_AZURE_US_GOVERNMENT
-    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
-  when ENVIRONMENT_AZURE_GERMAN_CLOUD
-    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
-  else
-    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
-  end
-end
+        def random_string(length)
+          (0...length).map { ('a'..'z').to_a[rand(26)] }.join
+        end
 
-def resource_manager_endpoint_url(environment = ENVIRONMENT_AZURE_CLOUD)
-  case environment
-  when ENVIRONMENT_AZURE_CHINA_CLOUD
-    MsRestAzure::AzureEnvironments::ChinaCloud.resource_manager_endpoint_url
-  when ENVIRONMENT_AZURE_US_GOVERNMENT
-    MsRestAzure::AzureEnvironments::USGovernment.resource_manager_endpoint_url
-  when ENVIRONMENT_AZURE_GERMAN_CLOUD
-    MsRestAzure::AzureEnvironments::GermanCloud.resource_manager_endpoint_url
-  else
-    MsRestAzure::AzureEnvironments::AzureCloud.resource_manager_endpoint_url
-  end
-end
+        def active_directory_service_settings(environment = ENVIRONMENT_AZURE_CLOUD)
+          case environment
+          when ENVIRONMENT_AZURE_CHINA_CLOUD
+            MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
+          when ENVIRONMENT_AZURE_US_GOVERNMENT
+            MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
+          when ENVIRONMENT_AZURE_GERMAN_CLOUD
+            MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
+          else
+            MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+          end
+        end
 
-# storage_endpoint_suffix is nil in ms_rest_azure 0.6.2
-# Reference the issue: https://github.com/Azure/azure-sdk-for-ruby/issues/603
-def storage_endpoint_suffix(environment = ENVIRONMENT_AZURE_CLOUD)
-  case environment
-  when ENVIRONMENT_AZURE_CHINA_CLOUD
-    # MsRestAzure::AzureEnvironments::AzureChina.storage_endpoint_suffix
-    '.core.chinacloudapi.cn'
-  when ENVIRONMENT_AZURE_US_GOVERNMENT
-    # MsRestAzure::AzureEnvironments::AzureUSGovernment.storage_endpoint_suffix
-    '.core.usgovcloudapi.net'
-  when ENVIRONMENT_AZURE_GERMAN_CLOUD
-    # MsRestAzure::AzureEnvironments::AzureGermanCloud.storage_endpoint_suffix
-    '.core.cloudapi.de'
-  else
-    # MsRestAzure::AzureEnvironments::Azure.storage_endpoint_suffix
-    '.core.windows.net'
-  end
-end
+        def resource_manager_endpoint_url(environment = ENVIRONMENT_AZURE_CLOUD)
+          case environment
+          when ENVIRONMENT_AZURE_CHINA_CLOUD
+            MsRestAzure::AzureEnvironments::ChinaCloud.resource_manager_endpoint_url
+          when ENVIRONMENT_AZURE_US_GOVERNMENT
+            MsRestAzure::AzureEnvironments::USGovernment.resource_manager_endpoint_url
+          when ENVIRONMENT_AZURE_GERMAN_CLOUD
+            MsRestAzure::AzureEnvironments::GermanCloud.resource_manager_endpoint_url
+          else
+            MsRestAzure::AzureEnvironments::AzureCloud.resource_manager_endpoint_url
+          end
+        end
 
-def get_blob_endpoint(storage_account_name, enable_https = false, environment = ENVIRONMENT_AZURE_CLOUD)
-  protocol = enable_https ? 'https' : 'http'
-  "#{protocol}://#{storage_account_name}.blob#{storage_endpoint_suffix(environment)}"
-end
+        # storage_endpoint_suffix is nil in ms_rest_azure 0.6.2
+        # Reference the issue: https://github.com/Azure/azure-sdk-for-ruby/issues/603
+        def storage_endpoint_suffix(environment = ENVIRONMENT_AZURE_CLOUD)
+          case environment
+          when ENVIRONMENT_AZURE_CHINA_CLOUD
+            # MsRestAzure::AzureEnvironments::AzureChina.storage_endpoint_suffix
+            '.core.chinacloudapi.cn'
+          when ENVIRONMENT_AZURE_US_GOVERNMENT
+            # MsRestAzure::AzureEnvironments::AzureUSGovernment.storage_endpoint_suffix
+            '.core.usgovcloudapi.net'
+          when ENVIRONMENT_AZURE_GERMAN_CLOUD
+            # MsRestAzure::AzureEnvironments::AzureGermanCloud.storage_endpoint_suffix
+            '.core.cloudapi.de'
+          else
+            # MsRestAzure::AzureEnvironments::Azure.storage_endpoint_suffix
+            '.core.windows.net'
+          end
+        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 get_blob_endpoint(storage_account_name, enable_https = false, environment = ENVIRONMENT_AZURE_CLOUD)
+          protocol = enable_https ? 'https' : 'http'
+          "#{protocol}://#{storage_account_name}.blob#{storage_endpoint_suffix(environment)}"
+        end
 
-def current_time
-  time = Time.now.to_f.to_s
-  time.split(/\W+/).join
-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
 
-# Parse storage blob/container to a hash
-def parse_storage_object(object)
-  data = {}
-  if object.is_a? Hash
-    object.each do |k, v|
-      if k == 'properties'
-        v.each do |j, l|
-          data[j] = l
-        end
-      else
-        data[k] = v
-      end
-    end
-  else
-    object.instance_variables.each do |p|
-      kname = p.to_s.delete('@')
-      if kname == 'properties'
-        properties = object.instance_variable_get(p)
-        properties.each do |k, v|
-          data[k.to_s] = v
-        end
-      else
-        data[kname] = object.instance_variable_get(p)
-      end
-    end
-  end
+        def current_time
+          time = Time.now.to_f.to_s
+          time.split(/\W+/).join
+        end
 
-  data['last_modified'] = Time.parse(data['last_modified'])
-  data['etag'].delete!('"')
-  data
-end
+        # Parse storage blob/container to a hash
+        def parse_storage_object(object)
+          data = {}
+          if object.is_a? Hash
+            object.each do |k, v|
+              if k == 'properties'
+                v.each do |j, l|
+                  data[j] = l
+                end
+              else
+                data[k] = v
+              end
+            end
+          else
+            object.instance_variables.each do |p|
+              kname = p.to_s.delete('@')
+              if kname == 'properties'
+                properties = object.instance_variable_get(p)
+                properties.each do |k, v|
+                  data[k.to_s] = v
+                end
+              else
+                data[kname] = object.instance_variable_get(p)
+              end
+            end
+          end
+
+          data['last_modified'] = Time.parse(data['last_modified'])
+          data['etag'].delete!('"')
+          data
+        end
 
-def resource_not_found?(azure_operation_error)
-  is_found = false
-  if azure_operation_error.response.status == HTTP_NOT_FOUND
-    if azure_operation_error.body['code']
-      is_found = azure_operation_error.body['code'] == ERROR_CODE_NOT_FOUND
-    elsif azure_operation_error.body['error']
-      is_found = azure_operation_error.body['error']['code'] == ERROR_CODE_NOT_FOUND ||
-                 azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_GROUP_NOT_FOUND ||
-                 azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND ||
-                 azure_operation_error.body['error']['code'] == ERROR_CODE_PARENT_RESOURCE_NOT_FOUND
-    end
-  end
-  is_found
-end
+        def resource_not_found?(azure_operation_error)
+          is_found = false
+          if azure_operation_error.response.status == HTTP_NOT_FOUND
+            if azure_operation_error.body['code']
+              is_found = azure_operation_error.body['code'] == ERROR_CODE_NOT_FOUND
+            elsif azure_operation_error.body['error']
+              is_found = azure_operation_error.body['error']['code'] == ERROR_CODE_NOT_FOUND ||
+                         azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_GROUP_NOT_FOUND ||
+                         azure_operation_error.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND ||
+                         azure_operation_error.body['error']['code'] == ERROR_CODE_PARENT_RESOURCE_NOT_FOUND
+            end
+          end
+          is_found
+        end
 
-def get_image_name(id)
-  id.split('/').last
-end
+        def get_image_name(id)
+          id.split('/').last
+        end
 
-def get_subscription_id(id)
-  id.split('/')[2]
-end
+        def get_subscription_id(id)
+          id.split('/')[2]
+        end
 
-def remove_trailing_periods_from_path_segments(path)
-  path.split('/').map { |segment| segment.gsub(/\.*$/, '') }.join('/')
+        def remove_trailing_periods_from_path_segments(path)
+          path.split('/').map { |segment| segment.gsub(/\.*$/, '') }.join('/')
+        end
+      end
+    end
+  end
 end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/test/api_stub/requests/storage/file.rb

@@ -43,13 +43,13 @@ module ApiStub
           }
         end
 
-        def self.blob_https_url(environment = ENVIRONMENT_AZURE_CLOUD)
+        def self.blob_https_url(environment = Fog::AzureRM::ENVIRONMENT_AZURE_CLOUD)
           case environment
-          when ENVIRONMENT_AZURE_CHINA_CLOUD
+          when Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD
             'https://sa.blob.core.chinacloudapi.cn/test_container/test_blob'
-          when ENVIRONMENT_AZURE_US_GOVERNMENT
+          when Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT
             'https://sa.blob.core.usgovcloudapi.net/test_container/test_blob'
-          when ENVIRONMENT_AZURE_GERMAN_CLOUD
+          when Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD
             'https://sa.blob.core.cloudapi.de/test_container/test_blob'
           else
             'https://sa.blob.core.windows.net/test_container/test_blob'

data/test/requests/storage/test_get_blob_url.rb

@@ -28,10 +28,10 @@ class TestGetBlobUrl < Minitest::Test
   end
 
   def test_get_blob_url_for_china_success
-    china_storage_account_credentials = storage_account_credentials.merge(environment: ENVIRONMENT_AZURE_CHINA_CLOUD)
+    china_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
     service = Fog::Storage::AzureRM.new(china_storage_account_credentials)
     blob_client = service.instance_variable_get(:@blob_client)
-    url = ApiStub::Requests::Storage::File.blob_https_url(ENVIRONMENT_AZURE_CHINA_CLOUD)
+    url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
 
     blob_client.stub :generate_uri, url do
       assert_equal url, service.get_blob_url('test_container', 'test_blob')
@@ -42,10 +42,10 @@ class TestGetBlobUrl < Minitest::Test
   end
 
   def test_get_blob_url_for_us_success
-    us_storage_account_credentials = storage_account_credentials.merge(environment: ENVIRONMENT_AZURE_US_GOVERNMENT)
+    us_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
     service = Fog::Storage::AzureRM.new(us_storage_account_credentials)
     blob_client = service.instance_variable_get(:@blob_client)
-    url = ApiStub::Requests::Storage::File.blob_https_url(ENVIRONMENT_AZURE_US_GOVERNMENT)
+    url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
 
     blob_client.stub :generate_uri, url do
       assert_equal url, service.get_blob_url('test_container', 'test_blob')
@@ -56,10 +56,10 @@ class TestGetBlobUrl < Minitest::Test
   end
 
   def test_get_blob_url_for_german_success
-    german_storage_account_credentials = storage_account_credentials.merge(environment: ENVIRONMENT_AZURE_GERMAN_CLOUD)
+    german_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
     service = Fog::Storage::AzureRM.new(german_storage_account_credentials)
     blob_client = service.instance_variable_get(:@blob_client)
-    url = ApiStub::Requests::Storage::File.blob_https_url(ENVIRONMENT_AZURE_GERMAN_CLOUD)
+    url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
 
     blob_client.stub :generate_uri, url do
       assert_equal url, service.get_blob_url('test_container', 'test_blob')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -15,10 +15,10 @@ authors:
 - Azeem Sajid
 - Maham Nazir
 - Abbas Sheikh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -176,7 +176,7 @@ dependencies:
         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: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -338,8 +338,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Blob Storage with CarrierWave and
   Fog.