convection 0.4.3 → 1.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b593fbb400063b388fc2f1ca38713b989a8d99
-  data.tar.gz: a779862372fd3969006ab17f1f8729d06c4560bb
+  metadata.gz: 6ad55266b8d4a5fd1a16d8b8c396a3c2ecc22b27
+  data.tar.gz: 4c5ae734856b196c13f39fc42fd85fc69745a6bb
 SHA512:
-  metadata.gz: c152eed6ec1f2c4ce484d74fb2401d7282e0f39d797bef322d6771d9725a014901ed12013a6b0bca719163ab891a42563fc37977ac720a9e867525874fd39441
-  data.tar.gz: 0fc5f904fe4be7ce670b74d36304d40f44bd8581c11be1b55d647d399ca5b839d592eefd2e4d1e8183bb5d48133ec1062aafa54d9a0bf558e5055e5855aaa446
+  metadata.gz: 018341e258e456483c9f5ebde1116cd8a71196fb972b865c62f08f0f3b87dca8a0f010e6b9e9d995c36b39240b9cdc54b0dbb7abd9f58dd252951eed766c9447
+  data.tar.gz: 8a9a17d9ee215c6b6c1c26340e99bae7a13518f7a24d62362d02aa3302916a7f8cea93b07840c003cfa8f4859c65ffdf4af4b6496b256fb1101a2de42943cf96

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!-- Remove any sections that do not apply to your problems. HTML comments are ignored. -->
+# Description
+<!-- Describe your problem here. -->
+<!-- Include references to relevant pull requests/commits here. -->
+
+## Expected behavior
+<!-- Describe your expected behavior here. -->
+
+## Observed behavior
+<!-- Describe your observed behavior here. -->
+
+## Steps to Reproduce
+<!-- Describe the steps to reproduce the observed behavior. -->
+<!-- Have a failing spec for this? :) -->
+
+# Stack Trace or Log Messages
+<!-- Use the following format for showing stack traces: -->
+<details>
+<summary>Stack trace for `brief error context`</summary>
+<pre>
+... Full error context (collapses by default) ...
+</pre>
+</details>

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!-- Remove any sections that do not apply to your changes. HTML comments are ignored. -->
+# Description
+<!-- Describe your changes here. -->
+<!-- Include references to relevant pull requests/commits here. -->
+<!-- * Did you update documentation? -->
+<!-- * Did you update test coverage? -->
+
+# Motivation and Context
+<!-- Describe the use case that requires your changes. -->
+
+# Usage Examples
+<!-- Code or screenshot examples of using your feature, if applicable. -->
+
+# Testing Steps
+<!-- List any steps required to test your changes. -->
+
+# Post-merge Steps
+<!-- List any steps required after merging your changes. -->

data/{LICENSE → LICENSE.md}

@@ -1,3 +1,4 @@
+Copyright (c) 2016 Bryan Call and Erran Carey, Rapid7 LLC.
 Copyright (c) 2015 John Manero, Rapid7 LLC.
 
 MIT License

data/README.md

@@ -1,10 +1,10 @@
-# Convection [![Build Status](https://travis-ci.org/rapid7/convection.svg)](https://travis-ci.org/rapid7/convection)
+# Convection [![Build Status](https://api.travis-ci.org/rapid7/convection.svg?branch=master)](https://travis-ci.org/rapid7/convection)
 _A fully generic, modular DSL for AWS CloudFormation_
 
 This gem aims to provide a reusable model for AWS CloudFormation in Ruby. It exposes a DSL for template definition, and a simple, decoupled abstraction of a CloudFormation Stack to compile and apply templates.
 
 ## Contributing
-Please read our [Contributing guidelines](CONTRIBUTING.md) for more information on contributing to Convection.
+Please read our [Contributing guidelines](.github/CONTRIBUTING.md) for more information on contributing to Convection.
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -23,9 +23,10 @@ Or install it yourself as:
 
 ##CLI Commands
 ###### Converging
-- To converge all stacks in your cloudfile run `convection converge`. If you provide the name of your stack as a additional argument such as `convection converge my-stack-name` then all stacks above and including the stack you specified will be converged.
+- To converge all stacks in your cloudfile run `convection converge` in the same directory as your cloudfile or use `--cloudfiles` and specify the path to the cloudfile. If you provide the name of your stack as a additional argument such as `convection converge my-stack-name` then all stacks above and including the stack you specified will be converged.
 - To converge a stack group run `convection converge --stack_group YOUR_STACK_GROUP_NAME`
 - To converge a specific stack or a list of stacks run `convection converge --stacks stackA stackB ...`
+- To converge multiple cloudfiles at the same time run use the `--cloudfiles`  option providing the path to the cloudfiles. Example `bundle exec convection converge --cloudfiles us-east-1/Cloudfile eu-central-1/Cloudfile`
 
 ###### Diff
 - To display a diff between your local changes and the version of your stack in cloud formation of your changes run `convection diff`.
@@ -36,7 +37,7 @@ Or install it yourself as:
 - To print out a list of available cli options with their descriptions run `convection help`.
 
 ###### Print
-- To print out the cloud formation template for a specific stack run `convection print my-stack-name`.
+- To print out the cloud formation template for a specific stack run `convection print-template my-stack-name`.
 
 ###### Validate
 - To validate your stack is not missing a required resource run `convection validate my-stack-name`.
@@ -45,29 +46,4 @@ Or install it yourself as:
 We highly recommend consulting the [getting started guide](./docs/getting-started.md) for a in depth walk through on how to to set up your project and create and deploy a stack. Example stacks and resources are available in the [convection/example](https://github.com/rapid7/convection/tree/master/example) folder
 
 ## License
-_Copyright (c) 2015 John Manero, Rapid7 LLC._
-
-```
-MIT License
-===========
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-```
+Convection is distributed under the MIT license - please refer to the [LICENSE](LICENSE.md) for more information.

data/bin/convection

@@ -1,47 +1,42 @@
 #!/usr/bin/env ruby
 require 'thor'
 require_relative '../lib/convection/control/cloud'
-
+require 'thread'
 module Convection
   ##
   # Convection CLI
   ##
   class CLI < Thor
-    class_option :cloudfile, :type => :string, :default => 'Cloudfile'
     def initialize(*args)
       super
-      @cloud = Control::Cloud.new
       @cwd = Dir.getwd
+      @errors = false
     end
 
     desc 'converge STACK', 'Converge your cloud'
     option :stack_group, :type => :string, :desc => 'The name of a stack group defined in your cloudfile to converge'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to converge'
+    option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress', default: true
+    option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks', default: true
+    option :cloudfiles, :type => :array, :default => %w(Cloudfile)
+    option :delayed_output, :type => :boolean, :desc => 'Delay output until operation completion.', :default => false
     def converge(stack = nil)
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      @cloud.converge(stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |event, errors|
-        say_status(*event.to_thor)
-        errors.each do |error|
-          say "* #{ error.message }"
-          error.backtrace.each { |b| say "    #{ b }" }
-        end unless errors.nil?
-      end
+      @outputs = []
+      operation('converge', stack)
+      print_outputs(@outputs) if @outputs && @outputs.any?
+      exit 1 if @errors
     end
 
     desc 'delete STACK', 'Delete stack(s) from your cloud'
     option :stack_group, :type => :string, :desc => 'The name of a stack group defined in your cloudfile to delete'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to delete'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
+    option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress', default: true
+    option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks', default: true
     def delete(stack = nil)
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      print_status = lambda do |event, *errors|
-        say_status(*event.to_thor)
-        errors.flatten.each do |error|
-          say "* #{ error.message }"
-          error.backtrace.each { |b| say "    #{ b }" }
-        end unless errors.nil?
-      end
+      init_cloud
 
-      stacks = @cloud.stacks_until(stack, options, &print_status)
+      stacks = @cloud.stacks_until(stack, options, &method(:emit_events))
       if stacks.empty?
         say_status(:delete_failed, 'No stacks found matching the provided input (STACK, --stack-group, and/or --stacks).', :red)
         return
@@ -50,51 +45,183 @@ module Convection
 
       confirmation = ask('Are you sure you want to delete the above stack(s)?', limited_to: %w(yes no))
       if confirmation.eql?('yes')
-        @cloud.delete(stacks, &print_status)
+        @cloud.delete(stacks, &method(:emit_events))
       else
         say_status(:delete_aborted, 'Aborted deletion of the above stack(s).', :green)
       end
     end
 
     desc 'diff STACK', 'Show changes that will be applied by converge'
-    option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress'
-    option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
     option :stack_group, :type => :string, :desc => 'The name of a stack group defined in your cloudfile to diff'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to diff'
+    option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress'
+    option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
+    option :cloudfiles, :type => :array, :default => %w(Cloudfile)
+    option :delayed_output, :type => :boolean, :desc => 'Delay output until operation completion.', :default => false
     def diff(stack = nil)
+      @outputs = []
+      operation('diff', stack)
+      print_outputs(@outputs) if @outputs && @outputs.any?
+      exit 1 if @errors
+    end
+
+    desc 'print_template STACK', 'Print the rendered template for STACK'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
+    def print_template(stack)
+      init_cloud
+      puts @cloud.stacks[stack].to_json(true)
+    end
+
+    desc 'describe-tasks [--stacks STACKS]', 'Describe tasks for a given stack'
+    option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to diff', default: []
+    def describe_tasks
+      @cloud = Control::Cloud.new
       @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      last_event = nil
 
-      @cloud.diff(stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |d|
-        if d.is_a? Model::Event
-          if options[:'very-verbose'] || d.name == :error
-            say_status(*d.to_thor)
+      describe_stack_tasks(options[:stacks])
+    end
+
+    desc 'run-tasks [--stack STACK]', 'Run tasks for a given stack'
+    option :stack, :desc => 'The stack to run tasks for', :required => true
+    def run_tasks
+      @cloud = Control::Cloud.new
+      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
+
+      run_stack_tasks(options[:stack])
+    end
+
+    desc 'validate STACK', 'Validate the rendered template for STACK'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
+    def validate(stack)
+      init_cloud
+      @cloud.stacks[stack].validate
+    end
+
+    no_commands do
+      attr_accessor :last_event
+
+      private
+
+      def operation(task_name, stack)
+        work_q = Queue.new
+        semaphore = Mutex.new
+        unless options[:delayed_output]
+          puts 'For easier reading when using multiple cloudfiles output can be delayed until task completion.'
+          puts 'If you would like delayed output please use the "--delayed_output true" option.'
+        end
+        options[:cloudfiles].each { |cloudfile| work_q.push(cloud: Control::Cloud.new, cloudfile_path: cloudfile) }
+        workers = (0...options[:cloudfiles].length).map do
+          Thread.new do
+            until work_q.empty?
+              output = []
+              cloud_array = work_q.pop(true)
+              cloud_array[:cloud].configure(File.absolute_path(cloud_array[:cloudfile_path], @cwd))
+              cloud = cloud_array[:cloud]
+              region = cloud.cloudfile.region
+              cloud.send(task_name, stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |event, errors|
+                if options[:cloudfiles].length > 1 && options[:delayed_output]
+                  output << { event: event, errors: errors }
+                else
+                  emit_events(event, *errors, region: region)
+                end
+                semaphore.synchronize { @errors = errors.any? if errors }
+              end
+              if options[:cloudfiles].length > 1 && options[:delayed_output]
+                semaphore.synchronize { @outputs << { cloud_name: cloud.cloudfile.name, region: region, logging: output } }
+              end
+            end
+          end
+        end
+        workers.each(&:join)
+      end
+
+      def describe_stack_tasks(stacks_to_include)
+        @cloud.stacks.map do |stack_name, stack|
+          next if stacks_to_include.any? && !stacks_to_include.include?(stack_name)
+          tasks = stack.tasks.values.flatten.uniq
+          next if tasks.empty?
+
+          puts "Stack #{stack_name} (#{stack.cloud_name}) includes the following tasks:"
+          tasks.each_with_index do |task, index|
+            puts " #{index}. #{task}"
+          end
+        end
+      end
+
+      def run_stack_tasks(stack_name)
+        stack = @cloud.stacks[stack_name]
+        tasks = stack.tasks.values.flatten.uniq
+        if !stack
+          say_status(:task_failed, 'No stacks found matching the provided input (--stack).', :red)
+          exit 1
+        elsif tasks.empty?
+          say_status(:task_failed, "No tasks defined for the stack #{stack_name}. Define them in your Cloudfile.", :red)
+          exit 1
+        end
+
+        puts "The following tasks are available to execute for the stack #{stack_name} (#{stack.cloud_name}):"
+        tasks.each_with_index do |task, index|
+          puts " #{index}. #{task}"
+        end
+        choices = 0.upto(tasks.length - 1).map(&:to_s)
+        choice = ask('Which stack task would you like to execute? (ctrl-c to exit)', limited_to: choices)
+        task = tasks[choice.to_i]
+
+        say_status(:task_in_progress, "Task #{task} in progress for stack #{stack_name}.", :yellow)
+        task.call(stack)
+
+        if task.success?
+          say_status(:task_complete, "Task #{task} successfully completed for stack #{stack_name}.", :green)
+        else
+          say_status(:task_failed, "Task #{task} failed to complete for stack #{stack_name}.", :red)
+          exit 1
+        end
+      end
+
+      def emit_events(event, *errors, region: nil)
+        if event.is_a? Model::Event
+          if options[:'very-verbose'] || event.name == :error
+            print_info(event, region: region)
           elsif options[:verbose]
-            say_status(*d.to_thor) if d.name == :compare
+            print_info(event, region: region) if event.name == :compare
           end
-          last_event = d
-        elsif d.is_a? Model::Diff
+          @last_event = event
+        elsif event.is_a? Model::Diff
           if !options[:'very-verbose'] && !options[:verbose]
-            say_status(*last_event.to_thor) unless last_event.nil?
-            last_event = nil
+            print_info(last_event, region: region) unless last_event.nil?
+            @last_event = nil
           end
-          say_status(*d.to_thor)
+          print_info(event, region: region)
         else
-          say_status(*d.to_thor)
+          print_info(event, region: region)
+        end
+
+        errors.each do |error|
+          say "* #{ error.message }"
+          error.backtrace.each { |trace| say "    #{ trace }" }
         end
       end
-    end
 
-    desc 'print STACK', 'Print the rendered template for STACK'
-    def print(stack)
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      puts @cloud.stacks[stack].to_json(true)
-    end
+      def print_info(say, region: nil)
+        print "#{region} " if region
+        say_status(*say.to_thor)
+      end
 
-    desc 'validate STACK', 'Validate the rendered template for STACK'
-    def validate(stack)
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      @cloud.stacks[stack].validate
+      def print_outputs(outputs)
+        outputs.each do |output|
+          puts '********'
+          puts "Cloud name: #{output[:cloud_name]}. Region: #{output[:region]}."
+          puts '********'
+          output[:logging].each do |hash|
+            emit_events(hash[:event], *hash[:errors])
+          end
+        end
+      end
+
+      def init_cloud
+        @cloud = Control::Cloud.new
+        @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
+      end
     end
   end
 end

data/docs/getting-started.md

@@ -202,11 +202,11 @@ compare  Compare local state of stack vpc (convection-demo-vpc) with remote temp
  create  .Resources.DemoVPC.Properties.Tags.0.Key: Name
  create  .Resources.DemoVPC.Properties.Tags.0.Value: convection-demo-vpc
 ```
-To see what the cloud formation template for your vpc template would look like you can run `convection print vpc`.
+To see what the cloud formation template for your vpc template would look like you can run `convection print_template vpc`.
 This can help you verify that values referenced under the `stack` namespace are set correctly.
 
 ```json
-$> convection print vpc
+$> convection print-template vpc
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Description": "VPC with Public and Private Subnets (NAT)",

data/docs/index.md

@@ -1,10 +1,10 @@
-# Convection [![Build Status](https://travis-ci.org/rapid7/convection.svg)](https://travis-ci.org/rapid7/convection)
+# Convection [![Build Status](https://api.travis-ci.org/rapid7/convection.svg?branch=master)](https://travis-ci.org/rapid7/convection)
 _A fully generic, modular DSL for AWS CloudFormation_
 
 This gem aims to provide a reusable model for AWS CloudFormation in Ruby. It exposes a DSL for template definition, and a simple, decoupled abstraction of a CloudFormation Stack to compile and apply templates.
 
 ## Contributing
-Please read our [Contributing guidelines](CONTRIBUTING.md) for more information on contributing to Convection.
+Please read our [Contributing guidelines](.github/CONTRIBUTING.md) for more information on contributing to Convection.
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -23,9 +23,10 @@ Or install it yourself as:
 
 ##CLI Commands
 ###### Converging
-- To converge all stacks in your cloudfile run `convection converge`. If you provide the name of your stack as a additional argument such as `convection converge my-stack-name` then all stacks above and including the stack you specified will be converged.
+- To converge all stacks in your cloudfile run `convection converge` in the same directory as your cloudfile or use `--cloudfiles` and specify the path to the cloudfile. If you provide the name of your stack as a additional argument such as `convection converge my-stack-name` then all stacks above and including the stack you specified will be converged.
 - To converge a stack group run `convection converge --stack_group YOUR_STACK_GROUP_NAME`
 - To converge a specific stack or a list of stacks run `convection converge --stacks stackA stackB ...`
+- To converge multiple cloudfiles at the same time run use the `--cloudfiles`  option providing the path to the cloudfiles. Example `bundle exec convection converge --cloudfiles us-east-1/Cloudfile eu-central-1/Cloudfile`
 
 ###### Diff
 - To display a diff between your local changes and the version of your stack in cloud formation of your changes run `convection diff`.
@@ -36,7 +37,7 @@ Or install it yourself as:
 - To print out a list of available cli options with their descriptions run `convection help`.
 
 ###### Print
-- To print out the cloud formation template for a specific stack run `convection print my-stack-name`.
+- To print out the cloud formation template for a specific stack run `convection print-template my-stack-name`.
 
 ###### Validate
 - To validate your stack is not missing a required resource run `convection validate my-stack-name`.
@@ -45,29 +46,4 @@ Or install it yourself as:
 We highly recommend consulting the [getting started guide](./docs/getting-started.md) for a in depth walk through on how to to set up your project and create and deploy a stack. Example stacks and resources are available in the [convection/example](https://github.com/rapid7/convection/tree/master/example) folder
 
 ## License
-_Copyright (c) 2015 John Manero, Rapid7 LLC._
-
-```
-MIT License
-===========
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-```
+Convection is distributed under the MIT license - please refer to the [LICENSE](LICENSE.md) for more information.

data/lib/convection/control/cloud.rb

@@ -7,6 +7,7 @@ module Convection
     # Control tour Clouds
     ##
     class Cloud
+      attr_accessor :cloudfile
       def configure(cloudfile)
         @cloudfile = Model::Cloudfile.new(cloudfile)
       end
@@ -69,10 +70,13 @@ module Convection
           return
         end
 
+        exit 1 if stack_initialization_errors?(&block)
+
         filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:converge, "Stack #{ stack.name }", :info)) if block
           stack.apply(&block)
 
+          emit_credential_error_and_exit!(stack, &block) if stack.credential_error?
           if stack.error?
             block.call(Model::Event.new(:error, "Error converging stack #{ stack.name }", :error), stack.errors) if block
             break
@@ -88,6 +92,8 @@ module Convection
       end
 
       def delete(stacks, &block)
+        exit 1 if stack_initialization_errors?(&block)
+
         stacks.each do |stack|
           unless stack.exist?
             block.call(Model::Event.new(:delete_skipped, "Stack #{ stack.cloud_name } does not exist remotely", :warn))
@@ -114,10 +120,21 @@ module Convection
           return
         end
 
+        exit 1 if stack_initialization_errors?(&block)
+
         filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:compare, "Compare local state of stack #{ stack.name } (#{ stack.cloud_name }) with remote template", :info))
 
           difference = stack.diff
+          # Find errors during diff
+          emit_credential_error_and_exit!(stack, &block) if stack.credential_error?
+          if stack.error?
+            errors = stack.errors.collect { |x| x.exception.message }
+            errors = errors.uniq.flatten
+            block.call(Model::Event.new(:error, "Error diffing stack #{ stack.name} Error(s): #{errors.join(', ')}", :error), stack.errors) if block
+            break
+          end
+
           if difference.empty?
             difference << Model::Event.new(:unchanged, "Stack #{ stack.cloud_name } has no changes", :info)
           end
@@ -125,9 +142,32 @@ module Convection
           difference.each { |diff| block.call(diff) }
 
           break if !to_stack.nil? && stack.name == to_stack
-          sleep rand @cloudfile.splay || 2
         end
       end
+
+      def stack_initialization_errors?(&block)
+        errors = []
+        # Find errors during stack init
+        stacks.each_value do |stack|
+          if stack.error?
+            errors << stack.errors.collect { |x| x.exception.message }
+          end
+        end
+
+        unless errors.empty?
+          errors = errors.uniq.flatten
+          block.call(Model::Event.new(:error, "Error(s) during stack initialization #{errors.join(', ')}", :error), errors) if block
+          return true
+        end
+        false
+      end
+
+      def emit_credential_error_and_exit!(stack, &block)
+        event = Model::Event.new(:error, "Credentials expired while converging #{ stack.name }. " \
+                                 'Visit the AWS console to track progress of the stack being created/updated.', :error)
+        block.call(event, stack.errors) if block
+        exit 1
+      end
     end
   end
 end

data/lib/convection/control/stack.rb

@@ -115,10 +115,12 @@ module Convection
 
         @attributes = options.delete(:attributes) { |_| Model::Attributes.new }
         @options = options
+        @retry_limit = options[:retry_limit] || 7
 
         client_options = {}.tap do |opt|
           opt[:region] = @region
           opt[:credentials] = @credentials unless @credentials.nil?
+          opt[:retry_limit] = @retry_limit
         end
         @ec2_client = Aws::EC2::Client.new(client_options)
         @cf_client = Aws::CloudFormation::Client.new(client_options)
@@ -143,10 +145,17 @@ module Convection
         #     in the dependency tree to avoid the chicken-and-egg problem.
         @template.execute
 
-        ## Get initial state
+      rescue Aws::Errors::ServiceError => e
+        @errors << e
+      end
+
+      def template_status
         get_status(cloud_name)
-        return unless exist?
+      rescue Aws::Errors::ServiceError => e
+        @errors << e
+      end
 
+      def load_template_info
         get_resources
         get_template
         resource_attributes
@@ -185,6 +194,11 @@ module Convection
         @attributes.set(name, key, value)
       end
 
+      # @see Convection::Model::Attributes#fetch
+      def fetch(*args)
+        @attributes.fetch(*args)
+      end
+
       # @see Convection::Model::Attributes#get
       def get(*args)
         @attributes.get(*args)
@@ -209,6 +223,12 @@ module Convection
         [CREATE_COMPLETE, ROLLBACK_COMPLETE, UPDATE_COMPLETE, UPDATE_ROLLBACK_COMPLETE].include?(status)
       end
 
+      # @return [Boolean] whether a credential error occurred is the reason
+      #   accessing the CloudFormation stack failed.
+      def credential_error?
+        error? && errors.all? { |e| e.class == Aws::EC2::Errors::RequestExpired }
+      end
+
       # @return [Boolean] whether the CloudFormation Stack is in one of
       #   the several *_COMPLETE states.
       def delete_complete?

data/lib/convection/dsl/intrinsic_functions.rb

@@ -27,6 +27,12 @@ module Convection
         }
       end
 
