elastic-beanstalk 0.1.2 → 0.1.3

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -29,8 +29,8 @@ namespace :eb do
     # resolve the version and set the APP_VERSION environment variable
     resolve_version(args)
 
-    # configure aws credentials
-    AWS.config(credentials)
+    # configure aws credentials.  Depending on the called task, this may not be necessary parent task should call #credentials! for validation.
+    AWS.config(credentials) unless @credentials.nil?
 
     # configure aws region if specified in the eb.yml
     AWS.config(region: EbConfig.region) unless EbConfig.region.nil?
@@ -122,6 +122,9 @@ namespace :eb do
     #   the artifact on bamboo. The deploy plan will handle this separately.
     from_time = Time.now
 
+    # ensure credentials
+    credentials!
+
     # check package file
     raise "Package file not found (#{absolute_package_file}).  Be sure to run the :package task subsequent to any :deploy attempts." if !File.exists? absolute_package_file
 
@@ -219,11 +222,19 @@ namespace :eb do
     puts "Destroy issued to AWS."
   end
 
-  # load from a user directory i.e. ~/.aws.acme.yml
-  def credentials
+  # validate file exists
+  def credentials!
+    raise "\nFailed to load AWS secrets: #{aws_secrets_file}.\nFile contents should look like:\naccess_key_id: XXXX\nsecret_access_key: XXXX\n\n" unless File.exists?(aws_secrets_file)
+    credentials
 
-    raise "Failed to load AWS secrets: #{aws_secrets_file}.\nFile contents should look like:\naccess_key_id: XXXX\nsecret_access_key: XXXX" unless File.exists?(aws_secrets_file)
+    ['access_key_id', 'secret_access_key'].each do |key|
+      value = credentials[key]
+      raise "\nThe #{key} must be specified in the #{aws_secrets_file}.\n\n" if value.nil?
+    end
+  end
 
+  # load from a user directory i.e. ~/.aws.acme.yml
+  def credentials
     # load secrets from the user home directory
     @credentials = YAML.safe_load_file(aws_secrets_file) if @credentials.nil?
     @credentials

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -628932779627664542
+      hash: 2569835408244002675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -628932779627664542
+      hash: 2569835408244002675
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25