simple_deploy 0.9.2 → 0.10.0.beta.1

data/lib/simple_deploy/cli/status.rb

@@ -19,12 +19,14 @@ EOS
           opt :help, "Display Help"
           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/template.rb

@@ -19,12 +19,14 @@ EOS
           opt :help, "Display Help"
           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/update.rb

@@ -25,13 +25,15 @@ EOS
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
+          opt :read_from_env, "Read credentials and region from environment variables"
           opt :template, "Path to a new template file", :type => :string
         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]
 
         attributes = parse_attributes :attributes => @opts[:attributes]

data/lib/simple_deploy/configuration.rb

@@ -4,9 +4,13 @@ module SimpleDeploy
     extend self
 
     def configure(environment, custom_config = {})
-      raw_config = custom_config.fetch(:config) { load_config_file }
-      Config.new raw_config['environments'][environment],
-                 raw_config['notifications']
+      if custom_config.has_key?(:config)
+        env_config    = custom_config[:config]['environments'][environment]
+        notifications = custom_config[:config]['notifications']
+      else
+        env_config, notifications = load_appropriate_config(environment)
+      end
+      Config.new env_config, notifications
     end
 
     def environments(custom_config = {})
@@ -16,6 +20,14 @@ module SimpleDeploy
 
     private
 
+    def load_appropriate_config(env)
+      if env == :read_from_env
+        load_config_from_env_vars
+      else
+        load_config_from_file env
+      end
+    end
+
     def load_config_file
       begin
         YAML::load File.open(config_file)
@@ -26,6 +38,22 @@ module SimpleDeploy
       end
     end
 
+    def load_config_from_file(env)
+      config = load_config_file
+      return config['environments'][env], config['notifications']
+    end
+
+    def load_config_from_env_vars
+      env_config = {
+        'access_key'     => ENV['AWS_ACCESS_KEY_ID'],
+        'region'         => ENV['AWS_REGION'],
+        'secret_key'     => ENV['AWS_SECRET_ACCESS_KEY'],
+        'security_token' => ENV['AWS_SECURITY_TOKEN']
+      }
+
+      return env_config, {}
+    end
+
     def config_file
       env_config_file || default_config_file
     end
@@ -82,10 +110,18 @@ module SimpleDeploy
         @environment['secret_key']
       end
 
+      def security_token
+        @environment['security_token']
+      end
+
       def region
         @environment['region']
       end
 
+      def temporary_credentials?
+        !!security_token
+      end
+
       private
 
       def env_home
@@ -96,7 +132,6 @@ module SimpleDeploy
         env.load 'USER'
       end
 
-
     end
   end
 end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.9.2"
+  VERSION = "0.10.0.beta.1"
 end

data/spec/aws/cloud_formation_spec.rb

@@ -1,23 +1,17 @@
 require 'spec_helper'
 
 describe SimpleDeploy::AWS::CloudFormation do
-  include_context 'double stubbed config', :access_key => 'key',
-                                           :secret_key => 'XXX',
-                                           :region     => 'us-west-1'
   include_context 'double stubbed logger'
 
   before do
     @error_stub = stub 'Error', :process => 'Processed Error'
-    @response_stub = stub 'Excon::Response', :body => { 
+    @response_stub = stub 'Excon::Response', :body => {
         'Stacks' => [{'StackStatus' => 'green', 'Outputs' => [{'key' => 'value'}]}],
         'StackResources' => [{'StackName' => 'my_stack'}],
         'StackEvents' => ['event1', 'event2'],
         'TemplateBody' => '{EIP: "string"}'
     }
 
-    @cf_mock = mock 'CloudFormation'
-    Fog::AWS::CloudFormation.stub(:new).and_return(@cf_mock)
-
     @args = {
       :parameters => { 'parameter1' => 'my_param' },
       :name => 'my_stack',
@@ -25,183 +19,216 @@ describe SimpleDeploy::AWS::CloudFormation do
     }
 
     @exception = Exception.new('Failed')
-
-    @cf = SimpleDeploy::AWS::CloudFormation.new
   end
 
   after do
     SimpleDeploy.release_config
   end
 
-  describe "create" do
-    it "should create the stack on Cloud Formation" do
-      @cf_mock.should_receive(:create_stack).with('my_stack',
-                                                  { 'Capabilities' => ['CAPABILITY_IAM'],
-                                                    'TemplateBody' => 'my_template',
-                                                    'Parameters' => { 'parameter1' => 'my_param' }
-                                                  })
+  describe 'temporary credentials' do
+    include_context 'double stubbed config', :access_key => 'key',
+                                             :secret_key => 'XXX',
+                                             :security_token => 'the token',
+                                             :temporary_credentials? => true,
+                                             :region     => 'us-west-1'
 
-      @cf.create(@args)
+    it 'creates a connection with the temporary credentials' do
+      args = {
+        aws_access_key_id: 'key',
+        aws_secret_access_key: 'XXX',
+        aws_session_token: 'the token',
+        region: 'us-west-1'
+      }
+      Fog::AWS::CloudFormation.should_receive(:new).with(args)
+      SimpleDeploy::AWS::CloudFormation.new
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:create_stack).with('my_stack',
-                                                  { 'Capabilities' => ['CAPABILITY_IAM'],
-                                                    'TemplateBody' => 'my_template',
-                                                    'Parameters' => { 'parameter1' => 'my_param' }
-                                                  }).and_raise(@exception)
+  end
 
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+  describe 'with long lived credentials' do
+    include_context 'double stubbed config', :access_key => 'key',
+                                             :secret_key => 'XXX',
+                                             :security_token => nil,
+                                             :temporary_credentials? => false,
+                                             :region     => 'us-west-1'
+    before do
+      @cf_mock = mock 'CloudFormation'
+      Fog::AWS::CloudFormation.stub(:new).and_return(@cf_mock)
 
-      lambda { @cf.create @args }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      @cf = SimpleDeploy::AWS::CloudFormation.new
     end
-  end
 
-  describe "update" do
-    it "should update the stack on Cloud Formation" do
-      @cf_mock.should_receive(:update_stack).with('my_stack',
-                                                  { 'Capabilities' => ['CAPABILITY_IAM'],
-                                                    'TemplateBody' => 'my_template',
-                                                    'Parameters' => { 'parameter1' => 'my_param' }
-                                                  })
+    describe "create" do
+      it "should create the stack on Cloud Formation" do
+        @cf_mock.should_receive(:create_stack).with('my_stack',
+                                                    { 'Capabilities' => ['CAPABILITY_IAM'],
+                                                      'TemplateBody' => 'my_template',
+                                                      'Parameters' => { 'parameter1' => 'my_param' }
+        })
+
+        @cf.create(@args)
+      end
+
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:create_stack).with('my_stack',
+                                                    { 'Capabilities' => ['CAPABILITY_IAM'],
+                                                      'TemplateBody' => 'my_template',
+                                                      'Parameters' => { 'parameter1' => 'my_param' }
+        }).and_raise(@exception)
+
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      @cf.update(@args)
-    end
+        lambda { @cf.create @args }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
+    end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:update_stack).with('my_stack',
-                                                  { 'Capabilities' => ['CAPABILITY_IAM'],
-                                                    'TemplateBody' => 'my_template',
-                                                    'Parameters' => { 'parameter1' => 'my_param' }
-                                                  }).and_raise(@exception)
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
-
-      lambda { @cf.update(@args) }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
-    end
-  end
+    describe "update" do
+      it "should update the stack on Cloud Formation" do
+        @cf_mock.should_receive(:update_stack).with('my_stack',
+                                                    { 'Capabilities' => ['CAPABILITY_IAM'],
+                                                      'TemplateBody' => 'my_template',
+                                                      'Parameters' => { 'parameter1' => 'my_param' }
+        })
 
+        @cf.update(@args)
+      end
 
-  describe 'destroy' do
-    it "should delete the stack on Cloud Formation" do
-      @cf_mock.should_receive(:delete_stack).with('my_stack')
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:update_stack).with('my_stack',
+                                                    { 'Capabilities' => ['CAPABILITY_IAM'],
+                                                      'TemplateBody' => 'my_template',
+                                                      'Parameters' => { 'parameter1' => 'my_param' }
+        }).and_raise(@exception)
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      @cf.destroy('my_stack')
+        lambda { @cf.update(@args) }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:delete_stack).
-               with('my_stack').
-               and_raise @exception
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      lambda { @cf.destroy('my_stack') }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
-    end
-  end
+    describe 'destroy' do
+      it "should delete the stack on Cloud Formation" do
+        @cf_mock.should_receive(:delete_stack).with('my_stack')
 
+        @cf.destroy('my_stack')
+      end
 
-  describe 'describe_stack' do
-    it "should return the Cloud Formation description of the stack" do
-      @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:delete_stack).
+          with('my_stack').
+          and_raise @exception
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      @cf.describe_stack('my_stack').should == [{'StackStatus' => 'green', 'Outputs' => [{'key' => 'value'}]}]
+        lambda { @cf.destroy('my_stack') }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:describe_stacks).
-               with('StackName' => 'my_stack').
-               and_raise @exception
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      lambda { @cf.describe_stack('my_stack') }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
-    end
-  end
+    describe 'describe_stack' do
+      it "should return the Cloud Formation description of the stack" do
+        @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
 
-  describe "stack_resources" do
-    it "should return the Cloud Formation description of the stack resources" do
-      @cf_mock.should_receive(:describe_stack_resources).with('StackName' => 'my_stack').and_return(@response_stub)
+        @cf.describe_stack('my_stack').should == [{'StackStatus' => 'green', 'Outputs' => [{'key' => 'value'}]}]
+      end
 
-      @cf.stack_resources('my_stack').should == [{'StackName' => 'my_stack'}]
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:describe_stacks).
+          with('StackName' => 'my_stack').
+          and_raise @exception
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+
+        lambda { @cf.describe_stack('my_stack') }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:describe_stack_resources).
-               with('StackName' => 'my_stack').
-               and_raise @exception
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+    describe "stack_resources" do
+      it "should return the Cloud Formation description of the stack resources" do
+        @cf_mock.should_receive(:describe_stack_resources).with('StackName' => 'my_stack').and_return(@response_stub)
 
-      lambda { @cf.stack_resources('my_stack') }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
-    end
-  end
+        @cf.stack_resources('my_stack').should == [{'StackName' => 'my_stack'}]
+      end
 
-  describe "stack_events" do
-    it "should return the Cloud Formation description of the stack events" do
-      @cf_mock.should_receive(:describe_stack_events).with('my_stack').and_return(@response_stub)
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:describe_stack_resources).
+          with('StackName' => 'my_stack').
+          and_raise @exception
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      @cf.stack_events('my_stack', 2).should == ['event1', 'event2']
+        lambda { @cf.stack_resources('my_stack') }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:describe_stack_events).
-               with('my_stack').
-               and_raise @exception
+    describe "stack_events" do
+      it "should return the Cloud Formation description of the stack events" do
+        @cf_mock.should_receive(:describe_stack_events).with('my_stack').and_return(@response_stub)
 
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+        @cf.stack_events('my_stack', 2).should == ['event1', 'event2']
+      end
 
-      lambda { @cf.stack_events('my_stack', 2) }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
-    end
-  end
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:describe_stack_events).
+          with('my_stack').
+          and_raise @exception
 
-  describe "stack_status" do
-    it "should return the Cloud Formation status of the stack" do
-      @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
 
-      @cf.stack_status('my_stack').should == 'green'
+        lambda { @cf.stack_events('my_stack', 2) }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
-  end
 
-  describe "stack_outputs" do
-    it "should return the Cloud Formation outputs for the stack" do
-      @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
+    describe "stack_status" do
+      it "should return the Cloud Formation status of the stack" do
+        @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
 
-      @cf.stack_outputs('my_stack').should == [{'key' => 'value'}]
+        @cf.stack_status('my_stack').should == 'green'
+      end
     end
-  end
 
-  describe "template" do
-    it "should return the Cloud Formation template for the stack" do
-      @cf_mock.should_receive(:get_template).with('my_stack').and_return(@response_stub)
+    describe "stack_outputs" do
+      it "should return the Cloud Formation outputs for the stack" do
+        @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_return(@response_stub)
 
-      @cf.template('my_stack').should == '{EIP: "string"}'
+        @cf.stack_outputs('my_stack').should == [{'key' => 'value'}]
+      end
     end
 
-    it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
-      @cf_mock.should_receive(:get_template).
-               with('my_stack').
-               and_raise @exception
-      SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
-        with(:exception => @exception).
-        and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+    describe "template" do
+      it "should return the Cloud Formation template for the stack" do
+        @cf_mock.should_receive(:get_template).with('my_stack').and_return(@response_stub)
+
+        @cf.template('my_stack').should == '{EIP: "string"}'
+      end
 
-      lambda { @cf.template('my_stack') }.
-        should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      it "should trap and re-raise exceptions as SimpleDeploy::Exceptions::CloudFormationError" do
+        @cf_mock.should_receive(:get_template).
+          with('my_stack').
+          and_raise @exception
+        SimpleDeploy::AWS::CloudFormation::Error.should_receive(:new).
+          with(:exception => @exception).
+          and_raise SimpleDeploy::Exceptions::CloudFormationError.new('failed')
+
+        lambda { @cf.template('my_stack') }.
+          should raise_error SimpleDeploy::Exceptions::CloudFormationError
+      end
     end
   end
+
 end