knife-ec2 1.0.26 → 1.0.28

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: ada420d34d94212017c8efa482439abcdb0de539fad09552eb18143105f7b01a
4
- data.tar.gz: 52cf7f8bd1b23fc63efe61375f3d45730568db2dcb94f90723bb0ecaa34efe6e
3
+ metadata.gz: f115804bddb4f36e18870568560da4bca854f850fa895816adcb2ae1b6e67eff
4
+ data.tar.gz: e0cbf443b6f2692c267420c3568d78931da4291cf7a61db2f0de55f7c8c72e48
5
5
  SHA512:
6
- metadata.gz: 9de9b4060e313a5ae678fb2a6a9b31295a4a3c1f6d55cc2d68167be9aef7644d24c796de8813f7d02321fd7dea9f1e9f57c4729ee0cff153fc428a707707c692
7
- data.tar.gz: 375c70b99a4ad7e860f919cb5f89c2f87f68ab04a7fdc7fe63d2e27b57040a75fba71b6fae11e15e37a79e4f0f9f4b58a44530d316c520b931172bb10d0282f6
6
+ metadata.gz: d0a6ae2f3cba5443ac215d2fc19ad40d3dbb80eda1440864149ed7aadcd3f22c5f4dd773658f23c2f4cf3d366a47ae54aee80f69f6378a936842b67b4870fbd1
7
+ data.tar.gz: 8b80a337f067dbc26430fe9ef100e12ab5d2f7222e42e44ebd541aaf7db483f190b20167003c4b38cf2af12968525963b3c4d1282bbe136ec45bbe23c39140af
@@ -576,6 +576,7 @@ class Chef
576
576
  # When options connection_protocol and connection_port are not provided
577
577
  # It will set as default
578
578
  def plugin_setup!
579
+ validate_aws_config!(%i{image aws_access_key_id aws_secret_access_key})
579
580
  config[:connection_protocol] ||= connection_protocol_ec2
580
581
  config[:connection_port] ||= connection_port
581
582
  end
@@ -592,8 +593,6 @@ class Chef
592
593
  end
593
594
  create_key_pair unless config_value(:ssh_key_name)
594
595
 
595
- validate_aws_config!(%i{image ssh_key_name aws_access_key_id aws_secret_access_key})
596
-
597
596
  validate_nics! if config_value(:network_interfaces)
598
597
 
599
598
  if ami.nil?
@@ -1397,7 +1396,6 @@ class Chef
1397
1396
  return @connection_protocol_ec2 if @connection_protocol_ec2
1398
1397
 
1399
1398
  default_protocol = is_image_windows? ? "winrm" : "ssh"
1400
-
1401
1399
  from_url = host_descriptor =~ %r{^(.*)://} ? $1 : nil
1402
1400
  from_cli = config[:connection_protocol]
1403
1401
  from_knife = Chef::Config[:knife][:connection_protocol]
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Ec2
3
- VERSION = "1.0.26".freeze
3
+ VERSION = "1.0.28".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.26
4
+ version: 1.0.28
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: 2019-12-27 00:00:00.000000000 Z
11
+ date: 2020-01-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef