cfn-status 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db0db619c3720d0b8aa596db7f48638b88ad4866b110647cba6af9bdef8a083b
-  data.tar.gz: f911ca63d21c025da730f3b96065982698d0e2f4b2321a01d74c4ce854a0095e
+  metadata.gz: 154b5d15f93d77c109df45509a391310485430fe542f7d66f2f431ec73cdfd09
+  data.tar.gz: 7205fc07760831619538f468574c245010d8b4abe28eb33f64c60db94b04a1e9
 SHA512:
-  metadata.gz: 506a3a5fda2b73a8a33e5aac2afb7e94dcbf63a6d90e4e3dad7bee7f1e182360b559db97b5c721a2282e0ec199e12d0f615c8dd2483e6c1b3b1a99a1cd8cf3f0
-  data.tar.gz: 38991d9cdf18ea678061a4c0e60297b236a912cc208a49fc58ffad339d94864da229b92c25e649e7a290dc33c8590af37a8a6f2056bc00f2d94e9cca0e5574bb
+  metadata.gz: 93c77d9e09eb0a67e3fca9012779b878332f7674fbdcc97b02e930df42656ac8583a4e3890f28beb9e3064f32468adfa27646fd63addb7cdd7b86ffb204b820a
+  data.tar.gz: 0b5cddb879782ba4c46900c4b8cecb42086a04c44b48e8d51214f04405d6e8108331f2feae45125b1357733b0bb8d55abc8b243e6a3c748cc01c7c2f83f1ca71

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.4.3] - 2021-05-27
+- [#4](https://github.com/tongueroo/cfn-status/pull/4) fix current status message
+
+## [0.4.2]
+- #3 improve messaging when wait called directly. dont show old events.
+
+## [0.4.1]
+- fix require cfn_status/rollback_stack
+
+## [0.4.0]
+- #2 add handle_rollback! method
+
+## [0.3.1]
+- allow use of different cfn client
+
 ## [0.3.0]
 - #1 Breaking change: rename Rename to CfnStatus, cfn/status to cfn_status
 - Handle large templates and long stack_events via paginating the cfn.describe_stack_events until

data/lib/cfn_status.rb

@@ -1,4 +1,5 @@
 require "cfn_status/version"
+require "cfn_status/rollback_stack"
 
 class CfnStatus
   class Error < StandardError; end
@@ -6,10 +7,13 @@ class CfnStatus
   autoload :AwsService, "cfn_status/aws_service"
   include AwsService
 
-  attr_reader :events
+  attr_reader :events, :stack
   def initialize(stack_name, options={})
     @stack_name = stack_name
     @options = options
+    @cfn = options[:cfn] # allow use of different cfn client. can be useful multiple cfn clients and with different regions
+    resp = cfn.describe_stacks(stack_name: @stack_name)
+    @stack = resp.stacks.first
     reset
   end
 
@@ -19,11 +23,8 @@ class CfnStatus
       return true
     end
 
-    resp = cfn.describe_stacks(stack_name: @stack_name)
-    stack = resp.stacks.first
-
     puts "The current status for the stack #{@stack_name.color(:green)} is #{stack.stack_status.color(:green)}"
-    if stack.stack_status =~ /_IN_PROGRESS$/
+    if in_progress?
       puts "Stack events (tailing):"
       # tail all events until done
       @hide_time_took = true
@@ -37,6 +38,11 @@ class CfnStatus
     success?
   end
 
+  def in_progress?
+    in_progress = stack.stack_status =~ /_IN_PROGRESS$/
+    !!in_progress
+  end
+
   def reset
     @events = [] # constantly replaced with recent events
     @last_shown_event_id = nil
@@ -45,6 +51,10 @@ class CfnStatus
 
   # check for /(_COMPLETE|_FAILED)$/ status
   def wait
+    # Check for in progress again in case .wait is called from other libraries like s3-antivirus
+    # Showing the event messages when will show old messages which can be confusing.
+    return unless in_progress?
+
     puts "Waiting for stack to complete"
     start_time = Time.now
 
@@ -242,4 +252,8 @@ class CfnStatus
       "#{minutes.to_i}m #{seconds.to_i}s"
     end
   end
+
+  def handle_rollback!
+    CfnStatus::RollbackStack.handle!(@stack_name, cfn: cfn)
+  end
 end

data/lib/cfn_status/rollback_stack.rb

@@ -0,0 +1,42 @@
+class CfnStatus
+  class RollbackStack
+    def self.handle!(stack_name, options={})
+      new(stack_name, options).run
+    end
+
+    attr_reader :status, :cfn
+    def initialize(stack_name, options={})
+      @stack_name = stack_name
+      @cfn = options[:cfn]
+      @status = CfnStatus.new(@stack_name, cfn: @cfn)
+    end
+
+    def run
+      @stack = find_stack(@stack_name)
+      if @stack && rollback_complete?(@stack)
+        puts "Existing stack in ROLLBACK_COMPLETE state. Deleting stack before continuing."
+        cfn.delete_stack(stack_name: @stack_name)
+        status.wait
+        status.reset
+        @stack = nil # at this point stack has been deleted
+      end
+    end
+
+    def rollback_complete?(stack)
+      stack.stack_status == 'ROLLBACK_COMPLETE'
+    end
+
+    def find_stack(stack_name)
+      return if ENV['CFN_STATUS_TEST']
+      resp = cfn.describe_stacks(stack_name: stack_name)
+      resp.stacks.first
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      # example: Stack with id demo-web does not exist
+      if e.message =~ /Stack with/ && e.message =~ /does not exist/
+        nil
+      else
+        raise
+      end
+    end
+  end
+end

data/lib/cfn_status/version.rb

@@ -1,3 +1,3 @@
 class CfnStatus
-  VERSION = "0.3.0"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-status
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -87,6 +87,7 @@ files:
 - lib/cfn-status.rb
 - lib/cfn_status.rb
 - lib/cfn_status/aws_service.rb
+- lib/cfn_status/rollback_stack.rb
 - lib/cfn_status/version.rb
 homepage: https://github.com/tongueroo/cfn-status
 licenses:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: CloudFormation status library