kumo_keisei 4.0.4 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db2c2392cfe443b1f4b92254438a92ec6628034
-  data.tar.gz: eb0d0948727fdc934617f441500a4f254527738c
+  metadata.gz: 165cf70d3650a4c654f88ae17cc9c9a6ba56958f
+  data.tar.gz: cdef8e0988f7d80ea2a26d6b56c5124803c39205
 SHA512:
-  metadata.gz: 01756da3af8883007f9b8766b8503450539ee0732caf7eecdc354ee260a270566066e8d52a45097c0650db29a50dbd3105ba662a7a3dbc270c6a5bfacd37f1b1
-  data.tar.gz: 2f7ec5597b8380d9624daa22efda61cc82b3b98216ce0c9fd148fe4ff9ff7c532cb086fe23867ad6206ab465daa9080775423a712f15da29bd64b084fc70e166
+  metadata.gz: 30c611ca554d8c543f0c096df391e619a15e144684ce8062df912a5d8a91c5f6b2a13161e913f3ed56c90e1e4f161d7297a2d6da519898ee001318fad4b372bc
+  data.tar.gz: 5f0134857aca2716e901e1abba559881c0048b4afd3000236df6eb87cdef8aaa4d060e1f819549df55db7ec4dedb2f5fa739f0a427fcaf514ec19373dd354f2e

data/VERSION

@@ -1 +1 @@
-4.0.4
+4.0.6

data/lib/kumo_keisei/stack.rb

@@ -13,11 +13,14 @@ module KumoKeisei
     ]
 
     RECOVERABLE_STATUSES = [
-      'DELETE_COMPLETE',
       'ROLLBACK_COMPLETE',
       'ROLLBACK_FAILED'
     ]
 
+    TERMINATED_STATUSES = [
+      'DELETE_COMPLETE'
+    ]
+
     UNRECOVERABLE_STATUSES = [
       'UPDATE_ROLLBACK_FAILED'
     ]
@@ -56,7 +59,6 @@ module KumoKeisei
 
       flash_message "Warning! You are about to delete the CloudFormation Stack #{@stack_name}, enter 'yes' to continue."
       return unless ConsoleJockey.get_confirmation(@confirmation_timeout)
-
       wait_until_ready(false)
       ensure_deleted!
     end
@@ -105,9 +107,8 @@ module KumoKeisei
     def ensure_deleted!
       stack = get_stack
       return if stack.nil?
-      return if stack.stack_status == 'DELETE_COMPLETE'
+      return if TERMINATED_STATUSES.include? stack.stack_status
 
-      ConsoleJockey.write_line "There's a previous stack called #{@stack_name} that didn't create properly, I'll clean it up for you..."
       cloudformation.delete_stack(stack_name: @stack_name)
       cloudformation.wait_until(:stack_delete_complete, stack_name: @stack_name) { |waiter| waiter.delay = @waiter_delay; waiter.max_attempts = @waiter_attempts }
     end
@@ -117,7 +118,14 @@ module KumoKeisei
       return false if stack.nil?
 
       return true if UPDATEABLE_STATUSES.include? stack.stack_status
-      return false if RECOVERABLE_STATUSES.include? stack.stack_status
+
+      return false if TERMINATED_STATUSES.include? stack.stack_status
+
+      if RECOVERABLE_STATUSES.include? stack.stack_status
+        ConsoleJockey.write_line "There's a previous stack called #{@stack_name} that didn't create properly, it will be deleted and rebuilt."
+        return false
+      end
+
       raise UpdateError.new("Stack is in an unrecoverable state") if UNRECOVERABLE_STATUSES.include? stack.stack_status
       raise UpdateError.new("Stack is busy, try again soon")
     end

data/spec/integration/stack_spec.rb

@@ -15,7 +15,7 @@ describe KumoKeisei::Stack do
 
   let(:stack_timeout_options) do
     {
-      confirmation_timeout: 30,
+      confirmation_timeout: 1,
       waiter_delay: 1,
       waiter_attempts: 90
     }
@@ -76,4 +76,48 @@ describe KumoKeisei::Stack do
     end
 
   end
