azure_mgmt_relay 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2147dbec5fd849409e3c34ae00cd548bf2cc712
-  data.tar.gz: d47ab9c3effcfe453818d34077044e2a949237a7
+  metadata.gz: b9893f9359bbf540d9d9a719e2dc7f5af050b7bb
+  data.tar.gz: f129d791a39939bf26af10a1df423cfa8cf2eee2
 SHA512:
-  metadata.gz: 233d3a3885c2b7fb78330a954b802fdf9f8ea728202c4d0ced22a7635c176eb09d4b721bbbd09d8b47672d886f9b1aac0c4bb0a0b002fb7c7dd18eb122af3645
-  data.tar.gz: 80809f6cc2cd853e9b1739b3edf22a3b23be19a3d4cb21f5886381b8c130c4dbb70208373d98cff72727c488b8116c5a3f51eddac425039544014e9bd0399891
+  metadata.gz: 683d8d7f32112a3b9ebe42784ae48512da6bf26c8f743105fae38f50961c58be8c4fe8e38112b88fd79ba16d7706d68d8539bb0136d1de2c05e5933d53ee524b
+  data.tar.gz: 1383ad0dec881f1f4844fb59343abe03bcf4f56a66e64e61788d22dc868d22ed1f01925555b7cc22a01a471db674bbd08930655dfe77892d6cbbe1da7bd4fef3

data/lib/2016-07-01/generated/azure_mgmt_relay/version.rb

@@ -4,5 +4,5 @@
 # regenerated.
 
 module Azure::Relay::Mgmt::V2016_07_01
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
 end

data/lib/2017-04-01/generated/azure_mgmt_relay/version.rb

@@ -4,5 +4,5 @@
 # regenerated.
 
 module Azure::Relay::Mgmt::V2017_04_01
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
 end

data/lib/profiles/common/configurable.rb

@@ -2,8 +2,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::ARM
-  # The Azure::ARM::Configurable module provides basic configuration for Azure ARM activities.
+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
@@ -25,11 +25,11 @@ module Azure::ARM
 
     class << self
       #
-      # List of configurable keys for {Azure::ARM::Client}.
+      # 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, :credentials]
+        @keys ||= [:tenant_id, :client_id, :client_secret, :subscription_id, :active_directory_settings]
       end
     end
 
@@ -45,11 +45,23 @@ module Azure::ARM
     # This will also creates MsRest::TokenCredentials to be used for subsequent Azure Resource Manager clients.
     #
     def reset!(options = {})
-      Azure::ARM::Configurable.keys.each do |key|
-        default_value = Azure::ARM::Default.options[key]
+      Azure::Common::Configurable.keys.each do |key|
+        default_value = Azure::Common::Default.options[key]
         instance_variable_set(:"@#{key}", options.fetch(key, default_value))
       end
 
+      fail ArgumentError, 'tenant_id is nil' if self.tenant_id.nil?
+      fail ArgumentError, 'client_id is nil' if self.client_id.nil?
+      fail ArgumentError, 'client_secret is nil' if self.client_secret.nil?
+      fail ArgumentError, 'subscription_id is nil' if self.subscription_id.nil?
+      fail ArgumentError, 'active_directory_settings is nil' if self.active_directory_settings.nil?
+
+      default_value = MsRest::TokenCredentials.new(
+        MsRestAzure::ApplicationTokenProvider.new(
+          self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
+
+      instance_variable_set(:"@credentials", options.fetch(:credentials, default_value))
+
       self
     end
 
@@ -62,11 +74,12 @@ module Azure::ARM
     #
     # configures configurable options to default values
     #
-    def setup_options
+    def setup_default_options
       opts = {}
-      Azure::ARM::Configurable.keys.map do |key|
-        opts[key] = Azure::ARM::Default.options[key]
+      Azure::Common::Configurable.keys.map do |key|
+        opts[key] = Azure::Common::Default.options[key]
       end
+
       opts
     end
   end

data/lib/profiles/common/default.rb

@@ -2,8 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
-module Azure::ARM
-  # Default configuration options for {Azure::ARM.Client}
+module Azure::Common
   module Default
     class << self
       #
@@ -38,16 +37,6 @@ module Azure::ARM
         ENV['AZURE_SUBSCRIPTION_ID']
       end
 
-      #
-      # Default Azure credentials to authorize HTTP requests made by the service client.
-      # @return [MsRest::ServiceClientCredentials] Azure credentials to authorize HTTP requests made by the service client.
-      #
-      def credentials
-        MsRest::TokenCredentials.new(
-            MsRestAzure::ApplicationTokenProvider.new(
-                self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
-      end
-
       #
       # Default Azure Active Directory Service Settings.
       # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure Active Directory Service Settings.
@@ -61,7 +50,7 @@ module Azure::ARM
       # @return [Hash] Configuration options.
       #
       def options
-        Hash[Azure::ARM::Configurable.keys.map{|key| [key, send(key)]}]
+        Hash[Azure::Common::Configurable.keys.map { |key| [key, send(key)]}]
       end
     end
   end

data/lib/profiles/latest/modules/relay_profile_module.rb

@@ -48,7 +48,7 @@ module Azure::Relay::Profiles::Latest::Mgmt
 
       def initialize(options = {})
         if options.is_a?(Hash) && options.length == 0
-          @options = setup_options
+          @options = setup_default_options
         else
           @options = options
         end

data/lib/profiles/latest/relay_latest_profile_client.rb

@@ -12,22 +12,12 @@ module Azure::Relay::Profiles::Latest::Mgmt
   # Client class for the Latest profile SDK.
   #
   class Client < RelayClass
-    include Azure::ARM::Configurable
+    include Azure::Common::Configurable
 
 
     def initialize(options = {})
       super(options)
     end
 
-    def credentials
-      if @credentials.nil?
-        self.active_directory_settings ||= Azure::ARM::Default.active_directory_settings
-
-        @credentials = MsRest::TokenCredentials.new(
-                    MsRestAzure::ApplicationTokenProvider.new(
-                        self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
-      end
-      @credentials
-    end
   end
 end

data/lib/version.rb

@@ -3,5 +3,5 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
 module Azure::Relay::Mgmt
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure_mgmt_relay
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler