Credentials fix

README.md

@@ -150,14 +150,10 @@ The following lines should be used to instantiate a profile client:
 
 ```ruby
 # Provide credentials
-provider = MsRestAzure::ApplicationTokenProvider.new(
-       ENV['AZURE_TENANT_ID'],
-       ENV['AZURE_CLIENT_ID'],
-       ENV['AZURE_CLIENT_SECRET'])
-credentials = MsRest::TokenCredentials.new(provider)
-
 options = {
-  credentials: credentials,
+  tenant_id: ENV['AZURE_TENANT_ID'],
+  client_id: ENV['AZURE_CLIENT_ID'],
+  client_secret: ENV['AZURE_CLIENT_SECRET'],
   subscription_id: ENV['AZURE_SUBSCRIPTION_ID']
 }
 
@@ -195,14 +191,10 @@ The following lines should be used to instantiate a profile client:
 
 ```ruby
 # Provide credentials
-provider = MsRestAzure::ApplicationTokenProvider.new(
-       ENV['AZURE_TENANT_ID'],
-       ENV['AZURE_CLIENT_ID'],
-       ENV['AZURE_CLIENT_SECRET'])
-credentials = MsRest::TokenCredentials.new(provider)
-
 options = {
-  credentials: credentials,
+  tenant_id: ENV['AZURE_TENANT_ID'],
+  client_id: ENV['AZURE_CLIENT_ID'],
+  client_secret: ENV['AZURE_CLIENT_SECRET'],
   subscription_id: ENV['AZURE_SUBSCRIPTION_ID']
 }
 
