azure_mgmt_web 0.15.0 → 0.15.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7675812a5c56a64247acb4565c76a46cd259f490
4
- data.tar.gz: 29586cde0a17f8883547faaf795e3036d3f5812f
3
+ metadata.gz: 6b6c993501e61cdb2ec6a8ce4edbdea2e3e39fd6
4
+ data.tar.gz: 443bd8f3022dad55ae17fc09ea69f08714c494a1
5
5
  SHA512:
6
- metadata.gz: 65273eb41b76300f58b97b214963e1fe6c512cd66721ca9a9974e1d5a3427cd6a7d59000a09852e06e3abac26c982cccd4dbf9dfab5ad7cc5bd8d8c65bbb3860
7
- data.tar.gz: 9dd859a7c4ffc2e6c1b902a4ac667876d90c74c29c04739d798293f61d734c4ccdaddb8a0e41c6c67b594a0785bd450e2ca234f0629178c7060a187e1932c8a8
6
+ metadata.gz: d6de02b33c8ab0dcca44743f7674f7ef5288e7ec42a79146d0b12318c7d7fc810d672616d6afc0c8e25751ab9342c5f7e045e514ae767d8043b43780b94e11ce
7
+ data.tar.gz: 5e0fda6abb5f3e20a684a4ea1d0169779057c0a0a78f1afc33189ae183297f973b1e077395d62032f861f911642de107c1f815e96a9881d89ad0a9ff06e8ea3d
@@ -4,5 +4,5 @@
4
4
  # regenerated.
5
5
 
6
6
  module Azure::Web::Mgmt::V2015_04_01
7
- VERSION = '0.15.0'
7
+ VERSION = '0.15.1'
8
8
  end
@@ -4,5 +4,5 @@
4
4
  # regenerated.
5
5
 
6
6
  module Azure::Web::Mgmt::V2015_08_01
7
- VERSION = '0.15.0'
7
+ VERSION = '0.15.1'
8
8
  end
@@ -4,5 +4,5 @@
4
4
  # regenerated.
5
5
 
6
6
  module Azure::Web::Mgmt::V2016_03_01
7
- VERSION = '0.15.0'
7
+ VERSION = '0.15.1'
8
8
  end
@@ -4,5 +4,5 @@
4
4
  # regenerated.
5
5
 
6
6
  module Azure::Web::Mgmt::V2016_08_01
7
- VERSION = '0.15.0'
7
+ VERSION = '0.15.1'
8
8
  end
@@ -4,5 +4,5 @@
4
4
  # regenerated.
5
5
 
6
6
  module Azure::Web::Mgmt::V2016_09_01
7
- VERSION = '0.15.0'
7
+ VERSION = '0.15.1'
8
8
  end
@@ -2,8 +2,8 @@
2
2
  # Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  # Licensed under the MIT License. See License.txt in the project root for license information.
4
4
 
5
- module Azure::ARM
6
- # The Azure::ARM::Configurable module provides basic configuration for Azure ARM activities.
5
+ module Azure::Common
6
+ # The Azure::Common::Configurable module provides basic configuration for Azure activities.
7
7
  module Configurable
8
8
  # @return [String] Azure tenant id (also known as domain).
9
9
  attr_accessor :tenant_id
@@ -25,11 +25,11 @@ module Azure::ARM
25
25
 
26
26
  class << self
27
27
  #
28
- # List of configurable keys for {Azure::ARM::Client}.
28
+ # List of configurable keys for {Azure::Common::Client}.
29
29
  # @return [Array] of option keys.
30
30
  #
31
31
  def keys
32
- @keys ||= [:tenant_id, :client_id, :client_secret, :subscription_id, :active_directory_settings, :credentials]
32
+ @keys ||= [:tenant_id, :client_id, :client_secret, :subscription_id, :active_directory_settings]
33
33
  end
34
34
  end
35
35
 
@@ -45,11 +45,23 @@ module Azure::ARM
45
45
  # This will also creates MsRest::TokenCredentials to be used for subsequent Azure Resource Manager clients.
46
46
  #
47
47
  def reset!(options = {})
48
- Azure::ARM::Configurable.keys.each do |key|
49
- default_value = Azure::ARM::Default.options[key]
48
+ Azure::Common::Configurable.keys.each do |key|
49
+ default_value = Azure::Common::Default.options[key]
50
50
  instance_variable_set(:"@#{key}", options.fetch(key, default_value))
