stackster 0.4.2 → 0.4.3

data/{CHANGELOG → CHANGELOG.md}

@@ -1,3 +1,9 @@
+## head:
+
+## 0.4.3 (03/14/2013)
+
+* Properly return instances in an auto scaling group
+
 ## v0.4.2:
 
 * Fixed the handling of data from the select method

data/lib/stackster/aws/auto_scaling_groups.rb

@@ -0,0 +1,22 @@
+require 'fog'
+
+module Stackster
+  class AWS
+    class AutoScalingGroups
+
+      def initialize(args)
+        c = args[:config]
+        @asg_id = args[:asg_id]
+        @connect = Fog::AWS::AutoScaling.new :aws_access_key_id => c.access_key,
+                                             :aws_secret_access_key => c.secret_key,
+                                             :region => c.region
+      end
+
+      def list_instances
+        body = @connect.describe_auto_scaling_groups('AutoScalingGroupNames' => [@asg_id]).body
+        result = body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].last
+        result['Instances'].map { |info| info['InstanceId'] }
+      end
+    end
+  end
+end

data/lib/stackster/aws/ec2.rb

@@ -7,18 +7,14 @@ module Stackster
       def initialize(args)
         c = args[:config]
         @connect = Fog::Compute::AWS.new :aws_access_key_id => c.access_key,
-                                     :aws_secret_access_key => c.secret_key,
-                                     :region => c.region
+                                         :aws_secret_access_key => c.secret_key,
+                                         :region => c.region
       end
 
-      def describe_instances
-        i = []
-        @connect.describe_instances.body['reservationSet'].each do |instance|
-          i << instance
-        end
-        i
+      def describe_instance(instance)
+        @connect.describe_instances('instance-state-name' => 'running',
+                                    'instance-id' => instance).body['reservationSet']
       end
-
     end
   end
 end

data/lib/stackster/aws.rb

@@ -2,3 +2,4 @@ require "stackster/aws/cloud_formation"
 require "stackster/aws/cloud_formation/error"
 require "stackster/aws/ec2"
 require "stackster/aws/simpledb"
+require "stackster/aws/auto_scaling_groups"

data/lib/stackster/instance/instance_reader.rb

@@ -6,17 +6,10 @@ module Stackster
     end
 
     def list_stack_instances(stack_name)
-      h = []
-      describe_instances.each do |instance|
-        tag_set = instance['instancesSet'].first['tagSet']
-        instance_stack_name = tag_set['aws:cloudformation:stack-name']
-        if instance_stack_name && instance_stack_name == stack_name
-          if instance_running? instance
-            h << instance
-          end
-        end
-      end
-      h
+      @asg_id = auto_scaling_group_id(stack_name)
+      asg_instances = auto_scaling.list_instances if @asg_id
+      return [] unless asg_instances
+      ec2.describe_instance asg_instances
     end
 
     private
@@ -25,17 +18,26 @@ module Stackster
       @ec2 ||= AWS::EC2.new :config => @config
     end
 
-    def get_instance_state(instance_hash)
-      instance_hash['instancesSet'].first['instanceState']['name']
+    def auto_scaling
+      @auto_scaling ||= AWS::AutoScalingGroups.new :config => @config, :asg_id => @asg_id
     end
 
-    def instance_running?(instance_hash)
-      get_instance_state(instance_hash) == 'running'
+    def cloud_formation
+      @cloud_formation ||= AWS::CloudFormation.new :config => @config
     end
 
-    def describe_instances
-      ec2.describe_instances
+    def auto_scaling_group_id(stack_name)
+      cf_stack_resources = cloud_formation.stack_resources stack_name
+      parse_cf_stack_resources cf_stack_resources
     end
 
+    def parse_cf_stack_resources(cf_stack_resources)
+      cf_stack_resources.each do |resource|
+        if resource['ResourceType'] == 'AWS::AutoScaling::AutoScalingGroup'
+          return resource['PhysicalResourceId']
+        end
+      end
+      false
+    end
   end
 end

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/aws/auto_scaling_groups_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Stackster do
+  before do
+    @config_stub = stub 'Config', :access_key => 'key',
+                                  :secret_key => 'XXX',
+                                  :region => 'us-west1'
+    instances = ['first',{ 'Instances' => [{ 'InstanceId' => 'i-000001' },
+                                           { 'InstanceId' => 'i-000002' }] }]
+    body =  { 'DescribeAutoScalingGroupsResult' => { 'AutoScalingGroups' => instances } }
+    @response_stub = stub 'Fog::Response', :body => body
+    @auto_scaling_mock = mock 'AutoScalingGroups'
+    Fog::AWS::AutoScaling.stub :new => @auto_scaling_mock
+    @auto_scaling_groups = Stackster::AWS::AutoScalingGroups.new(:config => @config_stub,
+                                                                 :asg_id => 'asg_name')
+  end
+
+  describe 'list_instances' do
+    it "should return the array of instance id's when passed the AutoScaleGroup name" do
+      @auto_scaling_mock.should_receive(:describe_auto_scaling_groups).
+                         with('AutoScalingGroupNames' => ['asg_name']).
+                         and_return(@response_stub)
+
+      @auto_scaling_groups.list_instances.should ==  ['i-000001','i-000002' ]
+
+
+    end
+  end
+end

data/spec/aws/ec2_spec.rb

@@ -2,9 +2,15 @@ require 'spec_helper'
 
 describe Stackster do
   before do
+    @logger_stub = stub 'logger stub', :info => 'true', :warn => 'true', :error => 'true'
     @config_stub = stub 'Config', :logger => @logger_stub, :access_key => 'key', :secret_key => 'XXX', :region => 'us-west1'
-    @response_stub = stub 'Excon::Response', :body => { 
-        'reservationSet' => [{'instanceSet' => [{'ipAddress' => '192.168.1.1'}]}]
+    @instance_id = 'i-123456'
+    @response_stub = stub 'Excon::Response', :body => {
+      'reservationSet' => [{
+        'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                          {'ipAddress' => '54.10.10.1'},
+                          {'instanceId' => 'i-123456'},
+                          {'privateIpAddress' => '192.168.1.1'}]}]
     }
 
     @cf_mock = mock 'CloudFormation'
@@ -13,11 +19,15 @@ describe Stackster do
     @ec2 = Stackster::AWS::EC2.new(:config => @config_stub)
   end
 
-  describe "describe_instances" do
-    it "should return  the Cloud Formation description of the instances" do
+  describe 'describe_instance' do
+    it 'should return the Cloud Formation description of only the running passed instance' do
       @cf_mock.should_receive(:describe_instances).and_return(@response_stub)
 
-      @ec2.describe_instances.should == [{'instanceSet' => [{'ipAddress' => '192.168.1.1'}]}]
+      @ec2.describe_instance(@instance_id).should == [{
+       'instanceSet' => [{'instanceState' => {'name' => 'running'}},
+                         {'ipAddress' => '54.10.10.1'},
+                         {'instanceId' => 'i-123456'},
+                         {'privateIpAddress' => '192.168.1.1'}]}]
     end
   end
 end

data/spec/instance/instance_reader_spec.rb

@@ -1,84 +1,66 @@
 require 'spec_helper'
 
-describe Stackster do
+describe Stackster::InstanceReader do
 
+  describe "list_stack_instances" do
 
-  describe "with a single running instance" do
     before do
-      @instances = [
-                     { 'instancesSet' => 
-                       [
-                         { 'tagSet' => 
-                           { 'aws:cloudformation:stack-name' => 'my-stack' },
-                           'instanceState' =>
-                           { 'name' => 'running' }
-                         }
-                       ]
-                     },
-                     { 'instancesSet' =>
-                       [
-                         { 'tagSet' =>
-                           { 'aws:cloudformation:stack-name' => 'my-stack' },
-                           'instanceState' =>
-                           { 'name' => 'terminated' }
-                         }
-                       ]
-                     },
-                     { 'instancesSet' =>
-                       [
-                         { 'tagSet' =>
-                           { 'aws:cloudformation:stack-name' => 'dead-stack' },
-                           'instanceState' =>
-                           { 'name' => 'terminated' }
-                         }
-                       ]
-                     }
-                   ]
-    end
+      @config_mock = mock 'config'
+      @cloud_formation_mock = mock 'cloud formation'
+      @auto_scaling_groups_mock = mock 'auto scaling'
+      @ec2_mock = mock 'ec2'
+      @instance_reservation_set_mock = mock 'reservation'
+      @instance_data_mock = mock 'instance data mock'
+
+      Stackster::AWS::CloudFormation.should_receive(:new).
+                                     with(:config => @config_mock).
+                                     and_return @cloud_formation_mock
+
+      stack_resource_results = [{'StackName' => 'stack',
+                                 'ResourceType' => 'AWS::AutoScaling::AutoScalingGroup',
+                                 'PhysicalResourceId' => 'asg1'}]
+
+      @cloud_formation_mock.should_receive(:stack_resources).
+                            with('stack').
+                            and_return stack_resource_results
+
+      Stackster::AWS::AutoScalingGroups.should_receive(:new).
+                                        with(:config => @config_mock, :asg_id => "asg1").
+                                        and_return @auto_scaling_groups_mock
 
-    it "should list running instance within the given stack" do
-      @ec2_mock = mock 'simple ec2'
-      config = Stackster::Config.new(:config => { 'access_key' => 'the-key',
-                                                  'secret_key' => 'secret',
-                                                  'region'     => 'us-west-1' })
       Stackster::AWS::EC2.should_receive(:new).
-                          with(:config => config).
+                          with(:config => @config_mock).
                           and_return @ec2_mock
-      instance_reader = Stackster::InstanceReader.new :config => config
-      @ec2_mock.should_receive(:describe_instances).
-                and_return(@instances)
-      instance_reader.list_stack_instances('my-stack').count.
-                      should == 1
     end
 
-    it "should not include instances which are in different stacks" do
-      @ec2_mock = mock 'simple ec2'
-      config = Stackster::Config.new(:config => { 'access_key' => 'the-key',
-                                                  'secret_key' => 'secret',
-                                                  'region'     => 'us-west-1' })
-      Stackster::AWS::EC2.should_receive(:new).
-                          with(:config => config).
-                          and_return @ec2_mock
-      instance_reader = Stackster::InstanceReader.new :config => config
-      @ec2_mock.should_receive(:describe_instances).
-                and_return(@instances)
-      instance_reader.list_stack_instances('another-stack').count.
-                      should == 0
+    context "with no running instances" do
+      it "should return empty array" do
+        @auto_scaling_groups_mock.should_receive(:list_instances).
+                                  and_return []
+
+        @ec2_mock.should_receive(:describe_instance).
+                  with([]).
+                  and_return @instance_reservation_set_mock
+
+        @instance_reservation_set_mock.stub :any? => true
+        instance_reader = Stackster::InstanceReader.new :config => @config_mock
+        instance_reader.list_stack_instances('stack').should == @instance_reservation_set_mock
+      end
     end
 
-    it "should not include instances which are not running" do
-      @ec2_mock = mock 'simple ec2'
-      config = Stackster::Config.new(:config => { 'access_key' => 'the-key',
-                                                  'secret_key' => 'secret',
-                                                  'region'     => 'us-west-1' })
-      Stackster::AWS::EC2.should_receive(:new).
-                          with(:config => config).
-                          and_return @ec2_mock
-      instance_reader = Stackster::InstanceReader.new :config => config
-      @ec2_mock.should_receive(:describe_instances).
-                and_return(@instances)
-      instance_reader.list_stack_instances('dead-stack').count.
-                      should == 0
+    context "with running instances" do
+      it "should return the reservation set for each running instance" do
+        @auto_scaling_groups_mock.should_receive(:list_instances).
+                                  and_return ['instance1']
+
+        @ec2_mock.should_receive(:describe_instance).
+                  with(['instance1']).
+                  and_return @instance_reservation_set_mock
+
+        @instance_reservation_set_mock.stub :any? => true
+        instance_reader = Stackster::InstanceReader.new :config => @config_mock
+        instance_reader.list_stack_instances('stack').should == @instance_reservation_set_mock
+      end
     end
   end
 end

data/stackster.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.6.4"
   s.add_development_dependency "timecop", "~> 0.5.3"
 
-  s.add_runtime_dependency "fog", "= 1.6.0"
+  s.add_runtime_dependency "fog", "= 1.10.0"
   s.add_runtime_dependency "trollop", "= 2.0"
   s.add_runtime_dependency "xml-simple", "= 1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -142,6 +142,7 @@ files:
 - bin/stackster
 - lib/stackster.rb
 - lib/stackster/aws.rb
+- lib/stackster/aws/auto_scaling_groups.rb
 - lib/stackster/aws/cloud_formation.rb
 - lib/stackster/aws/cloud_formation/error.rb
 - lib/stackster/aws/ec2.rb
@@ -163,6 +164,7 @@ files:
 - lib/stackster/stack/stack_updater.rb
 - lib/stackster/stack/status.rb
 - lib/stackster/version.rb
+- spec/aws/auto_scaling_groups_spec.rb
 - spec/aws/cloud_formation/error_spec.rb
 - spec/aws/cloud_formation_spec.rb
 - spec/aws/ec2_spec.rb
@@ -196,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2937720752334534318
+      hash: -3513599222543714350
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2937720752334534318
+      hash: -3513599222543714350
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.24
@@ -213,6 +215,7 @@ signing_key:
 specification_version: 3
 summary: I make deployments easier
 test_files:
+- spec/aws/auto_scaling_groups_spec.rb
 - spec/aws/cloud_formation/error_spec.rb
 - spec/aws/cloud_formation_spec.rb
 - spec/aws/ec2_spec.rb