gitlab-fog-azure-rm 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a2a16b2feac00c533b0489e6572ccd808c11e44f9f3efab5b69bdc392aea04
-  data.tar.gz: 8e7a5d519fa7002896efb7c00fe7bb73440f875cc0a428dba625695ed6c385bb
+  metadata.gz: e159dfc8b3cace029e335019a550572fd139b03621711088ef223f87989b0b97
+  data.tar.gz: aaebbcfd822283723b45ebb2db3a1588a67ca90b26cd1ddc319630f21131338d
 SHA512:
-  metadata.gz: 36e3c183ee97204706d901c25c3791b760980d0dcf84440d2370dddff622f54670db85a11e1badec9853341e661d057d519b990912b626c9d86e16c9461e2ebf
-  data.tar.gz: b20976bdfab522b172572194e2f6f0693129c3f6315910fb9d8331cd11e9855ecce53292f22d982b7d6c7811267bce716cf6e680a04d3bf9e703988ee21b2f1e
+  metadata.gz: 28dd5cd1ed31cad829892047887b48790f78370fa2b2e56fd5f5aa57140347cb7f31db8fc03d37552ffdfe0bcda6a6a219541b713d9b286c7d0a833934785ebe
+  data.tar.gz: 7604dd353e7d0345943e4d90bdc77184ca293deb605d1d3682a293107ae55c38026cde9e88f5ddee3c60c709046dd742a5d08864b8b601fa7609a33d8c807e55

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.8.0
+
+- Remove deprecated ms_rest_azure dependency (thanks to @jasoncodes) !38
+
 ## 1.7.0
 
 - Fix #get_object return type to be consistent with other Fog providers !36

data/gitlab-fog-azure-rm.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog-core', '= 2.1.0'
   spec.add_dependency 'fog-json', '~> 1.2.0'
   spec.add_dependency 'mime-types'
-  spec.add_dependency 'ms_rest_azure', '~> 0.12.0'
 end

data/lib/fog/azurerm/constants.rb

@@ -34,12 +34,6 @@ module Fog
     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
-
     PLATFORM_LINUX = 'linux'.freeze
 
     # State of the copy operation

data/lib/fog/azurerm/custom_fog_errors.rb

@@ -1,47 +1,6 @@
 # This file contains any or all custom Fog errors that we create
 module Fog
   module AzureRM
-    # This is a custom Fog exception inherited from MsRestAzure::AzureOperationError
-    class CustomAzureOperationError < MsRestAzure::AzureOperationError
-      def initialize(message, azure_exception)
-        super(azure_exception.request, azure_exception.response, azure_exception.body, "Exception in #{message}")
-      end
-
-      def print_subscription_limits_information
-        request_method = @request.method
-        subscription_id = @request.path_params['subscriptionId']
-
-        limit_value = remaining_subscription_request_limits(@response)
-
-        puts "Subscription: '#{subscription_id}'. Request Method: '#{request_method}'. \nLimit Value: #{limit_value['header']}: #{limit_value['value']}\n" unless limit_value.empty?
-      end
-
-      def remaining_subscription_request_limits(response)
-        limit = {}
-        # handles both read and write limits
-        if response.headers.key? 'x-ms-ratelimit-remaining-subscription-resource-requests'
-          limit['header'] = 'x-ms-ratelimit-remaining-subscription-resource-requests'
-          limit['value'] = response.headers['x-ms-ratelimit-remaining-subscription-resource-requests']
-
-        # limit for collection API calls
-        elsif response.headers.key? 'x-ms-ratelimit-remaining-subscription-resource-entities-read'
-          limit['header'] = 'x-ms-ratelimit-remaining-subscription-resource-entities-read'
-          limit['value'] = response.headers['x-ms-ratelimit-remaining-subscription-resource-entities-read']
-
-        # read requests limit
-        elsif response.headers.key? 'x-ms-ratelimit-remaining-subscription-reads'
-          limit['header'] = 'x-ms-ratelimit-remaining-subscription-reads'
-          limit['value'] = response.headers['x-ms-ratelimit-remaining-subscription-reads']
-
-        # write requests limit
-        elsif response.headers.key? 'x-ms-ratelimit-remaining-subscription-writes'
-          limit['header'] = 'x-ms-ratelimit-remaining-subscription-writes'
-          limit['value'] = response.headers['x-ms-ratelimit-remaining-subscription-writes']
-        end
-        limit
-      end
-    end
-
     # This is a custom Fog exception inherited from Azure::Core::Http::HTTPError
     class CustomAzureCoreHttpError < Azure::Core::Http::HTTPError
       def initialize(azure_exception)

