cfncli 0.3.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY0N2JmZDcxYzkxMGZkNjhlOThlMzgxOTgyMzczYWNiZGQzNDgyZA==
+    YjNiNjlmM2JmYzE1YTY1MWE5MjYyNjQ4MDcwZWNkNDFjNzM0MGVjNA==
   data.tar.gz: !binary |-
-    YjZiNDFiMDY4MWVhNWQ4NDEyN2FhZmViYWIzZjljZTI0YTBiZTJlNQ==
+    MzVhNzQ1MzExYjZjOTJlNTgyZjczZDliMTUxZjdjOTQyMTVhYzY2ZA==
 SHA512:
   metadata.gz: !binary |-
-    NjExNTMyNWQ3YzhiYjk2NTNhZDg3MWEwNTRmMTYwNDA0ZjY3OTFjNGEzMTNm
-    YzI3ZDRiZTE5NGRhNWY0ZTA2Yjg4OTFiNjg4OGQ0NmJlNGU0OWY0NmNlZDMz
-    YWFlZDRhMWE4YWM5Njk1MzUzNjhmNDVjYTE2M2IyODIwZWRiYzA=
+    ZjRlZDA3YzA3MmY5ZWUyOGE5ZTRhNjQ3YWNlNTBiNmE0Y2E4MTFiMTc1ZWM4
+    Y2VhZGQ5ZDdlYjU4YjJjYjBlMTlhZmNkZmNkOWJhYTMyMzc2N2Y2YTdlYjg1
+    NGI5NGRjYjljOGJmMmJiZjkxYTZlNWNkZmYxOGEwZTQyZmQxNjI=
   data.tar.gz: !binary |-
-    ZGE0ZTVhZGY0MzQ3MTUyMWNjN2M2OTNhM2Y1NDY3OWE4ZjhhNzE3ODBhOGEz
-    Mzg4MWI0OThkMTc4Y2JiYWNmMTU5NzdhYTAyNDdjYjU1MzUyODI2YjQzMTdm
-    ZDcxZWNiY2M2MTM5Mzg4NmVhNmQ1NTJmOTlmN2UzNDBmYzQ2NzE=
+    ODRkMGE3ZGI5NGY4MWI1NGJkYTllN2IwMmFmMjNkYWZiZTUwYTQ2ZGIxMDFh
+    OTAzZmE5NzEzMDM1MGQxMTViZDYxZjBjNDM0OTQ1NTNiM2QwN2E1NjYzNzI0
+    MWE1MWVkZjEyZTcyNjAwYTkxOGIwOGY1NzRlYjYxZjNlNjAzMTI=

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.3.1
 sudo: false
 before_install:
   - gem install bundler -v '~> 1.10'

data/cfncli.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "waiting", "~> 0"
   spec.add_dependency "activesupport", "~> 4"
   spec.add_dependency "colorize", "~> 0"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
 end

data/lib/cfncli/cloudformation.rb

@@ -43,7 +43,10 @@ module CfnCli
       logger.debug "Creating stack #{options['stack_name']}"
       stack = create_or_update_stack(options, config)
 
-      events(stack.stack_id, config)
+      events(stack, config)
+      Waiting.wait(interval: config.interval || default_config.interval, max_attempts: config.retries || default_config.retries) do |waiter|
+        waiter.done if stack.finished? && !stack.listing_events?
+      end  
     end
 
     # List stack events
@@ -85,6 +88,10 @@ module CfnCli
       end
     end
 
+    def default_config
+      Config::CfnClient.new
+    end
+
     private
 
     # Creates a new stack object

data/lib/cfncli/event.rb

@@ -6,6 +6,9 @@ module CfnCli
 
     attr_reader :event
 
+    RESOURCE_CREATE_INITIATED = 'Resource creation Initiated'.freeze
+    AWS_STACK_RESOURCE = 'AWS::CloudFormation::Stack'.freeze
+
     def initialize(event)
       @event = event
     end
@@ -20,6 +23,14 @@ module CfnCli
       return :red if failed?
     end
 
+    # Check if the current event has the signature of a child stack creation
+    def child_stack_create_event?
+      return false unless in_progress?
+      return false unless event.resource_type == AWS_STACK_RESOURCE
+      return false unless event.resource_status_reason == RESOURCE_CREATE_INITIATED
+      true
+    end
+
     def to_s
       "#{event.timestamp} #{event.resource_status} #{event.resource_type} #{event.logical_resource_id} #{event.resource_status_reason}"
     end

data/lib/cfncli/event_poller.rb

@@ -1,17 +1,27 @@
 require 'colorize'
 require 'cfncli/event'
+require 'thread'
 
 module CfnCli
   class EventPoller
+
     def initialize
+      @mutex = Mutex.new
+    end
+
+    def event(event, prefix = nil)
+      colorize Event.new(event), prefix
     end
 
-    def event(event)
-      colorize Event.new(event)
+    def colorize(event, prefix = nil)
+      @mutex.synchronize do
+        puts add_prefix(event.to_s, prefix).colorize(event.color)
+      end
     end
 
-    def colorize(event)
-      puts event.to_s.colorize(event.color)
+    def add_prefix(message, prefix = nil)
+      message = "#{prefix} - #{message}" unless prefix.nil?
+      message
     end
   end
 end

data/lib/cfncli/event_streamer.rb

@@ -1,5 +1,7 @@
 module CfnCli
   class EventStreamer
+    require 'cfncli/config'
+
     attr_reader :stack
     attr_reader :config
 
@@ -19,13 +21,14 @@ module CfnCli
     def each_event(&block)
       Waiting.wait(interval: config.interval, max_attempts: config.retries) do |waiter|
         list_events(&block)
-
         waiter.done if stack.finished?
       end
     end
 
     def list_events(&block)
-      @next_token = stack.events(@next_token).each do |event|
+      events = []
+      @next_token = stack.events(@next_token).each { |event| events << event }
+      events.sort { |a, b| a.timestamp <=> b.timestamp }.each do |event|
         yield event unless seen?(event) if block_given?
       end
    end

data/lib/cfncli/stack.rb

@@ -2,8 +2,10 @@ require 'cfncli/cfn_client'
 require 'cfncli/logger'
 require 'cfncli/config'
 require 'cfncli/event_streamer'
+require 'cfncli/event'
 require 'cfncli/states'
-
+require 'thread'
+require 'concurrent/array'
 require 'waiting'
 
 module CfnCli
@@ -13,6 +15,7 @@ module CfnCli
     include Loggable
 
     attr_reader :stack_name
+    attr_reader :child_stacks
 
     class StackNotFoundError < StandardError; end
 
@@ -21,6 +24,7 @@ module CfnCli
       @stack_id = nil
       @stack_name = stack_name
       @config = config || default_config
+      @child_stacks = Concurrent::Array.new
     end
 
     def default_config
@@ -88,10 +92,15 @@ module CfnCli
 
     # List all events in real time
     # @param poller [CfnCli::Poller] Poller class to display events
-    def list_events(poller, streamer = nil, config = nil)
-      streamer ||= EventStreamer.new(self, config)
-      streamer.each_event do |event|
-        poller.event(event)
+    def list_events(poller, streamer = nil, config = nil, event_prefix = nil)
+      @event_listing_thread = Thread.new do
+        streamer ||= EventStreamer.new(self, config)
+        streamer.each_event do |event|
+          if Event.new(event).child_stack_create_event?
+            track_child_stack(event.physical_resource_id, event.logical_resource_id, poller)
+          end
+          poller.event(event, event_prefix)
+        end
       end
     end
 
@@ -100,10 +109,15 @@ module CfnCli
       stack.events(next_token)
     end
 
+    # Is this stack currently listing events
+    def listing_events?
+      !@event_listing_thread.nil? && @event_listing_thread.alive?
+    end
+
     # Indicates if the stack is in a finished state
     def finished?
       return false if stack.nil?
-      finished_states.include? stack.stack_status
+      finished_states.include?(stack.stack_status)
     end
 
     # Indicates if the stack is in a successful state
@@ -133,5 +147,12 @@ module CfnCli
       @stack = cfn.stack(stack_id)
       @stack
     end
+
+    def track_child_stack(child_stack_id, logical_id, poller)
+      child_stack = Stack.new child_stack_id, @config
+      @child_stacks << child_stack
+      logger.debug "Listing events for child stack #{stack.stack_name}"
+      child_stack.list_events poller, nil, @config, logical_id
+    end
   end
 end

data/lib/cfncli/version.rb

@@ -1,3 +1,3 @@
 module CfnCli
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfncli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - lethalpaga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Creates a Cloudformation stack synchronously
 email:
 - lethalpaga@gmail.com