azure_mgmt_graph 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9639393b5135fd6bdbc4c6b4b04b187021318bc2
-  data.tar.gz: 35c4f9ee9c6b2526b2795675fa2d7dad215634f2
+  metadata.gz: 012dcd19089a302a55eeffeaef669a0a1cb3a150
+  data.tar.gz: 96386c5ac4b7bc1b7e9d1e06c61577945622ac88
 SHA512:
-  metadata.gz: 851daeb6fe2fbc424b96ad21432f19751ea2c9134aed0b11379d3652b77893fce1b42cca59900cf44136314f1d7c456942c8a0fc76184fdea57add31ee090efc
-  data.tar.gz: 117e1d07ecc0ffbe7f8bac6736a4f93f1583b5fdcdc90ca9371c17af4c579c090a0a3df7458add8b4dcdc9518202b41c291243af1a87d16b050ab712bf8f23e3
+  metadata.gz: f2e77b5e14ed5ead460ea2a1434ea1da9049fcf9a15c1ac843baf0ad570ab24dcdd47339724af863f8b7f9fcb184db209f7600802025d9f97c2e66083882d4ad
+  data.tar.gz: 84d4b10191d351c00ef504583e9e8d8087fd7bc1ccc4b69da19b970a2d452f72a93e511a354cc386436f83014f0e3a42870ea0a0a4478e488eedbed945e6acfe

data/lib/1.6/generated/azure_mgmt_graph/version.rb

@@ -4,5 +4,5 @@
 # regenerated.
 
 module Azure::Graph::Mgmt::V1_6
-    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/graph_latest_profile_client.rb

@@ -12,22 +12,12 @@ module Azure::Graph::Profiles::Latest::Mgmt
   # Client class for the Latest profile SDK.
   #
   class Client < GraphClass
-    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/profiles/latest/modules/graph_profile_module.rb

@@ -62,7 +62,7 @@ module Azure::Graph::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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure_mgmt_graph
 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