+      def fn_import_value(value)
+        {
+          'Fn::ImportValue' => value
+        }
+      end
+
       def fn_not(condition)
         {
           'Fn::Not' => [condition]

data/lib/convection/model/attributes.rb

@@ -19,6 +19,14 @@ module Convection
           @parameters.include?(key) || @outputs.include?(key) || @resources.include?(key)
         end
 
+        def fetch(key, default = nil)
+          @parameters.fetch(key.to_s) do
+            @outputs.fetch(key.to_s) do
+              @resources.fetch(key.to_s, default)
+            end
+          end
+        end
+
         def [](key)
           @parameters[key.to_s] || @outputs[key.to_s] || @resources[key.to_s]
         end
@@ -40,6 +48,13 @@ module Convection
         @stacks.include?(stack) && @stacks[stack].include?(key)
       end
 
+      def fetch(stack, key, default = nil)
+        return get(stack, key, default) unless default.nil?
+        raise KeyError, "key '#{key}' not found for stack '#{stack}'" unless include?(stack, key)
+
+        @stacks[stack.to_s].fetch(key.to_s)
+      end
+
       def get(stack, key, default = nil)
         include?(stack, key) ? @stacks[stack.to_s][key.to_s] : default
       end

data/lib/convection/model/cloudfile.rb

@@ -2,6 +2,7 @@ require_relative '../control/stack'
 require_relative '../dsl/helpers'
 require_relative '../model/attributes'
 require_relative '../model/template'
+require 'thread'
 
 module Convection
   module DSL
@@ -14,6 +15,8 @@ module Convection
       attribute :name
       attribute :region
       attribute :splay
+      attribute :retry_limit
+      attribute :thread_count
 
       ## Helper to define a template in-line
       def template(*args, &block)
@@ -31,6 +34,7 @@ module Convection
         options[:region] ||= region
         options[:cloud] = name
         options[:attributes] = attributes
+        options[:retry_limit] = retry_limit
 
         @stacks[stack_name] = Control::Stack.new(stack_name, template, options, &block)
         @deck << @stacks[stack_name]
@@ -59,8 +63,22 @@ module Convection
         @stacks = {}
         @deck = []
         @stack_groups = {}
+        @thread_count ||= 2
 
         instance_eval(IO.read(cloudfile), cloudfile, 1)
+
+        work_q = Queue.new
+        @deck.each { |stack| work_q.push(stack) }
+        workers = (0...@thread_count).map do
+          Thread.new do
+            until work_q.empty?
+              stack = work_q.pop(true)
+              stack.template_status
+              stack.load_template_info if stack.exist?
+            end
+          end
+        end
+        workers.each(&:join)
       end
     end
   end

data/lib/convection/model/template.rb

@@ -17,6 +17,7 @@ module Convection
         class << self
           ## Wrap private define_method
           def attach_resource(name, klass)
+            resource_dsl_methods[name.to_s] = klass
             define_method(name) do |rname, &block|
               resource = klass.new(rname, self)
               resource.instance_exec(&block) if block
@@ -26,10 +27,19 @@ module Convection
           end
 
           def attach_resource_collection(name, klass)
+            resource_collection_dsl_methods[name.to_s] = klass
             define_method(name) do |rname, &block|
               resource_collections[rname] = klass.new(rname, self, &block)
             end
           end
+
+          def resource_dsl_methods
+            @resource_dsl_methods ||= {}
+          end
+
+          def resource_collection_dsl_methods
+            @resource_collection_dsl_methods ||= {}
+          end
         end
       end
 
@@ -79,6 +89,12 @@ module Convection
         r = Model::Template::Resource.new(name, self)
 
         r.instance_exec(&block) if block
+        predefined_resources = DSL::Template::Resource.resource_dsl_methods.select { |_, resource_class| resource_class.type == r.type }.keys
+        if predefined_resources.any?
+          dsl_methods = predefined_resources.map { |resource| "##{resource}" }.join(', ')
+          warn "WARNING: The resource type #{r.type} is already defined. " \
+            "You can use any of the following resource methods instead of manually constructing a resource: #{dsl_methods}"
+        end
         resources[name] = r
       end
 

data/lib/convection/model/template/output.rb

@@ -15,6 +15,7 @@ module Convection
         attribute :name
         attribute :value
         attribute :description
+        attribute :export_as
         attr_reader :template
 
         def initialize(name, parent)
@@ -31,6 +32,7 @@ module Convection
             'Description' => description
           }.tap do |output|
             render_condition(output)
+            output['Export'] = { 'Name' => export_as } if export_as
           end
         end
       end

data/lib/convection/model/template/resource/aws_auto_scaling_auto_scaling_group.rb

@@ -8,8 +8,6 @@ module Convection
         # AWS::AutoScaling::AutoScalingGroup
         ##
         class AutoScalingGroup < Resource
-          include Model::Mixin::Taggable
-
           type 'AWS::AutoScaling::AutoScalingGroup'
           property :availability_zone, 'AvailabilityZones', :array
           property :cooldown, 'Cooldown'
@@ -33,10 +31,34 @@ module Convection
             end
           end
 
+          def tag(key, value, propagate_at_launch: nil)
+            tags[key] = { value: value }
+            tags[key][:propagate_at_launch] = propagate_at_launch unless propagate_at_launch.nil?
+
+            tags[key]
+          end
+
+          def tags
+            @tags ||= {}
+          end
+
           def update_policy(&block)
             policy = ResourceAttribute::UpdatePolicy.new(self)
             policy.instance_exec(&block) if block
           end
+
+          private
+
+          def render_tags(resource)
+            rendered_tags = tags.map do |key, tag|
+              rendered = { 'Key' => key, 'Value' => tag[:value] }
+              rendered['PropagateAtLaunch'] = tag[:propagate_at_launch] if tag.key?(:propagate_at_launch)
+
+              rendered
+            end
+
+            resource['Properties']['Tags'] = rendered_tags unless rendered_tags.empty?
+          end
         end
       end
     end

