simple_deploy 0.9.2 → 0.10.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebaeaca78fc47bc6bccf96bc14c6e9e45674d2d2
-  data.tar.gz: f73df170ccaa5d0f646d87e084e4815e62ef3c3d
+  metadata.gz: 087c4e0c37329c2f21af41d9f923315eff58b30b
+  data.tar.gz: c2986b982379d6479e4c171dd45dd45dc7bac1f3
 SHA512:
-  metadata.gz: 1c4c6995dc63e8ae6126cba0c4c7c391b50f854b1c1b2a291a4e2b27db0a645166c841a19a46fbb9ad057496979ec03bfe3cf897e29c3524c8996df3ac56ffb1
-  data.tar.gz: 2385d7000d4fba22b0ede10ff47a1ddf7230970565ab5fe8780baaf4b22da15e38886563cbf8506e2d3d2aada49bdf844dc321096fddd2a0549cdbe3cb4e1586
+  metadata.gz: c851300e97e2f000dcfcea67e0c1c270d48ef866cfda0c92d822c0c55c2a1cb1d4d4638f2e1f25e4e1e74f73d6a9db08bb8ca3e3ff342aa2e784e5a8bf0953f5
+  data.tar.gz: a838a2de6528b110e98318ccba7af8ca47fb3ae79509060bd2f5f1a3a333c869da2f772971d2045e6758a484803818e62e03ec06bc8e0a957d1432ffe2f0e970

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## HEAD
 
+* Add support for setting configuration through env vars
+* Add support for temporary AWS credentials
+
 ## v0.9.2 (04/29/14):
 
 * Skip nested stack if status is deleted (thanks @liwenbing)

data/lib/simple_deploy/aws/cloud_formation.rb

@@ -4,12 +4,12 @@ module SimpleDeploy
   class AWS
     class CloudFormation
 
+      include Helpers
+
       def initialize
-        @config = SimpleDeploy.config
-        @logger = SimpleDeploy.logger
-        @connect = Fog::AWS::CloudFormation.new :aws_access_key_id     => @config.access_key,
-                                                :aws_secret_access_key => @config.secret_key,
-                                                :region                => @config.region
+        @config  = SimpleDeploy.config
+        @logger  = SimpleDeploy.logger
+        @connect = Fog::AWS::CloudFormation.new connection_args
       end
 
       def create(args)

data/lib/simple_deploy/aws/helpers.rb

@@ -0,0 +1,20 @@
+module SimpleDeploy
+  class AWS
+    module Helpers
+
+      def connection_args
+        {
+          aws_access_key_id:     @config.access_key,
+          aws_secret_access_key: @config.secret_key,
+          region:                @config.region
+        }.tap do |a|
+
+          if @config.temporary_credentials?
+            a.merge!({ aws_session_token: @config.security_token })
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/simple_deploy/aws/instance_reader.rb

@@ -1,14 +1,19 @@
 module SimpleDeploy
   class AWS
     class InstanceReader
+
+      include Helpers
+
       def initialize
-        @config  = SimpleDeploy.config
+        @config      = SimpleDeploy.config
+        @asg_connect = Fog::AWS::AutoScaling.new connection_args
+        @ec2_connect = Fog::Compute::AWS.new connection_args
       end
 
       def list_stack_instances(stack_name)
 
         instances = []
-       
+
         #Nested stack
         nested_stacks = nested_stacks_names(stack_name)
         instances = nested_stacks.map {|stack| list_stack_instances stack }.flatten if nested_stacks.any?
@@ -28,11 +33,7 @@ module SimpleDeploy
       private
 
       def list_instances(asg_id)
-        @asg ||= Fog::AWS::AutoScaling.new :aws_access_key_id     => @config.access_key,
-                                           :aws_secret_access_key => @config.secret_key,
-                                           :region                => @config.region
-
-        body = @asg.describe_auto_scaling_groups('AutoScalingGroupNames' => [asg_id]).body
+        body = @asg_connect.describe_auto_scaling_groups('AutoScalingGroupNames' => [asg_id]).body
         result = body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].last
         return [] unless result
 
