cfn-events 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0780631b52643fdb0237dd4884ba8191116b7712
-  data.tar.gz: f64043ef2a1d1ffe05f5bff0fdadb9b9987b108a
+  metadata.gz: 358efd35e035ae91fd12204079e37547d8debd5f
+  data.tar.gz: 28f2c4e7fa6b6089fe973995b985849582680722
 SHA512:
-  metadata.gz: 94309fa22a5b82fcb00b92c28c720b632e3b1cdec940ccab3b9e9b44f6074b25c8fcfc34670a74c7cc2361c1662fabdde1885bbcd3dbec9d64ddbc24cedc2bfd
-  data.tar.gz: 6347ee295e8a8b8b01d490e3434e650a449e82f9777f35e6f99c22afe504971cece5ad9ff976633a95ca4f78515da542e98189afc58316817300531a9efe2021
+  metadata.gz: 3d5e69ecf7453a1e6c0127a0426484005a335e9e1879bdb1e11b243aace65735f094aaccb4bed029f715da0848a4e770ffad14235fb61f5ec6f475865182cc42
+  data.tar.gz: a5e20c7a1c228a03b3c33b1e8061867f3131cfa73142bbf01fad2d1079d23edf0eca13c3029309e51db7b74c4fde5afbac743b602607c1c65dd000d2ddff643f

data/lib/cfn-events/runner.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module CfnEvents
 
   class Runner
@@ -11,36 +13,78 @@ module CfnEvents
                              end
     end
 
-    def core_v2_options
-      i
-    end
-
     def resolve_stack(stack_name_or_id)
-      ans = @config.cfn_client.describe_stacks(stack_name: stack_name_or_id).data.stacks[0].stack_id
+      ans = @config.cfn_client.describe_stacks(stack_name: stack_name_or_id).stacks[0].stack_id
       if ans != stack_name_or_id
         $stderr.puts "Resolved #{stack_name_or_id} to #{ans}"
       end
       ans
     end
 
-    def all_events
-      @config.cfn_client.describe_stack_events(stack_name: @stack_id).data.stack_events.reverse
+    def all_events_so_far
+      r = @config.cfn_client.describe_stack_events(stack_name: @stack_id)
+      events = r.each_page.flat_map {|page| page.stack_events}.reverse
+
+      if events.empty?
+        raise "Stack has no events! Please raise this as a cfn-events bug."
+      end
+
+      [ events, events.last ]
     end
 
-    def events_since_time(events, t)
-      # There may be a more efficient algorithm
-      events.select {|e| e.timestamp > t }
+    def events_since_time(t)
+      r = @config.cfn_client.describe_stack_events(stack_name: @stack_id)
+
+      # If there are no events since the given time, show none, and return the
+      # most recent event.  Sort of an edge case.
+      if r.stack_events.first.timestamp <= t
+        return [ [], r.stack_events.first ]
+      end
+
+      events = []
+      loop do
+        cutoff = r.stack_events.index {|event| event.timestamp <= t}
+        if cutoff
+          # We can stop looking
+          events.concat r.stack_events[0..cutoff-1]
+          events.reverse!
+          return [ events, events.last ]
+        end
+
+        events.concat r.stack_events
+        r.next_page? or break
+        r = r.next_page
+      end
+
+      # ALL the available events are since the given time
+      events.reverse!
+      return [ events, events.last ]
     end
 
-    def events_since_id(id)
-      # There may be a more efficient algorithm
-      events = all_events
-      i = events.index {|e| e.event_id == id }
-      if i < 0
-        events
-      else
-        events[i+1..-1]
+    def events_since_event(since_event)
+      r = @config.cfn_client.describe_stack_events(stack_name: @stack_id)
+
+      # Sort of a special case: no new events
+      if r.stack_events.first.event_id == since_event.event_id
+        return [ [], since_event ]
       end
+
+      events = []
+      r.each_page do |page|
+        cutoff = page.stack_events.index {|e| e.event_id == since_event.event_id}
+
+        if cutoff
+          events.concat page.stack_events[0..cutoff-1]
+          return [ events.reverse, events.first ]
+        end
+
+        events.concat r.stack_events
+      end
+
+      # Unable to join what we've seen so far to what we can see now
+      $stderr.puts "Last-seen stack event is no longer returned by AWS. Please raise this as a cfn-events bug."
+
+      return [ events.reverse, events.first ]
     end
 
     def show_events(events)
@@ -68,30 +112,33 @@ module CfnEvents
     def run
       @stack_id = resolve_stack(@config.stack_name_or_id)
 
-      events = all_events
+      # An assumption to make the logic easier:
+      # - there can never be zero events
 
-      if @config.since
-        show_events(events_since_time(events, @config.since))
-      else
-        show_events(events)
-      end
+      # (The closest we seem to get to this is if a stack is created via a
+      # change set, then the stack entity is created with a single event,
+      # "AWS::CloudFormation::Stack <the stack name> REVIEW_IN_PROGRESS").
+
+      # Therefore there is always a most_recent_event.
+
+      events_to_show, most_recent_event = if @config.since
+                                            events_since_time @config.since
+                                          else
+                                            all_events_so_far
+                                          end
+      show_events events_to_show
 
       return 0 unless @config.forever or @config.wait
 
-      while @config.forever or not steady_state?(events.last)
+      while @config.forever or not steady_state?(most_recent_event)
         $stdout.sync
         sleep @config.poll_seconds
-
-        new_events = events_since_id(events.last.event_id)
-
-        unless new_events.empty?
-          show_events(new_events)
-          events = new_events
-        end
+        events_to_show, most_recent_event = events_since_event most_recent_event
+        show_events events_to_show
       end
 
-      return 2 if events.last.resource_status.match /FAILED/
-      return 1 if events.last.resource_status.match /ROLLBACK/
+      return 2 if most_recent_event.resource_status.match /FAILED/
+      return 1 if most_recent_event.resource_status.match /ROLLBACK/
       return 0
     end
 

data/lib/cfn-events/version.rb

@@ -1,3 +1,3 @@
 module CfnEvents
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-events
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Rachel Evans
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: "\n    cfn-events reads the events for an AWS CloudFormation stack.  It
   can\n    be used to \"tail\" the log, and to wait until a stack update is resolved,\n
   \   successfully or otherwise.\n\n    Defaults to eu-west-1, or whatever $AWS_REGION
@@ -60,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Watch AWS CloudFormation stack events and wait for completion