data/lib/convection/model/template/resource_property/aws_cloudfront_defaultcachebehavior.rb

@@ -9,6 +9,8 @@ module Convection
         class CloudFrontDefaultCacheBehavior < ResourceProperty
           property :allowed_methods, 'AllowedMethods', :type => :list, :default => %w(HEAD GET)
           property :cached_methods, 'CachedMethods', :type => :list
+          property :compress, 'Compress'
+          property :default_ttl, 'DefaultTTL'
           property :forwarded_values, 'ForwardedValues'
           property :min_ttl, 'MinTTL'
           property :smooth_streaming, 'SmoothStreaming'

data/spec/convection/model/attributes_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+module Convection::Model
+  describe Attributes do
+    subject { Attributes.new }
+
+    describe '#fetch' do
+      it 'raises a key error if the key was not defined' do
+        expect { subject.fetch('<stack-name>', '<attribute-key>') }.to raise_error(KeyError)
+      end
+
+      ['<truthy object>', true, false].each do |default|
+        it "supports #{default.inspect} as the default value when no value was set" do
+          expect { subject.fetch('<stack-name>', '<attribute-key>', default) }.to_not raise_error
+        end
+
+        it "supports #{default.inspect} as a default value" do
+          observed = subject.fetch('<stack-name>', '<attribute-key>', default)
+          expect(observed).to eq(default)
+        end
+      end
+
+      ['truthy object', true, false, nil].each do |value|
+        it "does not raise a key error when #{value.inspect} was previously set" do
+          subject.set('<stack-name>', '<attribute-key>', value)
+
+          expect { subject.fetch('<stack-name>', '<attribute-key>') }.to_not raise_error
+        end
+
+        it "supports #{value.inspect} as a return value" do
+          subject.set('<stack-name>', '<attribute-key>', value)
+
+          observed = subject.fetch('<stack-name>', '<attribute-key>')
+          expect(observed).to eq(value)
+        end
+      end
+    end
+  end
+end

data/spec/convection/model/template/condition_spec.rb

@@ -10,8 +10,7 @@ class Convection::Model::Template
           fn_equals 'prod', 'prod'
         end
 
-        resource 'SecurityGroup' do
-          type 'AWS::EC2::SecurityGroup'
+        ec2_security_group 'SecurityGroup' do
           condition 'InProd'
         end
       end

data/spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+class Convection::Model::Template::Resource
+  describe AutoScalingGroup do
+    subject do
+      parent = double(:template)
+      allow(parent).to receive(:template).and_return(parent)
+
+      described_class.new('MyAutoScalingGroup', parent)
+    end
+
+    it 'should not render tags when none have been defined' do
+      expect(subject.render['Properties']['Tags']).to be_nil
+    end
+
+    it 'renders a regular tag' do
+      subject.tag '<tag-name>', '<tag-value>'
+      expect(subject.render['Properties']['Tags']).to include(a_hash_including('Key' => '<tag-name>'))
+    end
+
+    it 'renders a tag that should be propagated at launch' do
+      subject.tag '<tag-name>', '<tag-value>', propagate_at_launch: true
+      expect(subject.render['Properties']['Tags']).to include(a_hash_including('Key' => '<tag-name>', 'PropagateAtLaunch' => true))
+    end
+
+    it 'renders a tag that should not be propagated at launch' do
+      subject.tag '<tag-name>', '<tag-value>', propagate_at_launch: false
+      expect(subject.render['Properties']['Tags']).to include(a_hash_including('Key' => '<tag-name>', 'PropagateAtLaunch' => false))
+    end
+  end
+end

data/spec/convection/model/template/template_spec.rb

@@ -19,6 +19,36 @@ class Convection::Model::Template
       end
     end
 
+    describe '#resource' do
+      context 'when defining a predefined resource' do
+        subject do
+          Convection.template do
+            resource 'FooInstance' do
+              type 'AWS::EC2::Instance'
+            end
+          end
+        end
+
+        it 'warns the user when they are using a predefined resource.' do
+          expect { subject.render }.to output(/.*already defined.*/).to_stderr
+        end
+      end
+
+      context 'when defining a undefined resource' do
+        subject do
+          Convection.template do
+            resource 'FooInstance' do
+              type 'FakeResource'
+            end
+          end
+        end
+
+        it 'warns the user when they are using a undefined resource.' do
+          expect { subject.render }.to_not output.to_stderr
+        end
+      end
+    end
+
     subject do
       template_json
     end

data/spec/convection/model/template/validate_bytesize_spec.rb

@@ -21,13 +21,13 @@ class Convection::Model::Template
           description 'Validations Test Template - Excessive Bytesize'
 
           200.times do |count|
-            resource "EC2_INSTANCE_#{count}" do
-              type 'AWS::EC2::Instance'
-              property 'AvailabilityZone', 'us-east-1a'
+            ec2_instance "EC2_INSTANCE_#{count}" do
+              availability_zone 'us-east-1a'
               property 'ImageId', 'ami-76e27e1e'
               property 'KeyName', 'test'
-              property 'SecurityGroupIds', ['sg-dd733c41', 'sg-dd738df3']
-              property 'Tags', [{ 'Key' => 'Name', 'Value' => 'test-1' }]
+              security_group 'sg-dd733c41'
+              security_group 'sg-dd738df3'
+              tag 'Name', 'test-1'
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0.pre.beta.1
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -76,15 +76,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
-- CONTRIBUTING.md
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - Thorfile
@@ -242,7 +244,9 @@ files:
 - spec/convection/control/stack/before_delete_tasks_spec.rb
 - spec/convection/control/stack/before_update_tasks_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
+- spec/convection/model/attributes_spec.rb
 - spec/convection/model/template/condition_spec.rb
+- spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
 - spec/convection/model/template/resource/ec2_dhcp_options_spec.rb
 - spec/convection/model/template/resource/ec2_security_group_spec.rb
@@ -287,12 +291,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fully generic, modular DSL for AWS CloudFormation
@@ -306,7 +310,9 @@ test_files:
 - spec/convection/control/stack/before_delete_tasks_spec.rb
 - spec/convection/control/stack/before_update_tasks_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
+- spec/convection/model/attributes_spec.rb
 - spec/convection/model/template/condition_spec.rb
+- spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
 - spec/convection/model/template/resource/ec2_dhcp_options_spec.rb
 - spec/convection/model/template/resource/ec2_security_group_spec.rb