data/lib/fog/azurerm/storage.rb

@@ -2,13 +2,6 @@ module Fog
   module Storage
     # This class registers models, requests and collections
     class AzureRM < Fog::Service
-      # Recognizes when creating management client
-      recognizes :tenant_id
-      recognizes :client_id
-      recognizes :client_secret
-      recognizes :subscription_id
-      recognizes :environment
-
       # Recognizes when creating data client
       recognizes :azure_storage_account_name
       recognizes :azure_storage_access_key
@@ -95,17 +88,6 @@ module Fog
             raise e.message
           end
 
-          options[:environment] = 'AzureCloud' if options[:environment].nil?
-
-          @tenant_id = options[:tenant_id]
-          @client_id = options[:client_id]
-          @client_secret = options[:client_secret]
-          @subscription_id = options[:subscription_id]
-          @environment = options[:environment]
-
-          credentials = Fog::Credentials::AzureRM.get_credentials(@tenant_id, @client_id, @client_secret, @environment)
-          telemetry = "gitlab-fog-azure-rm/#{Fog::AzureRM::VERSION}"
-
           return unless @azure_storage_account_name != options[:azure_storage_account_name] ||
                         @azure_storage_access_key != options[:azure_storage_access_key]
 

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

@@ -53,13 +53,9 @@ module Fog
           type.split('/').last
         end
 
-        def raise_azure_exception(exception, msg)
+        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)
-
-          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
+          raise exception
         end
 
         # Make sure if input_params(Hash) contains all keys present in required_params(Array)
@@ -80,47 +76,15 @@ module Fog
           (0...length).map { ('a'..'z').to_a[rand(26)] }.join
         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 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
-
-        # 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
@@ -172,21 +136,6 @@ module Fog
           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 get_image_name(id)
           id.split('/').last
         end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

data/lib/fog/azurerm.rb

@@ -1,4 +1,3 @@
-require 'ms_rest_azure'
 require 'azure/core/http/http_error'
 require 'erb'
 require 'fog/azurerm/config'
@@ -12,11 +11,6 @@ require 'fog/azurerm/models/storage/sku_tier'
 require 'fog/azurerm/models/storage/kind'
 
 module Fog
-  # Autoload Module for Credentials
-  module Credentials
-    autoload :AzureRM, File.expand_path('azurerm/credentials', __dir__)
-  end
-
   # Autoload Module for Storage
   module Storage
     autoload :AzureRM, File.expand_path('azurerm/storage', __dir__)

data/test/test_helper.rb

@@ -20,14 +20,6 @@ require 'azure/core/http/http_response'
 $LOAD_PATH.unshift(File.expand_path '../lib', __dir__)
 require File.expand_path '../lib/fog/azurerm', __dir__
 require File.expand_path './api_stub', __dir__
