simple_deploy 0.8.1.beta1 → 0.8.2.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef642027dcd39feaf45207dd2ed7df8cf5d26616
-  data.tar.gz: 4bd38248f760e1ef7b5feea6a3ccd479182864ed
+  metadata.gz: c432864cff995bd0f3e5b64c571f81833f476410
+  data.tar.gz: b94faf1e112f9b83d06220aef5c2b2c8f0a66c7e
 SHA512:
-  metadata.gz: a7bb87ccf61a0650a40b6669b0abd9a920f9c30b587fd0cbb185787fb28d75d6a84de30e0c3ebcf0ecf3e003d8454e08b9267b4627f55a972f4c6bbda5600f50
-  data.tar.gz: 2ba87b2d56034443a4ba4e39d8e986bc03660a336f37a834a770b685ef0d458477744a28f8b526142c40e776a804cd31bd20536c9c6cb0ac25e1165c7325546f
+  metadata.gz: ff8d95d380fa89690dc6a00234035d1227a7c59ad77fe36568e6e78194a76f4982d9657f764f2b3a982473604f49f20a2e9387c6a7fe5deea4c644966d46e641
+  data.tar.gz: dd8d0c74e36fb84c2d152904d172784d693afafb092b3553dea57cede1bb86b2cc08a2d28ea5c69199c6bad51d907ec10c3296f2fe4fea255ca797399565505b

data/.travis.yml

@@ -2,4 +2,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 script: "rake spec"

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## HEAD:
+## v0.8.2 (04/02/14):
+
+* Support instances in nested stacks (thanks @liwenbing)
+* Support instances created by instance resource (thanks @liwenbing)
 
 ## v0.8.1 (03/25/14):
 

data/lib/simple_deploy/aws/instance_reader.rb

@@ -7,15 +7,22 @@ module SimpleDeploy
 
       def list_stack_instances(stack_name)
 
-        asg_ids = auto_scaling_group_id(stack_name)
-
-        return [] unless asg_ids
+        instances = []
+       
+        #Nested stack
+        nested_stacks = nested_stacks_names(stack_name)
+        instances = nested_stacks.map {|stack| list_stack_instances stack }.flatten if nested_stacks.any?
 
+        #Auto Scaling Group
+        asg_ids = auto_scaling_group_id(stack_name)
         asg_instances = asg_ids.map { |asg_id| list_instances asg_id }.flatten
 
-        return [] unless asg_instances.any?
+        #EC2 instance
+        stack_instances = instance_names(stack_name)
+
+        instances += (describe_instances (asg_instances + stack_instances)) if (asg_instances + stack_instances).any?
 
-        describe_instances asg_instances
+        instances
       end
 
       private
@@ -54,7 +61,23 @@ module SimpleDeploy
         asgs = cf_stack_resources.select do |r|
           r['ResourceType'] == 'AWS::AutoScaling::AutoScalingGroup'
         end
-        asgs.any? ? asgs.map {|asg| asg['PhysicalResourceId'] } : false
+        asgs.any? ? asgs.map {|asg| asg['PhysicalResourceId'] } : []
+      end
+
+      def nested_stacks_names(stack_name)
+        cf_stack_resources = cloud_formation.stack_resources stack_name
+        asgs = cf_stack_resources.select do |r|
+          r['ResourceType'] == 'AWS::CloudFormation::Stack'
+        end
+        asgs.any? ? asgs.map {|asg| asg['PhysicalResourceId'] } : []
+      end
+
+      def instance_names(stack_name)
+        cf_stack_resources = cloud_formation.stack_resources stack_name
+        asgs = cf_stack_resources.select do |r|
+          r['ResourceType'] == 'AWS::EC2::Instance'
+        end
+        asgs.any? ? asgs.map {|asg| asg['PhysicalResourceId'] } : []
       end
 
     end

data/lib/simple_deploy/cli/instances.rb

@@ -49,7 +49,7 @@ EOS
         if instances.nil? || instances.empty?
           logger.info "Stack '#{@opts[:name]}' does not have any instances."
         else
-          puts stack.instances
+          puts instances
         end
       end
 

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.8.1.beta1"
+  VERSION = "0.8.2.beta1"
 end

data/spec/aws/instance_reader_spec.rb

@@ -35,6 +35,7 @@ describe SimpleDeploy::AWS::InstanceReader do
     context "with no ASGs" do
       before do
         @cloud_formation_mock.should_receive(:stack_resources).
+                              exactly(3).times.
                               with('stack').
                               and_return []
       end
@@ -55,6 +56,7 @@ describe SimpleDeploy::AWS::InstanceReader do
         end
 
         @cloud_formation_mock.should_receive(:stack_resources).
+                              exactly(3).times.
                               with('stack').
                               and_return stack_resource_results
 
@@ -100,5 +102,104 @@ describe SimpleDeploy::AWS::InstanceReader do
         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|
+          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
+
+        @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('stack').
+                              and_return stack_resource_results
+
+        Fog::AWS::AutoScaling.stub(:new).
+                              and_return @auto_scaling_groups_mock
+      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
+
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.8.1.beta1
+  version: 0.8.2.beta1
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs