autostacker24 1.0.41 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f0d76f561b986df8b2af5fa464b634c6b8ba0d
-  data.tar.gz: e11ad369e90c274c0fb47d6f55f0270b58e80509
+  metadata.gz: 6a0b18224e1a9cf2044914d69fbc27d7e1633cbf
+  data.tar.gz: 23809d1e229d11f182c7d6b6b99de91e6e8385a9
 SHA512:
-  metadata.gz: c7a9245207abefb4b1a468668fab9d4ba416af9e152d49a63d11ba0d77805f477dd968b66684e2f0c426223c9c4597071bf00d6a12b9eace58feefbb3cf44e30
-  data.tar.gz: dbf24a05889a6877784b9ab348a8748c0390a2cc6b6a8a3be107c54f29c63a38b1ba3cf6dced0a06c71f81fad282319ded5e5644a2f8d895868d4513bad36eec
+  metadata.gz: a6595cc004225647cf56eaed70746f363819efc1c5a31814c60b719927cfab8d18754c74bdb2b2299d97c001f1c33cee68fe74c2f05501f0ca9890c640b03fe2
+  data.tar.gz: 3e778ee5ed4fdf9d9fac3b21e89663c2d95bb8df5252d2d88ac1368183712b6d072289cdf642cb1f611a661556a0908216a9097823b9156685313b2c21b91bc0

data/lib/autostacker24/stacker.rb

@@ -83,8 +83,12 @@ module Stacker
   end
 
   def wait_for_stack(stack_name, operation, timeout_in_minutes = 15)
-    stop_time = Time.now + timeout_in_minutes * 60
-    finished = /(CREATE_COMPLETE|UPDATE_COMPLETE|DELETE_COMPLETE|ROLLBACK_COMPLETE|ROLLBACK_FAILED|CREATE_FAILED|DELETE_FAILED)$/
+    start_time  = Time.now
+    stop_time   = Time.now + timeout_in_minutes * 60
+    finished    = /(CREATE_COMPLETE|UPDATE_COMPLETE|DELETE_COMPLETE|ROLLBACK_COMPLETE|ROLLBACK_FAILED|CREATE_FAILED|DELETE_FAILED)$/
+    seen_events = Array.new
+
+    puts "waiting for #{operation} stack #{stack_name}"
     while Time.now < stop_time
       stack = find_stack(stack_name)
       status = stack ? stack.stack_status : 'DELETE_COMPLETE'
@@ -95,7 +99,12 @@ module Stacker
                         end
       return true if status =~ expected_status
       raise "#{operation} #{stack_name} failed, current status #{status}" if status =~ finished
-      puts "waiting for #{operation} stack #{stack_name}, current status #{status}"
+      get_stack_events(stack_name).select{ |e| e[:timestamp] > start_time && !seen_events.include?(e[:event_id]) }
+                                  .sort_by{|e| e[:timestamp]}
+                                  .each{·
+                                    |e| seen_events << e[:event_id]
+                                    puts "#{e[:timestamp]}\t#{e[:resource_status].ljust(20)}\t#{e[:resource_type].ljust(40)}\t#{e[:logical_resource_id].ljust(30)}\t#{e[:resource_status_reason]}"
+                                  }
       sleep(7)
     end
     raise "waiting for #{operation} stack #{stack_name} timed out after #{timeout_in_minutes} minutes"
@@ -144,6 +153,10 @@ module Stacker
     resources.inject({}){|map, resource| map.merge(resource.logical_resource_id.to_sym => resource)}.freeze
   end
 
+  def get_stack_events(stack_name)
+    events = cloud_formation.describe_stack_events(stack_name: stack_name).data.stack_events
+  end
+
   def cloud_formation # lazy CloudFormation client
     unless @lazy_cloud_formation
       params = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core