convection 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960beb9e1cd6a6aa3ee610fcb04bd5a79df77952
-  data.tar.gz: 96d9893838cd569601e1c4cbe49ff773b1f60002
+  metadata.gz: 67115b7f8c9dafb09f93733a248cfa00ffdd2564
+  data.tar.gz: e2d9813955f988796f198c68b3047ea812a1b172
 SHA512:
-  metadata.gz: 751c1d98cbb197e21d03f20345eb94933a2f5464a0dc2eb20ea91ea0121e4a627aa519afe755bb3bea9528c8aaf355cfc853d8159cde896b2e78f0336580ea70
-  data.tar.gz: 4b8fdc713d35a2b00e7080e02603dccaf5df472d90a6f6438762333d7d7eb467114d2613ecabc4c713cd2ef1cfb97ba5ccc7a7124fd32fd4301244c904ddaf47
+  metadata.gz: 7c2ee15ff3d16828ab27635ba94fb5dc286092414d10340330daae7f01ddb0d1735cb6f797a615e0e25086b1d3cbf3ab1591be3ebf8f098226a428f2b60b613b
+  data.tar.gz: b3e3c5b978aabfc409e1e619c20e539dce2dbb369c0b9e734c094717ca67f299856d1191045c65012e2bd35f681cbeec7e1bbfa74bb2ada7986274ee4be2cf9b

data/bin/convection

@@ -2,6 +2,8 @@
 require 'thor'
 require_relative '../lib/convection/control/cloud'
 require 'thread'
+require 'yaml'
+
 module Convection
   ##
   # Convection CLI
@@ -97,6 +99,17 @@ module Convection
       @cloud.stacks[stack].validate
     end
 
+    desc 'describe-resources', 'Describe resources for a stack'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
+    option :stack, :desc => 'The stack to be described', :required => true
+    option :type, :desc => 'An optional filter on the types of resources to be described', default: '*'
+    option :properties, :type => :array, :desc => 'A space-separated list of properties to include in the output', default: %w(*)
+    option :format, :type => :string, :default => 'json', :enum => %w(json yaml)
+    def describe_resources
+      init_cloud
+      describe_stack_resources(options[:stack], options[:format], options[:properties], options[:type])
+    end
+
     no_commands do
       attr_accessor :last_event
 
@@ -178,6 +191,35 @@ module Convection
         end
       end
 
+      def describe_stack_resources(stack, format, properties_to_include, type)
+        stack_template = @cloud.stacks[stack].current_template
+        raise "No template defined for [#{stack}] stack" if stack_template.nil?
+
+        stack_resources = stack_template['Resources']
+        stack_resources.select! { |_name, attrs| attrs['Type'] == type } unless type == '*'
+
+        described_resources = {}
+
+        stack_resources.each do |name, attrs|
+          # Only include the resource type if we asked for all resource types
+          attrs.reject! { |attr| attr == 'Type'  } unless type == '*'
+
+          # Only include those properties that were explicitly requested
+          unless properties_to_include.size == 1 && properties_to_include[0] == '*'
+            attrs['Properties'].select! { |prop| properties_to_include.include? prop }
+          end
+
+          described_resources[name] = attrs
+        end
+
+        case format
+        when 'json'
+          puts JSON.pretty_generate(described_resources)
+        when 'yaml'
+          puts described_resources.to_yaml
+        end
+      end
+
       def emit_events(event, *errors, region: nil)
         if event.is_a? Model::Event
           if options[:'very-verbose'] || event.name == :error
@@ -197,7 +239,8 @@ module Convection
         end
 
         errors.each do |error|
-          say "* #{ error.message }"
+          error = RuntimeError.new(error) if error.is_a?(String)
+          say "* #{ error_message }"
           error.backtrace.each { |trace| say "    #{ trace }" }
         end
       end

data/lib/convection/control/stack.rb

@@ -22,6 +22,8 @@ module Convection
       attr_reader :status
       alias_method :exist?, :exist
 
+      attr_reader :current_template
+
       attr_reader :attributes
       attr_reader :errors
       attr_reader :options

data/spec/convection/control/stack/after_create_tasks_spec.rb

@@ -38,7 +38,7 @@ module Convection::Control
       it 'is executed on Stack#apply' do
         subject.apply
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#apply is called' do

data/spec/convection/control/stack/after_delete_tasks_spec.rb

@@ -38,7 +38,7 @@ module Convection::Control
       it 'is executed on Stack#delete' do
         subject.delete
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#delete is called' do

data/spec/convection/control/stack/after_update_tasks_spec.rb

@@ -41,7 +41,7 @@ module Convection::Control
       it 'is executed on Stack#apply' do
         subject.apply
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#apply is called' do

data/spec/convection/control/stack/before_create_tasks_spec.rb

@@ -39,7 +39,7 @@ module Convection::Control
       it 'is executed on Stack#apply' do
         subject.apply
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#apply is called' do

data/spec/convection/control/stack/before_delete_tasks_spec.rb

@@ -38,7 +38,7 @@ module Convection::Control
       it 'is executed on Stack#delete' do
         subject.delete
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#delete is called' do

data/spec/convection/control/stack/before_update_tasks_spec.rb

@@ -42,7 +42,7 @@ module Convection::Control
       it 'is executed on Stack#apply' do
         subject.apply
 
-        expect(task.availability_zones).to include('eu-central-1')
+        expect(task.availability_zones).to include(a_string_starting_with('eu-central-1'))
       end
 
       it 'is deregistered after Stack#apply is called' do

data/spec/convection/control/stack_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+module Convection::Control
+  describe Stack do
+    let(:template) do
+      Convection.template do
+        description 'EC2 VPC Test Template'
+
+        ec2_vpc 'TargetVPC' do
+          network '10.0.0.0'
+          subnet_length 24
+          enable_dns
+        end
+      end
+    end
+
+    describe 'stack' do
+      include_context 'with a mock CloudFormation client'
+      include_context 'with a mock EC2 client'
+
+      before do
+        allow(Aws::CloudFormation::Client).to receive(:new).and_return(cf_client)
+        allow(Aws::EC2::Client).to receive(:new).and_return(ec2_client)
+      end
+      subject do
+        Convection::Control::Stack.new('EC2 VPC Test Stack', template)
+      end
+
+      it 'availability_zones are stored in an array' do
+        expect(subject.availability_zones).to be_a(Array)
+      end
+
+      it 'availability_zones are in the same region' do
+        azs = subject.availability_zones
+        azs.map! { |r| r.match(/(\w{2}-\w+-\d)/)[1] }
+        azs.uniq!
+        expect(azs.size).to be(1)
+      end
+    end
+  end
+end

data/spec/ec2_client_context.rb

@@ -1,6 +1,6 @@
 RSpec.shared_context 'with a mock EC2 client' do
   let(:ec2_availability_zone_description) do
-    zones = %w(eu-central-1 eu-west-1).map do |name|
+    zones = %w(eu-central-1a eu-central-1b).map do |name|
       double("availability zone (#{name})", zone_name: name)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -273,6 +273,7 @@ files:
 - spec/convection/control/stack/before_create_tasks_spec.rb
 - spec/convection/control/stack/before_delete_tasks_spec.rb
 - spec/convection/control/stack/before_update_tasks_spec.rb
+- spec/convection/control/stack_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/attributes_spec.rb
 - spec/convection/model/template/condition_spec.rb
@@ -340,6 +341,7 @@ test_files:
 - spec/convection/control/stack/before_create_tasks_spec.rb
 - spec/convection/control/stack/before_delete_tasks_spec.rb
 - spec/convection/control/stack/before_update_tasks_spec.rb
+- spec/convection/control/stack_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/attributes_spec.rb
 - spec/convection/model/template/condition_spec.rb