lib/fog/azurerm/storage.rb in gitlab-fog-azure-rm-1.7.0 vs lib/fog/azurerm/storage.rb in gitlab-fog-azure-rm-1.8.0
- old
+ new
@@ -1,16 +1,9 @@
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
recognizes :azure_storage_domain
@@ -92,20 +85,9 @@
require 'azure/core/http/debug_filter' if @debug
rescue LoadError => e
retry if require('rubygems')
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]
@azure_storage_account_name = options[:azure_storage_account_name]