@@ -40,12 +41,8 @@ module SimpleDeploy
       end
 
       def describe_instances(instances)
-        @ec2 ||= Fog::Compute::AWS.new :aws_access_key_id     => @config.access_key,
-                                       :aws_secret_access_key => @config.secret_key,
-                                       :region                => @config.region
-
-        @ec2.describe_instances('instance-state-name' => 'running',
-                                'instance-id' => instances).body['reservationSet']
+        @ec2_connect.describe_instances('instance-state-name' => 'running',
+                                        'instance-id' => instances).body['reservationSet']
       end
 
       def cloud_formation

data/lib/simple_deploy/aws/simpledb.rb

@@ -4,11 +4,11 @@ module SimpleDeploy
   class AWS
     class SimpleDB
 
+      include Helpers
+
       def initialize
-        c = SimpleDeploy.config
-        @connect = Fog::AWS::SimpleDB.new :aws_access_key_id     => c.access_key,
-                                          :aws_secret_access_key => c.secret_key,
-                                          :region                => c.region
+        @config  = SimpleDeploy.config
+        @connect = Fog::AWS::SimpleDB.new connection_args
       end
 
       def domains
@@ -31,7 +31,7 @@ module SimpleDeploy
         options = { 'ConsistentRead' => true }
         data = {}
         next_token = nil
-        
+
         while true
           options.merge! 'NextToken' => next_token
           chunk = @connect.select(query, options).body

data/lib/simple_deploy/aws.rb

@@ -1,3 +1,4 @@
+require "simple_deploy/aws/helpers"
 require "simple_deploy/aws/cloud_formation"
 require "simple_deploy/aws/cloud_formation/error"
 require "simple_deploy/aws/instance_reader"

data/lib/simple_deploy/cli/attributes.rb

@@ -23,12 +23,14 @@ EOS
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name to manage", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         @stack = Stack.new :name        => @opts[:name],
                            :environment => @opts[:environment]

data/lib/simple_deploy/cli/clone.rb

@@ -21,7 +21,7 @@ EOS
           opt :environment, "Set the target environment", :type => :string
           opt :input_stack, "Read outputs from given stack(s) and map them \
 to parameter inputs in the new stack. These will be passed to inputs with \
-matching or pluralized names. Can be specified multiple times.", :type  => :string, 
+matching or pluralized names. Can be specified multiple times.", :type  => :string,
                                                                  :multi => true
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
@@ -30,12 +30,17 @@ matching or pluralized names. Can be specified multiple times.", :type  => :stri
           opt :attributes, "= separated attribute and it's value", :type  => :string,
                                                                    :multi => true
           opt :template, "Path to a new template file", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :source_name, :new_name]
+                       :required => [:environment,
+                                     :source_name,
+                                     :new_name,
+                                     :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
 
         override_attributes = parse_attributes :attributes => @opts[:attributes]

data/lib/simple_deploy/cli/create.rb

@@ -28,13 +28,15 @@ matching or pluralized names. Can be specified multiple times.", :type  => :stri
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
           opt :template, "Path to the template file", :type => :string
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name, :template]
+                       :required => [:environment, :name, :read_from_env, :template]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/deploy.rb

@@ -49,14 +49,16 @@ EOS
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
           opt :quiet, "Quiet, do not send notifications"
+          opt :read_from_env, "Read credentials and region from environment variables"
           opt :external, "Use external IP for ssh commands"
           opt :internal, "Use internal IP for ssh commands"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         logger = SimpleDeploy.logger @opts[:log_level]
 
         new_attributes = parse_attributes :attributes => @opts[:attributes]

data/lib/simple_deploy/cli/destroy.rb

@@ -21,12 +21,14 @@ EOS
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/events.rb

@@ -21,12 +21,14 @@ EOS
                                                    :default => 3
           opt :environment, "Set the target environment", :type => :string
           opt :name, "Stack name to manage", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/execute.rb

@@ -36,13 +36,15 @@ EOS
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
           opt :pty, "Set pty to true when executing commands."
+          opt :read_from_env, "Read credentials and region from environment variables"
           opt :sudo, "Execute command with sudo"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         logger = SimpleDeploy.logger @opts[:log_level]
 
         @opts[:name].each do |name|

data/lib/simple_deploy/cli/instances.rb

@@ -29,12 +29,14 @@ EOS
           opt :name, "Stack name to manage", :type => :string
           opt :external, "Return external IP for instances."
           opt :internal, "Return internal IP for instances."
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         logger = SimpleDeploy.logger @opts[:log_level]
 
         stack = Stack.new :name        => @opts[:name],

data/lib/simple_deploy/cli/list.rb

@@ -21,13 +21,16 @@ EOS
           opt :environment, "Set the target environment", :type => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
+          opt :read_from_env, "Read credentials and region from environment variables"
           opt :help, "Display Help"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment]
+                       :required => [:environment, :read_from_env]
+
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
 
-        SimpleDeploy.create_config @opts[:environment]
         SimpleDeploy.logger @opts[:log_level]
 
         stacks = SimpleDeploy::StackLister.new.all.sort

data/lib/simple_deploy/cli/outputs.rb

@@ -23,12 +23,14 @@ EOS
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'warn'
           opt :name, "Stack name to manage", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         logger = SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/parameters.rb

@@ -21,12 +21,14 @@ EOS
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'warn'
           opt :name, "Stack name to manage", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/protect.rb

@@ -24,12 +24,14 @@ EOS
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stacks to protect", :type => :string,
                                                            :multi => true
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
 
         @opts[:name].each do |name|

data/lib/simple_deploy/cli/resources.rb

@@ -22,12 +22,14 @@ EOS
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name to manage", :type => :string
+          opt :read_from_env, "Read credentials and region from environment variables"
         end
 
         valid_options? :provided => @opts,
-                       :required => [:environment, :name]
+                       :required => [:environment, :name, :read_from_env]
 
-        SimpleDeploy.create_config @opts[:environment]
+        config_arg = @opts[:read_from_env] ? :read_from_env : @opts[:environment]
+        SimpleDeploy.create_config config_arg
         SimpleDeploy.logger @opts[:log_level]
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment]

data/lib/simple_deploy/cli/shared.rb

@@ -20,14 +20,29 @@ module SimpleDeploy
         provided = args[:provided]
         required = args[:required]
 
-        required.each do |opt|
+        if provided[:environment] && provided[:read_from_env]
+          SimpleDeploy.logger.error "You cannot specify both --environment and --read-from-env"
+          exit 1
+        end
+
+        if required.include?(:environment) && required.include?(:read_from_env)
+          if !provided.include?(:environment) && !provided.include?(:read_from_env)
+            msg = "Either '--environment' or '--read-from-env' is required but not specified"
+            SimpleDeploy.logger.error msg
+            exit 1
+          end
+        end
+
+        required.reject { |i| [:environment, :read_from_env].include? i }.each do |opt|
           unless provided[opt]
             SimpleDeploy.logger.error "Option '#{opt} (-#{opt[0]})' required but not specified."
             exit 1
           end
         end
 
-        if required.include? :environment
+        validate_credential_env_vars if provided.has_key?(:read_from_env)
+
+        if provided[:environment]
           unless SimpleDeploy.environments.keys.include? provided[:environment]
             SimpleDeploy.logger.error "Environment '#{provided[:environment]}' does not exist."
             exit 1
@@ -45,6 +60,23 @@ module SimpleDeploy
         exit 1
       end
 
+      private
+
+      def credential_env_vars_exist?
+        !!ENV['AWS_ACCESS_KEY_ID'] &&
+        !!ENV['AWS_SECRET_ACCESS_KEY'] &&
+        !!ENV['AWS_REGION']
+      end
+
+      def validate_credential_env_vars
+        unless credential_env_vars_exist?
+          msg = "The following environment variables must be set when using --read-from-env: "
+          msg << "AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION"
+          SimpleDeploy.logger.error msg
+          exit 1
+        end
+      end
+
     end
 
   end