knife-ec2 1.0.28 → 1.0.31

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chef/knife/ec2_ami_list.rb +1 -1
  3. data/lib/chef/knife/ec2_eip_list.rb +1 -1
  4. data/lib/chef/knife/ec2_flavor_list.rb +1 -1
  5. data/lib/chef/knife/ec2_securitygroup_list.rb +1 -1
  6. data/lib/chef/knife/ec2_server_create.rb +9 -3
  7. data/lib/chef/knife/ec2_server_delete.rb +1 -1
  8. data/lib/chef/knife/ec2_server_list.rb +1 -1
  9. data/lib/chef/knife/ec2_subnet_list.rb +1 -1
  10. data/lib/chef/knife/ec2_vpc_list.rb +1 -1
  11. data/lib/chef/knife/{ec2_base.rb → helpers/ec2_base.rb} +0 -0
  12. data/lib/chef/knife/{s3_source.rb → helpers/s3_source.rb} +0 -0
  13. data/lib/knife-ec2/version.rb +1 -1
  14. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f115804bddb4f36e18870568560da4bca854f850fa895816adcb2ae1b6e67eff
4
- data.tar.gz: e0cbf443b6f2692c267420c3568d78931da4291cf7a61db2f0de55f7c8c72e48
3
+ metadata.gz: 191cb9ed42a8c340aea59e089721e340d97609de0069aa917aab657a3e28f110
4
+ data.tar.gz: a43f3521bc5c5990c4e96eb63c65da53101c5b214e3279d8c3b5a0f79d8f51be
5
5
  SHA512:
6
- metadata.gz: d0a6ae2f3cba5443ac215d2fc19ad40d3dbb80eda1440864149ed7aadcd3f22c5f4dd773658f23c2f4cf3d366a47ae54aee80f69f6378a936842b67b4870fbd1
7
- data.tar.gz: 8b80a337f067dbc26430fe9ef100e12ab5d2f7222e42e44ebd541aaf7db483f190b20167003c4b38cf2af12968525963b3c4d1282bbe136ec45bbe23c39140af
6
+ metadata.gz: de93760c5ed5ca050beda5a13a4c52dd797585c1d2bac5812802b6b8db84a0a4037a9055c5f834846e1220996551dc18f76e163a319f5fb476e508eb22b788b3
7
+ data.tar.gz: a90c9495541b046fca2265e5750f56db14749a745550f670247ce9838a4a2c341fe2e413389713ee5907acc5fefc440127c07ae58bd14244e6274af23dfe0e26
data/lib/chef/knife/ec2_ami_list.rb CHANGED
@@ -15,7 +15,7 @@
15
15
  # See the License for the specific language governing permissions and
16
16
  # limitations under the License.
17
17
 
18
- require_relative "ec2_base"
18
+ require_relative "helpers/ec2_base"
19
19
 
20
20
  class Chef
21
21
  class Knife
data/lib/chef/knife/ec2_eip_list.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "ec2_base"
19
+ require_relative "helpers/ec2_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/ec2_flavor_list.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "ec2_base"
19
+ require_relative "helpers/ec2_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/ec2_securitygroup_list.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "ec2_base"
19
+ require_relative "helpers/ec2_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/ec2_server_create.rb CHANGED
@@ -17,8 +17,8 @@
17
17
  # limitations under the License.
18
18
  #
19
19
 
20
- require_relative "ec2_base"
21
- require_relative "s3_source"
20
+ require_relative "helpers/ec2_base"
21
+ require_relative "helpers/s3_source"
22
22
  require "chef/knife/bootstrap"
23
23
 
24
24
  class Chef
@@ -1409,7 +1409,13 @@ class Chef
1409
1409
  def server_name
1410
1410
  return nil unless server
1411
1411
 
1412
- server.public_dns_name || server.private_dns_name || server.private_ip_address
1412
+ if !server.public_dns_name.empty?
1413
+ server.public_dns_name
1414
+ elsif !server.private_dns_name.empty?
1415
+ server.private_dns_name
1416
+ else
1417
+ server.private_ip_address
1418
+ end
1413
1419
  end
1414
1420
 
1415
1421
  alias host_descriptor server_name
data/lib/chef/knife/ec2_server_delete.rb CHANGED
@@ -17,7 +17,7 @@
17
17
  # limitations under the License.
18
18
  #
19
19
 
20
- require_relative "ec2_base"
20
+ require_relative "helpers/ec2_base"
21
21
 
22
22
  class Chef
23
23
  class Knife
data/lib/chef/knife/ec2_server_list.rb CHANGED
@@ -17,7 +17,7 @@
17
17
  # limitations under the License.
18
18
  #
19
19
 
20
- require_relative "ec2_base"
20
+ require_relative "helpers/ec2_base"
21
21
 
22
22
  class Chef
23
23
  class Knife
data/lib/chef/knife/ec2_subnet_list.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "ec2_base"
19
+ require_relative "helpers/ec2_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/chef/knife/ec2_vpc_list.rb CHANGED
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "ec2_base"
19
+ require_relative "helpers/ec2_base"
20
20
 
21
21
  class Chef
22
22
  class Knife
data/lib/knife-ec2/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Ec2
3
- VERSION = "1.0.28".freeze
3
+ VERSION = "1.0.31".freeze
4
4
  MAJOR, MINOR, TINY = VERSION.split(".")
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-ec2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.28
4
+ version: 1.0.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chef Software, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-15 00:00:00.000000000 Z
11
+ date: 2020-02-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef
@@ -61,7 +61,6 @@ extra_rdoc_files: []
61
61
  files:
62
62
  - LICENSE
63
63
  - lib/chef/knife/ec2_ami_list.rb
64
- - lib/chef/knife/ec2_base.rb
65
64
  - lib/chef/knife/ec2_eip_list.rb
66
65
  - lib/chef/knife/ec2_flavor_list.rb
67
66
  - lib/chef/knife/ec2_securitygroup_list.rb
@@ -70,7 +69,8 @@ files:
70
69
  - lib/chef/knife/ec2_server_list.rb
71
70
  - lib/chef/knife/ec2_subnet_list.rb
72
71
  - lib/chef/knife/ec2_vpc_list.rb
73
- - lib/chef/knife/s3_source.rb
72
+ - lib/chef/knife/helpers/ec2_base.rb
73
+ - lib/chef/knife/helpers/s3_source.rb
74
74
  - lib/knife-ec2/version.rb
75
75
  homepage: https://github.com/chef/knife-ec2
76
76
  licenses: