knife-azure 2.0.13 → 2.0.17

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
  SHA256:
3
- metadata.gz: 9baf62dbe0e3f274214deaf426511698b3ed0acbcb5cacbfa2e1d0b7d557a6d2
4
- data.tar.gz: 634f4598fbb9b5b65779d211df0de9fa6062635c4b3ebf56d31909547b47980a
3
+ metadata.gz: 55796c18ca369c438d235edbbe415025af68ad22b27ca3a9a41ab926fbb5c0ac
4
+ data.tar.gz: dfd5cc5a0bc90d0b42994a417deedd75041f224e08ac63a62049b972c362246b
5
5
  SHA512:
6
- metadata.gz: f15b38070e1a624376327ff112dc753d53d717363b11c60057373ce14e9a3b91bf32264718d44456d3e4b89ca839371d35ac08b9b8bd843c9219c00a84ed8089
7
- data.tar.gz: 763b6e6b17c6e14c0ea32e6bcb0a3b79c1c2b37984e0ed25a84f4259eaa56a23ced45eafc46d3d691dbd8dd0e23cbefadf7414acb8baa7ab7fbff0b440a51515
6
+ metadata.gz: 411c2d695a55b7b2bee0ebfac1883b61ffe957388e02f391f2f6f6c1b7a907600d25f9a8768b5706e3df9c564462e10a606bed5714593082dc8491b87cda00e7
7
+ data.tar.gz: b1d033dd7e856af827b365c5018b5ff90a4f91409c318b52146476f79f8c32a6c2b53d68456645c2db7c1f9b7cc7536fb519622cd5b969fb5a08ffa1fb9aed80
@@ -215,7 +215,7 @@ module Azure
215
215
  if e.body
216
216
  err_json = JSON.parse(e.response.body)
217
217
  if err_json["error"]["code"] == "ResourceNotFound"
218
- return false
218
+ false
219
219
  else
220
220
  raise e
221
221
  end
@@ -229,7 +229,7 @@ module Azure
229
229
  if e.body
230
230
  err_json = JSON.parse(e.response.body)
231
231
  if err_json["error"]["code"] == "ResourceNotFound"
232
- return false
232
+ false
233
233
  else
234
234
  raise e
235
235
  end
@@ -41,7 +41,7 @@ module Azure::ARM
41
41
  if error.body
42
42
  err_json = JSON.parse(error.response.body)
43
43
  if err_json["error"]["code"] == "ResourceNotFound"
44
- return false
44
+ false
45
45
  else
46
46
  raise error
47
47
  end
@@ -32,7 +32,7 @@ class Chef
32
32
 
33
33
  deps do
34
34
  require "securerandom"
35
- include Knife::AzurermBase.load_deps
35
+ include Knife::AzurermBase
36
36
  end
37
37
 
38
38
  banner "knife azurerm server create (options)"
@@ -30,7 +30,7 @@ class Chef
30
30
  # These two are needed for the '--purge' deletion case
31
31
  require "chef/node"
32
32
  require "chef/api_client"
33
- include Knife::AzurermBase.load_deps
33
+ include Knife::AzurermBase
34
34
  end
35
35
 
36
36
  banner "knife azurerm server delete SERVER [SERVER] (options)"
@@ -27,7 +27,7 @@ class Chef
27
27
  banner "knife azurerm server list (options)"
28
28
 
29
29
  deps do
30
- include Knife::AzurermBase.load_deps
30
+ include Knife::AzurermBase
31
31
  end
32
32
 
33
33
  def run
@@ -27,7 +27,7 @@ class Chef
27
27
  banner "knife azurerm server show SERVER (options)"
28
28
 
29
29
  deps do
30
- include Knife::AzurermBase.load_deps
30
+ include Knife::AzurermBase
31
31
  end
32
32
 
33
33
  def run
@@ -30,7 +30,7 @@ class Chef
30
30
 
31
31
  deps do
32
32
  require "time"
33
- include Knife::AzurermBase.load_deps
33
+ include Knife::AzurermBase
34
34
  end
35
35
 
36
36
  banner "knife bootstrap azurerm SERVER (options)"
@@ -29,7 +29,7 @@ class Chef
29
29
  deps do
30
30
  require "readline"
31
31
  require "chef/json_compat"
32
- require_relative "../../azure/service_management/ASM_interface"
32
+ require_relative "../../../azure/service_management/ASM_interface"
33
33
  end
34
34
 
35
35
  option :azure_subscription_id,
@@ -70,7 +70,7 @@ class Chef
70
70
  ui.error('Invalid image. Use the command "knife azure image list" to verify the image name')
71
71
  exit 1
72
72
  else
73
- return target_image[0].os == "Windows"
73
+ target_image[0].os == "Windows"
74
74
  end
75
75
  end
76
76
 
@@ -33,7 +33,7 @@ class Chef
33
33
  deps do
34
34
  require "readline"
35
35
  require "chef/json_compat"
36
- require_relative "../../azure/resource_management/ARM_interface"
36
+ require_relative "../../../azure/resource_management/ARM_interface"
37
37
  require "chef/mixin/shell_out"
38
38
  require "time"
39
39
  require "json"
@@ -137,12 +137,12 @@ class Chef
137
137
  def is_token_valid?(token_details)
138
138
  time_difference = Time.parse(token_details[:expiry_time]) - Time.now.utc
139
139
  if time_difference <= 0
140
- return false
140
+ false
141
141
  elsif time_difference <= 600 # 600sec = 10min
142
142
  # This is required otherwise a long running command may fail inbetween if the token gets expired.
143
143
  raise "Token will expire within 10 minutes. Please run '#{@azure_prefix} login' command"
144
144
  else
145
- return true
145
+ true
146
146
  end
147
147
  end
148
148
 
@@ -17,7 +17,7 @@
17
17
 
18
18
  module Knife
19
19
  module Azure
20
- VERSION = "2.0.13".freeze
20
+ VERSION = "2.0.17".freeze
21
21
  MAJOR, MINOR, TINY = VERSION.split(".")
22
22
  end
23
23
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-azure
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.13
4
+ version: 2.0.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Barry Davis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-02-12 00:00:00.000000000 Z
12
+ date: 2020-04-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: chef
@@ -83,22 +83,22 @@ dependencies:
83
83
  name: azure_mgmt_storage
84
84
  requirement: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - "~>"
87
- - !ruby/object:Gem::Version
88
- version: '0.17'
89
86
  - - ">="
90
87
  - !ruby/object:Gem::Version
91
- version: 0.17.3
88
+ version: 0.20.0
89
+ - - "~>"
90
+ - !ruby/object:Gem::Version
91
+ version: '0.20'
92
92
  type: :runtime
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - "~>"
97
- - !ruby/object:Gem::Version
98
- version: '0.17'
99
96
  - - ">="
100
97
  - !ruby/object:Gem::Version
101
- version: 0.17.3
98
+ version: 0.20.0
99
+ - - "~>"
100
+ - !ruby/object:Gem::Version
101
+ version: '0.20'
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: azure_mgmt_network
104
104
  requirement: !ruby/object:Gem::Requirement