+
+  describe "#destroy!" do
+    let(:stack) { KumoKeisei::Stack.new(stack_name, environment_name, stack_timeout_options) }
+
+    subject { stack.destroy! }
+
+    before do
+      # create a sacrificial stack
+      cloudformation = Aws::CloudFormation::Client.new
+      cloudformation.create_stack(
+        stack_name: stack_full_name,
+        template_body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'no-parameter-section.json')),
+        capabilities: ["CAPABILITY_IAM"],
+        on_failure: "DELETE"
+      )
+      begin
+        cloudformation.wait_until(:stack_create_complete, stack_name: stack_full_name) { |waiter| waiter.delay = 1; waiter.max_attempts = 90 }
+      rescue Aws::Waiters::Errors::UnexpectedError => ex
+        handle_unexpected_error(ex)
+      end
+    end
+
+    context "when a user accepts the warning" do
+      it "deletes a stack" do
+        expect(STDIN).to receive(:gets).and_return("yes\n")
+        subject
+        expect(stack_exists?(stack_full_name)).to be false
+      end
+    end
+
+    context "when a user does not accept the warning" do
+      it "does not delete a stack because of timeout" do
+        subject
+        expect(stack_exists?(stack_full_name)).to be true
+      end
+
+      it "does not delete a stack because the user didn't say 'yes'" do
+        expect(STDIN).to receive(:gets).and_return("trolololo\n")
+        subject
+        expect(stack_exists?(stack_full_name)).to be true
+      end
+    end
+  end
+
 end

data/spec/lib/kumo_keisei/console_jockey_spec.rb

@@ -8,12 +8,12 @@ describe KumoKeisei::ConsoleJockey do
     context 'no timeout' do
 
       it 'returns true if user enters yes' do
-        allow(STDIN).to receive(:gets) { 'yes'}
+        allow(STDIN).to receive(:gets) { 'yes' }
         expect(subject.get_confirmation(timeout)).to be true
       end
 
       it 'returns false if user enters anything other than yes' do
-        allow(STDIN).to receive(:gets) { 'aoisdjofa'}
+        allow(STDIN).to receive(:gets) { 'aoisdjofa' }
         expect(subject.get_confirmation).to be false
       end
     end

data/spec/lib/kumo_keisei/stack_spec.rb

@@ -43,7 +43,6 @@ describe KumoKeisei::Stack do
 
   before do
     allow(KumoKeisei::ConsoleJockey).to receive(:flash_message)
-    allow(KumoKeisei::ConsoleJockey).to receive(:write_line).and_return(nil)
     allow(KumoKeisei::ConsoleJockey).to receive(:get_confirmation).with(confirmation_timeout).and_return(false)
     allow(Aws::CloudFormation::Client).to receive(:new).and_return(cloudformation)
     allow(cloudformation).to receive(:describe_stacks).with({stack_name: stack_name}).and_return(cf_stack)
@@ -59,11 +58,20 @@ describe KumoKeisei::Stack do
       subject.destroy!
     end
 
-    it "does delete the stack if the user confirms" do
-      expect(KumoKeisei::ConsoleJockey).to receive(:get_confirmation).with(confirmation_timeout).and_return(true)
-      expect(cloudformation).to receive(:delete_stack).with({stack_name: stack_name}).and_return(cf_stack)
-      allow(cloudformation).to receive(:wait_until).with(:stack_delete_complete, stack_name: stack_name).and_return(nil)
-      subject.destroy!
+    context "and the user confirms" do
+      it "deletes the stack" do
+        expect(KumoKeisei::ConsoleJockey).to receive(:get_confirmation).with(confirmation_timeout).and_return(true)
+        expect(cloudformation).to receive(:delete_stack).with({stack_name: stack_name}).and_return(cf_stack)
+        allow(cloudformation).to receive(:wait_until).with(:stack_delete_complete, stack_name: stack_name).and_return(nil)
+        subject.destroy!
+      end
+
+      it "does not print a misleading message" do
+        expect(KumoKeisei::ConsoleJockey).to receive(:get_confirmation).with(confirmation_timeout).and_return(true)
+        expect(cloudformation).to receive(:delete_stack).with({stack_name: stack_name}).and_return(cf_stack)
+        allow(cloudformation).to receive(:wait_until).with(:stack_delete_complete, stack_name: stack_name).and_return(nil)
+        expect { subject.destroy! }.not_to output.to_stdout
+      end
     end
 
     it "does not delete the stack if the the user refuses confirmation" do
@@ -74,6 +82,11 @@ describe KumoKeisei::Stack do
   end
 
   describe "#apply!" do
+
+    before do
+      allow(KumoKeisei::ConsoleJockey).to receive(:write_line).and_return(nil)
+    end
+
     context "when you don't specify the location of the Cfn template" do
       let(:stack_config) {
         {
@@ -191,6 +204,7 @@ describe KumoKeisei::Stack do
 
           allow(cloudformation).to receive(:wait_until).with(:stack_create_complete, stack_name: stack_name).and_return(nil)
 
+          expect(KumoKeisei::ConsoleJockey).to receive(:write_line).with("There's a previous stack called my-stack-non-production that didn't create properly, it will be deleted and rebuilt.").and_return(nil)
           subject.apply!(stack_config)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumo_keisei
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.6
 platform: ruby
 authors:
 - Redbubble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of utilities for dealing with AWS Cloud Formation.