@@ -242,14 +234,10 @@ The following lines should be used to instantiate a profile client:
 
 ```ruby
 # Provide credentials
-provider = MsRestAzure::ApplicationTokenProvider.new(
-       ENV['AZURE_TENANT_ID'],
-       ENV['AZURE_CLIENT_ID'],
-       ENV['AZURE_CLIENT_SECRET'])
-credentials = MsRest::TokenCredentials.new(provider)
-
 options = {
-  credentials: credentials,
+  tenant_id: ENV['AZURE_TENANT_ID'],
+  client_id: ENV['AZURE_CLIENT_ID'],
+  client_secret: ENV['AZURE_CLIENT_SECRET'],
   subscription_id: ENV['AZURE_SUBSCRIPTION_ID']
 }
 

Rakefile

@@ -172,6 +172,9 @@ namespace :arm do
     # bundle exec ruby profile_generator_client.rb --dir_metadata=dir_metadata.json --profile=profiles.json
     command = "#{get_base_profile_generation_cmd}#{get_profile_spec_files_folder}/#{PROFILE_METADATA[:azure_sdk]}"
     execute_and_stream(command)
+
+    FileUtils.cp("#{__dir__}/generators/profilegen/src/resources/common/configurable.rb", "#{__dir__}/azure_sdk/lib/common/configurable.rb")
+    FileUtils.cp("#{__dir__}/generators/profilegen/src/resources/common/default.rb", "#{__dir__}/azure_sdk/lib/common/default.rb")
   end
 
   desc 'Regen individual profiles'
@@ -183,6 +186,9 @@ namespace :arm do
         # bundle exec ruby profile_generator_client.rb --dir_metadata=dir_metadata.json --profile=authorization_profiles.json
         command = "#{get_base_profile_generation_cmd}#{get_profile_spec_files_folder}/#{profile_spec_file}"
         execute_and_stream(command)
+
+        FileUtils.cp("#{__dir__}/generators/profilegen/src/resources/common/configurable.rb", "#{__dir__}/management/#{sdk}/lib/profiles/common/configurable.rb")
+        FileUtils.cp("#{__dir__}/generators/profilegen/src/resources/common/default.rb", "#{__dir__}/management/#{sdk}/lib/profiles/common/default.rb")
       end
     end
   end

generators/profilegen/src/resources/common/configurable.rb

@@ -0,0 +1,84 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+
+module Azure::Common
+  # The Azure::Common::Configurable module provides basic configuration for Azure activities.
+  module Configurable
+    # @return [String] Azure tenant id (also known as domain).
+    attr_accessor :tenant_id
+
+    # @return [String] Azure client id.
+    attr_accessor :client_id
+
+    # @return [String] Azure secret key.
+    attr_accessor :client_secret
+
+    # @return [String] Azure subscription id.
+    attr_accessor :subscription_id
+
+    # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure active directory service settings.
+    attr_accessor :active_directory_settings
+
+    # @return [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.
+    attr_accessor :credentials
+
+    class << self
+      #
+      # List of configurable keys for {Azure::Common::Client}.
+      # @return [Array] of option keys.
+      #
+      def keys
+        @keys ||= [:tenant_id, :client_id, :client_secret, :subscription_id, :active_directory_settings]
+      end
+    end
+
+    #
+    # Set configuration options using a block.
+    #
+    def configure
+      yield self
+    end
+
+    #
+    # Resets the configurable options to provided options or defaults.
+    # This will also creates MsRest::TokenCredentials to be used for subsequent Azure Resource Manager clients.
+    #
+    def reset!(options = {})
+      Azure::Common::Configurable.keys.each do |key|
+        default_value = Azure::Common::Default.options[key]
+        instance_variable_set(:"@#{key}", options.fetch(key, default_value))
+      end
+
+      default_value = get_credentials(self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings)
+      instance_variable_set(:"@credentials", options.fetch(:credentials, default_value))
+
+      self
+    end
+
+    def config
+      self
+    end
+
+    private
+
+    #
+    # configures configurable options to default values
+    #
+    def setup_options
+      opts = {}
+      Azure::Common::Configurable.keys.map do |key|
+        opts[key] = Azure::Common::Default.options[key]
+      end
+      opts[:credentials] = get_credentials(opts[:tenant_id], opts[:client_id], opts[:client_secret], opts[:active_directory_settings])
+      opts
+    end
+
+    def get_credentials(tenant_id, client_id, client_secret, active_directory_settings)
+      MsRest::TokenCredentials.new(
+        MsRestAzure::ApplicationTokenProvider.new(
+          tenant_id, client_id, client_secret, active_directory_settings))
+    end
+
+  end
+end

generators/profilegen/src/resources/common/default.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+
+module Azure::Common
+  module Default
+    class << self
+      #
+      # Default Azure Tenant Id.
+      # @return [String] Azure Tenant Id.
+      #
+      def tenant_id
+        ENV['AZURE_TENANT_ID']
+      end
+
+      #
+      # Default Azure Client Id.
+      # @return [String] Azure Client Id.
+      #
+      def client_id
+        ENV['AZURE_CLIENT_ID']
+      end
+
+      #
+      # Default Azure Client Secret.
+      # @return [String] Azure Client Secret.
+      #
+      def client_secret
+        ENV['AZURE_CLIENT_SECRET']
+      end
+
+      #
+      # Default Azure Subscription Id.
+      # @return [String] Azure Subscription Id.
+      #
+      def subscription_id
+        ENV['AZURE_SUBSCRIPTION_ID']
+      end
+
+      #
+      # Default Azure Active Directory Service Settings.
+      # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure Active Directory Service Settings.
+      #
+      def active_directory_settings
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+      end
+
+      #
+      # Configuration options.
+      # @return [Hash] Configuration options.
+      #
+      def options
+        Hash[Azure::Common::Configurable.keys.map { |key| [key, send(key)]}]
+      end
+    end
+  end
+end

generators/profilegen/src/resources/templates/client_template.template

@@ -31,7 +31,7 @@ module Azure::Profiles::<%= @profile_name %>::Mgmt
   <%- else -%>
   class Client
   <%- end -%>
-    include Azure::ARM::Configurable
+    include Azure::Common::Configurable
 
     <%- if !@individual_gem_profile -%>
     attr_reader <% @class_names.each_with_index do |class_name, index| %> :<%= class_name.gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase %><% if index != @class_names.length - 1 %>,<% end %><% end %>
@@ -57,7 +57,7 @@ module Azure::Profiles::<%= @profile_name %>::Mgmt
 
     def credentials
       if @credentials.nil?
-        self.active_directory_settings ||= Azure::ARM::Default.active_directory_settings
+        self.active_directory_settings ||= Azure::Common::Default.active_directory_settings
 
         @credentials = MsRest::TokenCredentials.new(
                     MsRestAzure::ApplicationTokenProvider.new(