Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to collect region from aws_config_file for specified profile #620

Merged
merged 3 commits into from
Dec 3, 2019
Merged

Fix to collect region from aws_config_file for specified profile #620

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cc627a
Fix to collect region from aws_config_file
dheerajd-msys Nov 26, 2019
b452de8
fix chefstyle offense
dheerajd-msys Nov 26, 2019
445bc0c
minor fix to collect the region
dheerajd-msys Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/chef/knife/ec2_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

#
# Author:: Seth Chisamore (<schisamo@chef.io>)
# Copyright:: Copyright (c) 2011-2019 Chef Software, Inc.
Expand Down Expand Up @@ -67,8 +68,7 @@ def self.included(includer)
option :region,
long: "--region REGION",
description: "Your AWS region",
proc: Proc.new { |key| Chef::Config[:knife][:region] = key },
default: "us-east-1"
proc: Proc.new { |key| Chef::Config[:knife][:region] = key }

option :use_iam_profile,
long: "--use-iam-profile",
Expand All @@ -81,8 +81,8 @@ def self.included(includer)

def connection_string
conn = {}
conn[:region] = locate_config_value(:region)
Chef::Log.debug "Using AWS region #{locate_config_value(:region)}"
conn[:region] = locate_config_value(:region) || "us-east-1"
Chef::Log.debug "Using AWS region #{conn[:region]}"
conn[:credentials] =
if locate_config_value(:use_iam_profile)
Chef::Log.debug "Using iam profile for authentication as use_iam_profile set"
Expand Down Expand Up @@ -145,7 +145,6 @@ def server_hashes(server_obj)
%w{ebs_optimized image_id instance_id instance_type key_name platform public_dns_name public_ip_address private_dns_name private_ip_address root_device_type}.each do |id|
server_data[id] = server_obj.instances[0].send(id)
end

server_data["availability_zone"] = server_obj.instances[0].placement.availability_zone
server_data["groups"] = server_obj.groups.map(&:name)
server_data["iam_instance_profile"] = ( server_obj.instances[0].iam_instance_profile.nil? ? nil : server_obj.instances[0].iam_instance_profile.arn[%r{instance-profile/(.*)}] )
Expand Down Expand Up @@ -204,7 +203,6 @@ def validate_aws_config!(keys = %i{aws_access_key_id aws_secret_access_key})
errors = [] # track all errors so we report on all of them

validate_aws_config_file! if locate_config_value(:aws_config_file)

unless locate_config_value(:use_iam_profile) # skip config file / key validation if we're using iam profile
# validate the creds file if:
# aws keys have not been passed in config / CLI and the default cred file location does exist
Expand Down Expand Up @@ -331,7 +329,6 @@ def validate_aws_credential_file!
profile = locate_config_value(:aws_profile)

Chef::Log.debug "Using AWS profile #{profile}"

entries = if aws_creds.values.first.key?("AWSAccessKeyId")
aws_creds.values.first
else
Expand Down