rtyler
/
vagrant-aws
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move credentials validation and error message 

AWS info (credentials and config) verification is done at validate and
the error message is read from the locales yml file.
This commit is contained in:
Alexandre Constantino 2016-01-27 12:50:45 +00:00
parent 006b38c079
commit a3a8e22f3a
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -90,7 +90,8 @@ are being launched with a security group that allows SSH access.
Note: if you don't configure `aws.access_key_id` or `aws_secret_access_key`
it will attempt to read credentials from environment variables first and then
from `$HOME/.aws/`. You can choose your AWS profile and files location by using
`aws.aws_profile` and `aws.aws_dir`.
`aws.aws_profile` and `aws.aws_dir`, however environment variables will always
have precedence as defined by the [AWS documentation](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html).
## Box Format

28
lib/vagrant-aws/config.rb
View File

@ -324,8 +324,12 @@ module VagrantPlugins
puts "----------------------------------------"
#
if @access_key_id == UNSET_VALUE or @secret_access_key == UNSET_VALUE
@aws_profile = 'default' if @aws_profile == UNSET_VALUE
@aws_dir = ENV['HOME'] + '/.aws/' if @aws_dir == UNSET_VALUE
@region, @access_key_id, @secret_access_key, @session_token = Credentials.new.get_aws_info(@aws_profile, @aws_dir)
else
@aws_profile = nil
@aws_dir = nil
@session_token = nil
end
puts "'" + @region.to_s + "'"
@ -439,6 +443,10 @@ module VagrantPlugins
def validate(machine)
errors = _detected_errors
errors << I18n.t("vagrant_aws.config.aws_info_required",
:profile => @aws_profile, :location => @aws_dir) if \
@aws_profile and (@access_key_id.nil? or @secret_access_key.nil? or @region.nil?)
errors << I18n.t("vagrant_aws.config.region_required") if @region.nil?
if @region
@ -488,20 +496,18 @@ module VagrantPlugins
# AWS credentials specification:
# http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-config-files
def get_aws_info(profile = nil, location = nil)
def get_aws_info(profile, location)
# read from environment variables
aws_region, aws_id, aws_secret, aws_token = read_aws_environment()
# if nothing there, then read from files
if not is_aws_configured(aws_id, aws_secret)
profile = 'default' if profile == nil or profile == UNSET_VALUE
location = ENV['HOME'] + '/.aws/' if location == nil or location == UNSET_VALUE
if not is_aws_configured(aws_id, aws_secret, aws_region)
aws_region, aws_id, aws_secret, aws_token = read_aws_files(profile, location)
end
if not is_aws_configured(aws_id, aws_secret)
msg = "One or more of the needed AWS credentials are missing."
msg += " Does profile '" + profile + "' exists at " + location + " ?"
raise Exception.new(msg)
end
#if not is_aws_configured(aws_id, aws_secret, aws_region)
# msg = "One or more of the needed AWS credentials are missing."
# msg += " Does profile '" + profile + "' exists at " + location + " ?"
# raise Exception.new(msg)
#end
aws_region = nil if aws_region == ''
aws_id = nil if aws_id == ''
aws_secret = nil if aws_secret == ''
@ -567,8 +573,8 @@ module VagrantPlugins
return aws_region, aws_id, aws_secret, aws_token
end
def is_aws_configured(aws_id, aws_secret)
return true if aws_id.to_s != '' and aws_secret.to_s != ''
def is_aws_configured(aws_id, aws_secret, aws_region)
return true if aws_id.to_s != '' and aws_secret.to_s != '' and aws_region.to_s != ''
return false
end
end

3
locales/en.yml
View File

@ -76,6 +76,9 @@ en:
A secret access key is required via "secret_access_key"
subnet_id_required_with_public_ip: |-
If you assign a public IP address to an instance in a VPC, a subnet must be specifed via "subnet_id"
aws_info_required: |-
One or more of the needed AWS credentials are missing. No environment variables
are set nor profile '%{profile}' exists at '%{location}'
errors:
fog_error: |-