simple_deploy 0.9.2 → 0.10.0.beta.1

data/spec/cli/attributes_spec.rb

@@ -7,6 +7,26 @@ describe SimpleDeploy::CLI::Attributes do
   include_context 'double stubbed stack', :name        => 'my_stack',
                                           :environment => 'my_env'
 
+  describe 'with --read-from-env' do
+    before do
+      @options = { :environment   => nil,
+                   :log_level     => 'debug',
+                   :name          => 'my_stack',
+                   :read_from_env => true }
+      @stack_stub.stub(:attributes).and_return({ 'foo' => 'bar', 'baz' => 'blah' })
+    end
+
+    it 'should output the attributes' do
+      subject.should_receive(:valid_options?).
+              with(:provided => @options,
+                   :required => [:environment, :name, :read_from_env])
+      Trollop.stub(:options).and_return(@options)
+      subject.should_receive(:puts).with('foo: bar')
+      subject.should_receive(:puts).with('baz: blah')
+      subject.show
+    end
+  end
+
   describe 'show' do
     before do
       @options = { :environment => 'my_env',
@@ -18,7 +38,7 @@ describe SimpleDeploy::CLI::Attributes do
     it 'should output the attributes' do
       subject.should_receive(:valid_options?).
               with(:provided => @options,
-                   :required => [:environment, :name])
+                   :required => [:environment, :name, :read_from_env])
       Trollop.stub(:options).and_return(@options)
       subject.should_receive(:puts).with('foo: bar')
       subject.should_receive(:puts).with('baz: blah')
@@ -31,7 +51,7 @@ describe SimpleDeploy::CLI::Attributes do
         Trollop.stub(:options).and_return(@options)
         subject.should_receive(:valid_options?).
                 with(:provided => @options,
-                     :required => [:environment, :name])
+                     :required => [:environment, :name, :read_from_env])
       end
 
       it 'should output the attributes as command arguments' do

data/spec/cli/clone_spec.rb

@@ -9,6 +9,8 @@ describe SimpleDeploy::CLI::Clone do
                                       :new_name    => 'new_stack',
                                       :new_env     => 'my_env'
 
+  before { @required = [:environment, :source_name, :new_name, :read_from_env] }
+
   describe 'clone' do
     context 'filter_attributes' do
       before do
@@ -146,8 +148,7 @@ describe SimpleDeploy::CLI::Clone do
 
       it 'should create the new stack using the filtered, merged and added attributes' do
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :source_name, :new_name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
         @new_stack_mock.stub(:template).and_return('foo' => 'bah')
 
@@ -169,8 +170,7 @@ describe SimpleDeploy::CLI::Clone do
         @options[:template] = 'brand_new_template.json'
 
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :source_name, :new_name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
 
         @new_stack_mock.should_receive(:create) do |options|
@@ -196,7 +196,7 @@ describe SimpleDeploy::CLI::Clone do
                      :new_name    => 'new_stack',
                      :attributes  => ['chef_repo_bucket_prefix=updated-intu-lc',
                                       'chef_repo_domain=updated_community_chef_repo',
-                                      'SolrClientTrafficContainer=solr-client-traffic-container', 
+                                      'SolrClientTrafficContainer=solr-client-traffic-container',
                                       'InputStackOutputs=cmdline_value'] }
 
         input_attributes = [{'InputStackOutputs' => 'inputvalue'}, {'OutputValue' => 'outputs'}]
@@ -204,8 +204,7 @@ describe SimpleDeploy::CLI::Clone do
         SimpleDeploy::Stack::OutputMapper.stub :new => input_stub
 
         subject.should_receive(:valid_options?).
-                with(:provided => options,
-                     :required => [:environment, :source_name, :new_name])
+                with(:provided => options, :required => @required)
         Trollop.stub(:options).and_return(options)
 
         @new_stack_mock.stub(:template).and_return('foo' => 'bah')
@@ -219,7 +218,7 @@ describe SimpleDeploy::CLI::Clone do
                                           { 'InputStackOutputs' => 'cmdline_value' },
                                           { 'OutputValue' => 'outputs'},
                                           { 'SolrClientTrafficContainer' => 'solr-client-traffic-container' }]
-                                          
+
           options[:template].should match /brand_new_template.json/
         end
 

data/spec/cli/deploy_spec.rb

@@ -9,6 +9,8 @@ describe SimpleDeploy::CLI::Deploy do
                                    :environment => 'my_env',
                                    :internal    => false
 
+  before { @required = [:environment, :name, :read_from_env] }
+
   describe 'deploy' do
     before do
       @stack_mock.stub(:attributes).and_return({})
@@ -24,8 +26,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :attributes  => [] }
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
+              with(:provided => options, :required => @required)
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -51,8 +52,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :attributes  => [] }
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
+              with(:provided => options, :required => @required)
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -81,8 +81,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :attributes  => ['foo=bah'] }
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
+              with(:provided => options, :required => @required)
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -109,8 +108,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :attributes  => ['foo=bah'] }
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
+              with(:provided => options, :required => @required)
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).
@@ -139,8 +137,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :attributes  => [] }
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
-                   :required => [:environment, :name])
+              with(:provided => options, :required => @required)
       Trollop.stub(:options).and_return(options)
 
       SimpleDeploy::Notifier.should_receive(:new).

data/spec/cli/destroy_spec.rb

@@ -13,13 +13,13 @@ describe SimpleDeploy::CLI::Destroy do
       @options = { :environment => 'my_env',
                    :log_level   => 'debug',
                    :name        => 'my_stack' }
+      @required = [:environment, :name, :read_from_env]
       @stack_mock.stub(:attributes).and_return({})
     end
 
     it "should exit with 0" do
       subject.should_receive(:valid_options?).
-              with(:provided => @options,
-                   :required => [:environment, :name])
+              with(:provided => @options, :required => @required)
       Trollop.stub(:options).and_return(@options)
 
       @stack_mock.should_receive(:destroy).and_return(true)
@@ -33,8 +33,7 @@ describe SimpleDeploy::CLI::Destroy do
 
     it "should exit with 1" do
       subject.should_receive(:valid_options?).
-              with(:provided => @options,
-                   :required => [:environment, :name])
+              with(:provided => @options, :required => @required)
       Trollop.stub(:options).and_return(@options)
 
       @stack_mock.should_receive(:destroy).and_return(false)

data/spec/cli/protect_spec.rb

@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 require 'simple_deploy/cli'
 
@@ -12,15 +11,15 @@ describe SimpleDeploy::CLI::Protect do
                   :log_level   => 'debug',
                   :name        => ['my_stack1'],
                   :protection  => 'on' }
+      @required = [:environment, :name, :read_from_env]
     end
 
     context "single stack" do
       include_context 'received stack array', 'my_stack', 'my_env', 1
-      
+
       it "should enable protection" do
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
 
         @stack_mock1.stub(:attributes).and_return('protection' => 'on')
@@ -34,8 +33,7 @@ describe SimpleDeploy::CLI::Protect do
         @options[:protection]= 'off'
 
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
 
         @stack_mock1.stub(:attributes).and_return('protection' => 'off')
@@ -53,8 +51,7 @@ describe SimpleDeploy::CLI::Protect do
         @options[:name] = ['my_stack1', 'my_stack2']
 
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
 
         @stack_mock1.stub(:attributes).and_return('protection' => 'on')
@@ -72,8 +69,7 @@ describe SimpleDeploy::CLI::Protect do
         @options[:protection]= 'off'
 
         subject.should_receive(:valid_options?).
-                with(:provided => @options,
-                     :required => [:environment, :name])
+                with(:provided => @options, :required => @required)
         Trollop.stub(:options).and_return(@options)
 
         @stack_mock1.stub(:attributes).and_return('protection' => 'off')
@@ -87,5 +83,5 @@ describe SimpleDeploy::CLI::Protect do
       end
     end
 
-  end 
+  end
 end

data/spec/cli/shared_spec.rb

@@ -15,31 +15,121 @@ describe SimpleDeploy::CLI::Shared do
 
     @object.parse_attributes(:logger     => @logger_stub,
                              :attributes => attributes).
-           should == [ { "test1" => "value1" }, 
+           should == [ { "test1" => "value1" },
                        { "test2" => "value2==" } ]
   end
 
   context "validating options " do
-    it "should exit if provided options passed do not include all required" do
-      provided = { :test1 => 'test1', :test2 => 'test2' }
-      required = [:test1, :test2, :test3]
-
-      lambda { 
-        @object.valid_options? :provided => provided,
-                               :required => required
-             }.should raise_error SystemExit
+    describe 'when providing both environment and read_from_env' do
+      before { @provided = { environment: 'env', read_from_env: true } }
+
+      it 'exits' do
+        lambda {
+          @object.valid_options? provided: @provided,
+                                 required: [:environment, :read_from_env]
+        }.should raise_error SystemExit
+      end
     end
 
-    it "should exit if environment does not exist" do
-      config_stub = stub 'config stub', :environments => { 'preprod' => 'data' }
+    describe 'when either environment or read from env is required' do
+      before { @required = [:environment, :read_from_env] }
 
-      provided = { :environment => 'prod' }
-      required = [:environment]
+      describe 'and neither is provided' do
+        it 'exits' do
+          lambda {
+            @object.valid_options? provided: {}, required: @required
+          }.should raise_error SystemExit
+        end
+      end
 
-      SimpleDeploy.stub(:environments).and_return(config_stub)
-      config_stub.should_receive(:keys).and_return(['preprod'])
+      describe 'and environment is provided' do
+        describe 'and the environment exists' do
+
+          it 'does not exit' do
+            config_stub = stub 'config stub',
+                               environments: { 'prod' => 'data' },
+                               keys: ['prod']
+
+            provided = { :environment => 'prod', :test1 => 'value1' }
+            required = [:environment, :read_from_env, :test1]
+
+            SimpleDeploy.stub(:environments).and_return(config_stub)
+
+            @object.valid_options? :provided => provided,
+                                   :required => required,
+                                   :logger   => @logger_stub
+          end
+        end
+
+        describe 'and the environment does not exist' do
+
+          it "exits" do
+            config_stub = stub 'config stub',
+                          environments: { 'preprod' => 'data' },
+                          keys: ['preprod']
+
+            provided = { :environment => 'prod' }
+            required = [:environment, :read_from_env]
+
+            SimpleDeploy.stub(:environments).and_return(config_stub)
+
+            lambda {
+              @object.valid_options? provided: provided,
+                                     required: required
+            }.should raise_error SystemExit
+          end
+        end
+      end
+
+      describe 'and read from env is provided' do
+        describe 'and the env vars are set' do
+          before do
+            ENV['AWS_ACCESS_KEY_ID']     = 'access'
+            ENV['AWS_SECRET_ACCESS_KEY'] = 'secret'
+            ENV['AWS_REGION']            = 'us-west-1'
+          end
+
+          after do
+            ENV['AWS_ACCESS_KEY_ID']     = nil
+            ENV['AWS_SECRET_ACCESS_KEY'] = nil
+            ENV['AWS_REGION']            = nil
+          end
+
+          it 'does not exit' do
+            provided = { read_from_env: true, test1: 'value1' }
+            required = [:environment, :read_from_env, :test1]
+
+            @object.valid_options? :provided => provided,
+                                   :required => required,
+                                   :logger   => @logger_stub
+          end
+
+        end
+
+        describe 'and the env vars are not set' do
+
+          it 'exits' do
+            provided = { read_from_env: true }
+            required = [:environment, :read_from_env]
+
+            # SimpleDeploy.stub(:environments).and_return(config_stub)
+
+            lambda {
+              @object.valid_options? provided: provided, required: required
+            }.should raise_error SystemExit
+          end
+
+        end
+
+      end
+
+    end
+
+    it "should exit if provided options passed do not include all required" do
+      provided = { :test1 => 'test1', :test2 => 'test2' }
+      required = [:test1, :test2, :test3]
 
-      lambda { 
+      lambda {
         @object.valid_options? :provided => provided,
                                :required => required
              }.should raise_error SystemExit
@@ -67,7 +157,7 @@ describe SimpleDeploy::CLI::Shared do
   it "should rescue exceptions and exit 1" do
     lambda { @object.rescue_exceptions_and_exit do
                raise SimpleDeploy::Exceptions::Base
-             end 
+             end
            }.should raise_error SystemExit
   end
 end

data/spec/cli/update_spec.rb

@@ -17,13 +17,12 @@ describe SimpleDeploy::CLI::Update do
                    :name        => ['my_stack1'],
                    :force       => true,
                    :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
-
+      @required = [:environment, :name, :read_from_env]
     end
 
     it "should pass force true" do
       subject.should_receive(:valid_options?).
-              with(:provided => @options,
-                   :required => [:environment, :name])
+              with(:provided => @options, :required => @required)
 
       Trollop.stub(:options).and_return(@options)
 
@@ -36,8 +35,7 @@ describe SimpleDeploy::CLI::Update do
       @options[:force] = false
 
       subject.should_receive(:valid_options?).
-              with(:provided => @options,
-                   :required => [:environment, :name])
+              with(:provided => @options, :required => @required)
 
       Trollop.stub(:options).and_return(@options)
 
@@ -50,8 +48,7 @@ describe SimpleDeploy::CLI::Update do
       @options[:template] = 'brand_new_template.json'
 
       subject.should_receive(:valid_options?).
-        with(:provided => @options,
-             :required => [:environment, :name])
+        with(:provided => @options, :required => @required)
 
       Trollop.stub(:options).and_return(@options)
 

data/spec/config_spec.rb

@@ -4,9 +4,10 @@ describe SimpleDeploy::Configuration do
   let(:config_data) do
     { 'environments' => {
         'test_env' => {
-          'secret_key' => 'secret',
-          'access_key' => 'access',
-          'region'     => 'us-west-1'
+          'access_key'     => 'access',
+          'secret_key'     => 'secret',
+          'security_token' => 'token',
+          'region'         => 'us-west-1'
       } },
       'notifications' => {
         'campfire' => {
@@ -49,6 +50,34 @@ describe SimpleDeploy::Configuration do
       @config.notifications.should == config_data['notifications']
     end
 
+    describe 'when the environment is :read_from_env' do
+      before do
+        ENV['AWS_ACCESS_KEY_ID']     = 'env_access'
+        ENV['AWS_REGION']            = 'env_region'
+        ENV['AWS_SECRET_ACCESS_KEY'] = 'env_secret'
+        ENV['AWS_SECURITY_TOKEN']    = 'env_token'
+
+        @data = {
+          'access_key'     => 'env_access',
+          'region'         => 'env_region',
+          'secret_key'     => 'env_secret',
+          'security_token' => 'env_token'
+        }
+      end
+
+      after do
+        %w(ACCESS_KEY_ID REGION SECRET_ACCESS_KEY SECURITY_TOKEN).each do |i|
+          ENV["AWS_#{i}"] = nil
+        end
+      end
+
+      it 'loads the config from env vars' do
+        @config = @the_module.configure :read_from_env
+        @config.environment.should eq(@data)
+        @config.notifications.should eq({})
+      end
+    end
+
   end
 
   describe "after creating a configuration" do
@@ -73,6 +102,7 @@ describe SimpleDeploy::Configuration do
       env_config = @config.environment
       env_config['access_key'].should == 'access'
       env_config['secret_key'].should == 'secret'
+      env_config['security_token'].should == 'token'
       env_config['region'].should == 'us-west-1'
     end
 
@@ -88,6 +118,10 @@ describe SimpleDeploy::Configuration do
       @config.secret_key.should == 'secret'
     end
 
+    it "should return the security token for the environment" do
+      @config.security_token.should == 'token'
+    end
+
     it "should return the region for the environment" do
       @config.region.should == 'us-west-1'
     end
@@ -96,6 +130,19 @@ describe SimpleDeploy::Configuration do
       @config.deploy_script.should == '/opt/intu/admin/bin/configure.sh'
     end
 
+    describe 'temporary_credentials?' do
+      it 'is true when they are' do
+        @config.temporary_credentials?.should be_true
+      end
+
+      describe 'when there is not a security token' do
+        it 'is false when they are not' do
+          config_data['environments']['test_env']['security_token'] = nil
+          @config = @the_module.configure 'test_env', config: config_data
+          @config.temporary_credentials?.should be_false
+        end
+      end
+    end
   end
 
   describe 'showing raw configuration for all instances' do