-def credentials
-  {
-    tenant_id: '<TENANT-ID>',
-    client_id: '<CLIENT-ID>',
-    client_secret: '<CLIENT-SECRET>',
-    subscription_id: '<SUBSCRIPTION-ID>'
-  }
-end
 
 def storage_account_credentials
   {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -160,20 +160,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ms_rest_azure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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:
@@ -201,7 +187,6 @@ files:
 - lib/fog/azurerm/async_response.rb
 - lib/fog/azurerm/config.rb
 - lib/fog/azurerm/constants.rb
-- lib/fog/azurerm/credentials.rb
 - lib/fog/azurerm/custom_fog_errors.rb
 - lib/fog/azurerm/docs/storage.md
 - lib/fog/azurerm/docs/structure.md
@@ -320,7 +305,6 @@ files:
 - test/requests/storage/test_save_page_blob.rb
 - test/requests/storage/test_wait_blob_copy_operation_to_finish.rb
 - test/smoke_tests/compute/test_resource_group_smoke.rb
-- test/test_credentials.rb
 - test/test_helper.rb
 homepage: https://gitlab.com/gitlab-org/gitlab-fog-azure-rm
 licenses:
@@ -342,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Blob Storage with CarrierWave and

data/lib/fog/azurerm/credentials.rb

@@ -1,44 +0,0 @@
-module Fog
-  module Credentials
-    # This class is managing credentials token
-    class AzureRM
-      class << self
-        include Fog::AzureRM::Utilities::General
-      end
-
-      def self.get_credentials(tenant_id, client_id, client_secret, environment = Fog::AzureRM::ENVIRONMENT_AZURE_CLOUD)
-        if @credentials.nil? || new_management_credential?(tenant_id, client_id, client_secret, environment)
-          get_new_credentials(tenant_id, client_id, client_secret, environment)
-        else
-          @credentials
-        end
-      end
-
-      def self.get_token(tenant_id, client_id, client_secret, environment = Fog::AzureRM::ENVIRONMENT_AZURE_CLOUD)
-        get_credentials(tenant_id, client_id, client_secret, environment) if @credentials.nil?
-        @token_provider.get_authentication_header
-      end
-
-      def self.get_new_credentials(tenant_id, client_id, client_secret, environment)
-        @tenant_id = tenant_id
-        @client_id = client_id
-        @client_secret = client_secret
-        @environment = environment
-        return if @tenant_id.nil? || @client_id.nil? || @client_secret.nil?
-        @token_provider = MsRestAzure::ApplicationTokenProvider.new(@tenant_id, @client_id, @client_secret, active_directory_service_settings(environment))
-        @credentials = MsRest::TokenCredentials.new(@token_provider)
-        @credentials
-      end
-
-      def self.new_management_credential?(tenant_id, client_id, client_secret, environment)
-        @tenant_id != tenant_id ||
-          @client_id != client_id ||
-          @client_secret != client_secret ||
-          @environment != environment
-      end
-
-      private_class_method :get_new_credentials
-      private_class_method :new_management_credential?
-    end
-  end
-end

data/test/test_credentials.rb

@@ -1,63 +0,0 @@
-require File.expand_path 'test_helper', __dir__
-
-# Test class for Credentials Helper Class
-class TestCredentials < Minitest::Test
-  def setup
-    @creds = credentials
-  end
-
-  def test_methods
-    methods = [
-      :get_credentials,
-      :get_token
-    ]
-    methods.each do |method|
-      assert Fog::Credentials::AzureRM.respond_to? method
-    end
-  end
-
-  def test_get_credentials_method_with_same_client
-    cred_obj_one = Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret])
-    cred_obj_two = Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret])
-    assert_equal cred_obj_one.object_id, cred_obj_two.object_id
-  end
-
-  def test_get_credentials_method_with_different_client
-    cred_obj_one = Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret])
-    @creds[:client_id] = '<NEW-CLIENT-ID>'
-    cred_obj_two = Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret])
-    refute_equal cred_obj_one.object_id, cred_obj_two.object_id
-  end
-
-  def test_get_token_method_with_default_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret])
-    token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
-    token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
-      assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
-    end
-  end
-
-  def test_get_token_method_with_china_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
-    token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
-    token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
-      assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
-    end
-  end
-
-  def test_get_token_method_with_us_government_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
-    token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
-    token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
-      assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
-    end
-  end
-
-  def test_get_token_method_with_german_environment
-    Fog::Credentials::AzureRM.get_credentials(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret], Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
-    token_provider = Fog::Credentials::AzureRM.instance_variable_get(:@token_provider)
-    token_provider.stub :get_authentication_header, 'Bearer <some-token>' do
-      assert_equal Fog::Credentials::AzureRM.get_token(@creds[:tenant_id], @creds[:client_id], @creds[:client_secret]), 'Bearer <some-token>'
-    end
-  end
-end