51
51
  end
52
52
 
53
+ fail ArgumentError, 'tenant_id is nil' if self.tenant_id.nil?
54
+ fail ArgumentError, 'client_id is nil' if self.client_id.nil?
55
+ fail ArgumentError, 'client_secret is nil' if self.client_secret.nil?
56
+ fail ArgumentError, 'subscription_id is nil' if self.subscription_id.nil?
57
+ fail ArgumentError, 'active_directory_settings is nil' if self.active_directory_settings.nil?
58
+
59
+ default_value = MsRest::TokenCredentials.new(
60
+ MsRestAzure::ApplicationTokenProvider.new(
61
+ self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
62
+
63
+ instance_variable_set(:"@credentials", options.fetch(:credentials, default_value))
64
+
53
65
  self
54
66
  end
55
67
 
@@ -62,11 +74,12 @@ module Azure::ARM
62
74
  #
63
75
  # configures configurable options to default values
64
76
  #
65
- def setup_options
77
+ def setup_default_options
66
78
  opts = {}
67
- Azure::ARM::Configurable.keys.map do |key|
68
- opts[key] = Azure::ARM::Default.options[key]
79
+ Azure::Common::Configurable.keys.map do |key|
80
+ opts[key] = Azure::Common::Default.options[key]
69
81
  end
82
+
70
83
  opts
71
84
  end
72
85
  end
@@ -2,8 +2,7 @@
2
2
  # Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  # Licensed under the MIT License. See License.txt in the project root for license information.
4
4
 
5
- module Azure::ARM
6
- # Default configuration options for {Azure::ARM.Client}
5
+ module Azure::Common
7
6
  module Default
8
7
  class << self
9
8
  #
@@ -38,16 +37,6 @@ module Azure::ARM
38
37
  ENV['AZURE_SUBSCRIPTION_ID']
39
38
  end
40
39
 
41
- #
42
- # Default Azure credentials to authorize HTTP requests made by the service client.
43
- # @return [MsRest::ServiceClientCredentials] Azure credentials to authorize HTTP requests made by the service client.
44
- #
45
- def credentials
46
- MsRest::TokenCredentials.new(
47
- MsRestAzure::ApplicationTokenProvider.new(
48
- self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
49
- end
50
-
51
40
  #
52
41
  # Default Azure Active Directory Service Settings.
53
42
  # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure Active Directory Service Settings.
@@ -61,7 +50,7 @@ module Azure::ARM
61
50
  # @return [Hash] Configuration options.
62
51
  #
63
52
  def options
64
- Hash[Azure::ARM::Configurable.keys.map{|key| [key, send(key)]}]
53
+ Hash[Azure::Common::Configurable.keys.map { |key| [key, send(key)]}]
65
54
  end
66
55
  end
67
56
  end
@@ -299,7 +299,7 @@ module Azure::Web::Profiles::Latest::Mgmt
299
299
 
300
300
  def initialize(options = {})
301
301
  if options.is_a?(Hash) && options.length == 0
302
- @options = setup_options
302
+ @options = setup_default_options
303
303
  else
304
304
  @options = options
305
305
  end
@@ -12,22 +12,12 @@ module Azure::Web::Profiles::Latest::Mgmt
12
12
  # Client class for the Latest profile SDK.
13
13
  #
14
14
  class Client < WebClass
15
- include Azure::ARM::Configurable
15
+ include Azure::Common::Configurable
16
16
 
17
17
 
18
18
  def initialize(options = {})
19
19
  super(options)
20
20
  end
21
21
 
22
- def credentials
23
- if @credentials.nil?
24
- self.active_directory_settings ||= Azure::ARM::Default.active_directory_settings
25
-
26
- @credentials = MsRest::TokenCredentials.new(
27
- MsRestAzure::ApplicationTokenProvider.new(
28
- self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
29
- end
30
- @credentials
31
- end
32
22
  end
33
23
  end
@@ -3,5 +3,5 @@
3
3
  # Licensed under the MIT License. See License.txt in the project root for license information.
4
4
 
5
5
  module Azure::Web::Mgmt
6
- VERSION = '0.15.0'
6
+ VERSION = '0.15.1'
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: azure_mgmt_web
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0
4
+ version: 0.15.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Microsoft Corporation
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-17 00:00:00.000000000 Z
11
+ date: 2017-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler