simple_deploy 0.9.2 → 0.10.0.beta.1

data/spec/aws/helpers_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+class TestObj
+  include SimpleDeploy::AWS::Helpers
+  attr_accessor :config
+end
+
+describe SimpleDeploy::AWS::Helpers do
+
+  describe 'connection_args' do
+    before do
+      @config = stub 'config',
+                     access_key: 'key',
+                     secret_key: 'XXX',
+                     region:     'us-west-1'
+      @obj = TestObj.new
+
+      @args = {
+        aws_access_key_id:     'key',
+        aws_secret_access_key: 'XXX',
+        region:                'us-west-1'
+      }
+    end
+
+    describe 'with long lived credentials' do
+      before do
+        @config.stub temporary_credentials?: false
+        @obj.config = @config
+      end
+
+      it 'does not include security token' do
+        @obj.connection_args.should eq @args
+      end
+    end
+
+    describe 'with temporary credentials' do
+      before do
+        @config.stub security_token: 'token'
+        @config.stub temporary_credentials?: true
+        @obj.config = @config
+      end
+
+      it 'includes security security token' do
+        args = @args.merge({aws_session_token: 'token'})
+        @obj.connection_args.should eq args
+      end
+    end
+
+  end
+
+end

data/spec/aws/instance_reader_spec.rb

@@ -2,207 +2,221 @@ require 'spec_helper'
 
 describe SimpleDeploy::AWS::InstanceReader do
   include_context 'double stubbed logger'
-  include_context 'double stubbed config', :access_key => 'key',
-                                           :secret_key => 'XXX',
-                                           :region     => 'us-west-1'
 
-  describe "list_stack_instances" do
-    before do
-      @cloud_formation_mock          = mock 'cloud formation'
-      @auto_scaling_groups_mock      = mock 'auto scaling'
-      @ec2_mock                      = mock 'ec2'
-
-      instances = ['first',{ 'Instances' => [{ 'InstanceId' => 'i-000001' },
-                                             { 'InstanceId' => 'i-000002' }] }]
-      body =  { 'DescribeAutoScalingGroupsResult' => { 'AutoScalingGroups' => instances } }
-      @list_response = stub 'Fog::Response', :body => body, :any? => true
-
-      empty_body =  { 'DescribeAutoScalingGroupsResult' => { 'AutoScalingGroups' => [] } }
-      @empty_response = stub 'Fog::Response', :body => empty_body
-
-      @describe_response = stub 'Excon::Response', :body => {
-        'reservationSet' => [{
-          'instanceSet' => [{'instanceState' => {'name' => 'running'}},
-                            {'ipAddress' => '54.10.10.1'},
-                            {'instanceId' => 'i-123456'},
-                            {'privateIpAddress' => '192.168.1.1'}]}]
+  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'
+
+    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'
       }
-
-      SimpleDeploy::AWS::CloudFormation.stub(:new).
-                                        and_return @cloud_formation_mock
+      Fog::AWS::AutoScaling.should_receive(:new).with(args)
+      Fog::Compute::AWS.should_receive(:new).with(args)
+      SimpleDeploy::AWS::InstanceReader.new
     end
 
-    context "with no ASGs" do
-      before do
-        @cloud_formation_mock.should_receive(:stack_resources).
-                              exactly(3).times.
-                              with('stack').
-                              and_return []
-      end
+  end
 
-      it "should return an empty array" do
-        instance_reader = SimpleDeploy::AWS::InstanceReader.new
-        instance_reader.list_stack_instances('stack').should == []
-      end
+  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
+      @auto_scaling_groups_mock = mock 'auto scaling'
+      @cloud_formation_mock     = mock 'cloud formation'
+      @ec2_mock                 = mock 'ec2'
+      Fog::AWS::AutoScaling.stub(:new).and_return @auto_scaling_groups_mock
+      Fog::Compute::AWS.stub(:new).and_return @ec2_mock
+      SimpleDeploy::AWS::CloudFormation.stub(:new).
+                                        and_return @cloud_formation_mock
     end
 
-    context "with an ASGs" do
+    describe "list_stack_instances" do
       before do
-        stack_resource_results = []
-        @asgs = ['asg1', 'asg2'].each do |asg|
-          stack_resource_results << { 'StackName'          => 'stack',
-                                      'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
-                                      'PhysicalResourceId' => asg }
-        end
+        instances = ['first',{ 'Instances' => [{ 'InstanceId' => 'i-000001' },
+                                               { 'InstanceId' => 'i-000002' }] }]
+        body =  { 'DescribeAutoScalingGroupsResult' => { 'AutoScalingGroups' => instances } }
+        @list_response = stub 'Fog::Response', :body => body, :any? => true
 
-        @cloud_formation_mock.should_receive(:stack_resources).
-                              exactly(3).times.
-                              with('stack').
-                              and_return stack_resource_results
+        empty_body =  { 'DescribeAutoScalingGroupsResult' => { 'AutoScalingGroups' => [] } }
+        @empty_response = stub 'Fog::Response', :body => empty_body
 
-        Fog::AWS::AutoScaling.stub(:new).
-                              and_return @auto_scaling_groups_mock
+        @describe_response = stub 'Excon::Response', :body => {
+          'reservationSet' => [{
+            'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                              {'ipAddress' => '54.10.10.1'},
+                              {'instanceId' => 'i-123456'},
+                              {'privateIpAddress' => '192.168.1.1'}]}]
+        }
       end
 
-      context "with no running instances" do
-        it "should return empty array" do
-          @asgs.each do |asg|
-            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                      with('AutoScalingGroupNames' => [asg]).
-                                      and_return(@empty_response)
-          end
+      context "with no ASGs" do
+        before do
+          @cloud_formation_mock.should_receive(:stack_resources).
+                                exactly(3).times.
+                                with('stack').
+                                and_return []
+        end
 
+        it "should return an empty array" do
           instance_reader = SimpleDeploy::AWS::InstanceReader.new
           instance_reader.list_stack_instances('stack').should == []
         end
       end
 
-      context "with running instances" do
-        it "should return the reservation set for each running instance" do
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['asg1']).
-                                    and_return(@list_response)
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['asg2']).
-                                    and_return(@empty_response)
-
-          Fog::Compute::AWS.stub(:new).
-                            and_return @ec2_mock
-          @ec2_mock.should_receive(:describe_instances).
-                    with('instance-state-name' => 'running',
-                         'instance-id' => ['i-000001', 'i-000002']).
-                    and_return @describe_response
+      context "with an ASGs" do
+        before do
+          stack_resource_results = []
+          @asgs = ['asg1', 'asg2'].each do |asg|
+            stack_resource_results << { 'StackName'          => 'stack',
+                                        'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
+                                        'PhysicalResourceId' => asg }
+          end
 
-          instance_reader = SimpleDeploy::AWS::InstanceReader.new
-          instance_reader.list_stack_instances('stack').should == [{
-            'instanceSet' => [{'instanceState' => {'name' => 'running'}},
-                              {'ipAddress' => '54.10.10.1'},
-                              {'instanceId' => 'i-123456'},
-                              {'privateIpAddress' => '192.168.1.1'}]}]
+          @cloud_formation_mock.should_receive(:stack_resources).
+                                exactly(3).times.
+                                with('stack').
+                                and_return stack_resource_results
         end
-      end
-    end
 
-    context "with nested stacks and ASGs and EC2 instances" do
-      before do
-        stack_resource_results = []
-        @nested_stacks = ['nested_stack1', 'nested_stack2'].each do |nested_stack|
-          @cloud_formation_mock.should_receive(:stack_status).
-                              with(nested_stack).
-                              and_return 'CREATE_COMPLETE'
-          stack_resource_results << { 'StackName'          => 'stack',
-                                      'ResourceType'       => 'AWS::CloudFormation::Stack',
-                                      'PhysicalResourceId' => nested_stack }
-        end
-        @asgs = ['asg1', 'asg2'].each do |asg|
-          stack_resource_results << { 'StackName'          => 'stack',
-                                      'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
-                                      'PhysicalResourceId' => asg }
-        end
+        context "with no running instances" do
+          it "should return empty array" do
+            @asgs.each do |asg|
+              @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                        with('AutoScalingGroupNames' => [asg]).
+                                        and_return(@empty_response)
+            end
 
-        @instances = ['i-instance1', 'i-instance2'].each do |instance|
-          stack_resource_results << { 'StackName'          => 'stack',
-                                      'ResourceType'       => 'AWS::EC2::Instance',
-                                      'PhysicalResourceId' => instance }
+            instance_reader = SimpleDeploy::AWS::InstanceReader.new
+            instance_reader.list_stack_instances('stack').should == []
+          end
         end
 
-        @cloud_formation_mock.should_receive(:stack_resources).
-                              exactly(3).times.
-                              with('stack').
-                              and_return stack_resource_results
-
-        Fog::AWS::AutoScaling.stub(:new).
-                              and_return @auto_scaling_groups_mock
+        context "with running instances" do
+          it "should return the reservation set for each running instance" do
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['asg1']).
+                                      and_return(@list_response)
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['asg2']).
+                                      and_return(@empty_response)
+            @ec2_mock.should_receive(:describe_instances).
+                      with('instance-state-name' => 'running',
+                           'instance-id' => ['i-000001', 'i-000002']).
+                      and_return @describe_response
+
+            instance_reader = SimpleDeploy::AWS::InstanceReader.new
+            instance_reader.list_stack_instances('stack').should == [{
+              'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                                {'ipAddress' => '54.10.10.1'},
+                                {'instanceId' => 'i-123456'},
+                                {'privateIpAddress' => '192.168.1.1'}]}]
+          end
+        end
       end
 
-      context "with running instances in nested stack and ASG and EC2 instances" do
-        it "should return the reservation set for each running instance" do
-          
+      context "with nested stacks and ASGs and EC2 instances" do
+        before do
+          stack_resource_results = []
+          @nested_stacks = ['nested_stack1', 'nested_stack2'].each do |nested_stack|
+            @cloud_formation_mock.should_receive(:stack_status).
+              with(nested_stack).
+              and_return 'CREATE_COMPLETE'
+            stack_resource_results << { 'StackName'          => 'stack',
+                                        'ResourceType'       => 'AWS::CloudFormation::Stack',
+                                        'PhysicalResourceId' => nested_stack }
+          end
+          @asgs = ['asg1', 'asg2'].each do |asg|
+            stack_resource_results << { 'StackName'          => 'stack',
+                                        'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
+                                        'PhysicalResourceId' => asg }
+          end
 
-          @cloud_formation_mock.should_receive(:stack_resources).
-                              exactly(3).times.
-                              with('nested_stack1').
-                              and_return []
-
-          nested_stack2_resource_results = []
-          @asgs = ['nested_stack2_asg1', 'nested_stack2_asg2'].each do |nested_stack2_resource_asg|
-            nested_stack2_resource_results << { 'StackName'  => 'nested_stack2',
-                                      'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
-                                      'PhysicalResourceId' => nested_stack2_resource_asg }
+          @instances = ['i-instance1', 'i-instance2'].each do |instance|
+            stack_resource_results << { 'StackName'          => 'stack',
+                                        'ResourceType'       => 'AWS::EC2::Instance',
+                                        'PhysicalResourceId' => instance }
           end
 
           @cloud_formation_mock.should_receive(:stack_resources).
-                              exactly(3).times.
-                              with('nested_stack2').
-                              and_return nested_stack2_resource_results
-          nested_list_response = stub 'Fog::Response', :body => { 'DescribeAutoScalingGroupsResult' => 
+                                exactly(3).times.
+                                with('stack').
+                                and_return stack_resource_results
+        end
+
+        context "with running instances in nested stack and ASG and EC2 instances" do
+          it "should return the reservation set for each running instance" do
+            @cloud_formation_mock.should_receive(:stack_resources).
+                                  exactly(3).times.
+                                  with('nested_stack1').
+                                  and_return []
+
+            nested_stack2_resource_results = []
+            @asgs = ['nested_stack2_asg1', 'nested_stack2_asg2'].each do |nested_stack2_resource_asg|
+              nested_stack2_resource_results << { 'StackName'  => 'nested_stack2',
+                                                  'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
+                                                  'PhysicalResourceId' => nested_stack2_resource_asg }
+            end
+
+            @cloud_formation_mock.should_receive(:stack_resources).
+                                  exactly(3).times.
+                                  with('nested_stack2').
+                                  and_return nested_stack2_resource_results
+            nested_list_response = stub 'Fog::Response', :body => { 'DescribeAutoScalingGroupsResult' =>
                                                                     { 'AutoScalingGroups' => ['first',
-                                                                      { 'Instances' => [{ 'InstanceId' => 'i-stack001' },
-                                                                                          { 'InstanceId' => 'i-stack002' }] }] } },
-                                                        :any? => true
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['nested_stack2_asg1']).
-                                    and_return(nested_list_response)
-
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['nested_stack2_asg2']).
-                                    and_return(@empty_response)
-          
-
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['asg1']).
-                                    and_return(@list_response)
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['asg2']).
-                                    and_return(@empty_response)
-
-          Fog::Compute::AWS.stub(:new).
-                            and_return @ec2_mock
-
-          @ec2_mock.should_receive(:describe_instances).
-                    with('instance-state-name' => 'running',
-                         'instance-id' => ['i-stack001', 'i-stack002']).
-                    and_return @describe_response
-
-          @ec2_mock.should_receive(:describe_instances).
-                    with('instance-state-name' => 'running',
-                         'instance-id' => ['i-000001', 'i-000002','i-instance1', 'i-instance2'] ).
-                    and_return @describe_response
+                                                                                              { 'Instances' => [{ 'InstanceId' => 'i-stack001' },
+                                                                                                                { 'InstanceId' => 'i-stack002' }] }] } },
+                                                         :any? => true
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['nested_stack2_asg1']).
+                                      and_return(nested_list_response)
 
-          instance_reader = SimpleDeploy::AWS::InstanceReader.new
-          instance_reader.list_stack_instances('stack').should == [{
-            'instanceSet' => [{'instanceState' => {'name' => 'running'}},
-                              {'ipAddress' => '54.10.10.1'},
-                              {'instanceId' => 'i-123456'},
-                              {'privateIpAddress' => '192.168.1.1'}]},
-                            {
-            'instanceSet' => [{'instanceState' => {'name' => 'running'}},
-                              {'ipAddress' => '54.10.10.1'},
-                              {'instanceId' => 'i-123456'},
-                              {'privateIpAddress' => '192.168.1.1'}]}]
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['nested_stack2_asg2']).
+                                      and_return(@empty_response)
+
+
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['asg1']).
+                                      and_return(@list_response)
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => ['asg2']).
+                                      and_return(@empty_response)
+
+            @ec2_mock.should_receive(:describe_instances).
+                      with('instance-state-name' => 'running',
+                           'instance-id' => ['i-stack001', 'i-stack002']).
+                      and_return @describe_response
+
+            @ec2_mock.should_receive(:describe_instances).
+                      with('instance-state-name' => 'running',
+                           'instance-id' => ['i-000001', 'i-000002','i-instance1', 'i-instance2'] ).
+                      and_return @describe_response
+
+            instance_reader = SimpleDeploy::AWS::InstanceReader.new
+            instance_reader.list_stack_instances('stack').should == [{
+              'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                                {'ipAddress' => '54.10.10.1'},
+                                {'instanceId' => 'i-123456'},
+                                {'privateIpAddress' => '192.168.1.1'}]}, {
+              'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                                {'ipAddress' => '54.10.10.1'},
+                                {'instanceId' => 'i-123456'},
+                                {'privateIpAddress' => '192.168.1.1'}]}]
+          end
         end
       end
-    end
 
+    end
   end
 end

data/spec/aws/simpledb_spec.rb

@@ -6,92 +6,120 @@ describe SimpleDeploy::AWS::SimpleDB do
                                            :region     => 'us-west-1'
 
   before do
-    @response_stub = stub 'Excon::Response', :body => { 
+    @response_stub = stub 'Excon::Response', :body => {
       'RequestId' => 'rid',
       'Domains' => ['domain1', 'domain2'],
       'Items' => { 'item1' => { 'key' => ['value'] } },
       'NextToken' => nil
     }
-    @multi_response_stub = stub 'Excon::Response', :body => { 
+    @multi_response_stub = stub 'Excon::Response', :body => {
       'RequestId' => 'rid',
       'Domains' => ['domain1', 'domain2'],
       'Items' => { 'item1-2' => { 'key' => ['value'] } },
       'NextToken' => 'Chunk2'
     }
-
-    @db_mock = mock 'SimpleDB'
-    Fog::AWS::SimpleDB.stub(:new).and_return(@db_mock)
-    @db_mock.stub(:list_domains).and_return(@response_stub)
-
-    @db = SimpleDeploy::AWS::SimpleDB.new
   end
 
-  describe 'domains' do
-    it 'should return a list of domains' do
-      @db.domains.should == ['domain1', 'domain2']
+  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'
+
+    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::SimpleDB.should_receive(:new).with(args)
+      SimpleDeploy::AWS::SimpleDB.new
     end
   end
 
-  describe 'domain_exists?' do
-    it 'should return true for existing domains' do
-      @db.domain_exists?('domain1').should be_true
+  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
+      @db_mock = mock 'SimpleDB'
+      Fog::AWS::SimpleDB.stub(:new).and_return(@db_mock)
+      @db_mock.stub(:list_domains).and_return(@response_stub)
+
+      @db = SimpleDeploy::AWS::SimpleDB.new
     end
 
-    it 'should return false for non-existent domains' do
-      @db.domain_exists?('baddomain1').should_not be_true
+    describe 'domains' do
+      it 'should return a list of domains' do
+        @db.domains.should == ['domain1', 'domain2']
+      end
     end
-  end
 
-  describe 'create_domain' do
-    it 'should create a new domain' do
-      @db_mock.should_receive(:create_domain).with('newdomain').and_return(@response_stub)
+    describe 'domain_exists?' do
+      it 'should return true for existing domains' do
+        @db.domain_exists?('domain1').should be_true
+      end
 
-      @db.create_domain('newdomain').body['RequestId'].should == 'rid'
+      it 'should return false for non-existent domains' do
+        @db.domain_exists?('baddomain1').should_not be_true
+      end
     end
 
-    it 'should not create a duplicate domain' do
-      @db_mock.should_not_receive(:create_domain)
+    describe 'create_domain' do
+      it 'should create a new domain' do
+        @db_mock.should_receive(:create_domain).with('newdomain').and_return(@response_stub)
 
-      @db.create_domain('domain1').should be_nil
-    end
-  end
+        @db.create_domain('newdomain').body['RequestId'].should == 'rid'
+      end
 
-  describe 'put_attributes' do
-    it 'should update the specified domain' do
-      @db_mock.should_receive(:put_attributes).with('domain1', 'item1', { 'key' => 'value' }, {}).and_return(@response_stub)
+      it 'should not create a duplicate domain' do
+        @db_mock.should_not_receive(:create_domain)
 
-      @db.put_attributes('domain1', 'item1', { 'key' => 'value' }, {}).body['RequestId'].should == 'rid'
+        @db.create_domain('domain1').should be_nil
+      end
     end
-  end
 
-  describe 'select' do
-    it 'should return query items' do
-      @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => nil } ).and_return(@response_stub)
+    describe 'put_attributes' do
+      it 'should update the specified domain' do
+        @db_mock.should_receive(:put_attributes).with('domain1', 'item1', { 'key' => 'value' }, {}).and_return(@response_stub)
 
-      @db.select('item1').should == { 'item1' => { 'key' => ['value'] } }
+        @db.put_attributes('domain1', 'item1', { 'key' => 'value' }, {}).body['RequestId'].should == 'rid'
+      end
     end
 
-    it 'should return multiple chunks of query items' do
-      @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => nil } ).and_return(@multi_response_stub)
-      @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => 'Chunk2' } ).and_return(@response_stub)
+    describe 'select' do
+      it 'should return query items' do
+        @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => nil } ).and_return(@response_stub)
+
+        @db.select('item1').should == { 'item1' => { 'key' => ['value'] } }
+      end
+
+      it 'should return multiple chunks of query items' do
+        @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => nil } ).and_return(@multi_response_stub)
+        @db_mock.should_receive(:select).with('item1', { "ConsistentRead" => true, "NextToken" => 'Chunk2' } ).and_return(@response_stub)
 
-      @db.select('item1').should == { 'item1' => { 'key' => ['value'] }, 'item1-2' => { 'key' => ['value'] } }
+        @db.select('item1').should == { 'item1' => { 'key' => ['value'] }, 'item1-2' => { 'key' => ['value'] } }
+      end
     end
-  end
 
-  describe 'delete' do
-    it 'should delete the attributes identified by domain and key' do
-      @db_mock.should_receive(:delete_attributes).with('domain1', 'item1').and_return(@response_stub)
+    describe 'delete' do
+      it 'should delete the attributes identified by domain and key' do
+        @db_mock.should_receive(:delete_attributes).with('domain1', 'item1').and_return(@response_stub)
 
-      @db.delete('domain1', 'item1').body['RequestId'].should == 'rid'
+        @db.delete('domain1', 'item1').body['RequestId'].should == 'rid'
+      end
     end
-  end  
-  
-  describe 'delete_items' do
-    it 'should delete the specific attributes passed associated with domain and key' do
-      @db_mock.should_receive(:delete_attributes).with('domain1', 'item1', {'value'=>nil}).and_return(@response_stub)
 
-      @db.delete_items('domain1', 'item1', {'value'=>nil}).body['RequestId'].should == 'rid'
+    describe 'delete_items' do
+      it 'should delete the specific attributes passed associated with domain and key' do
+        @db_mock.should_receive(:delete_attributes).with('domain1', 'item1', {'value'=>nil}).and_return(@response_stub)
+
+        @db.delete_items('domain1', 'item1', {'value'=>nil}).body['RequestId'].should == 'rid'
+      end
     end
   end
 end