autostacker24 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21045e10135c21d773903116bafdc38108ea16a
-  data.tar.gz: 7ec0c6a842e4287ac73dee9d406b713c848ab131
+  metadata.gz: 6210a52e8c14cb3667edf24744b0b75aa3dbaf3d
+  data.tar.gz: ec2a091c5f96b41cdde1efba6a0baf7de7acd0f5
 SHA512:
-  metadata.gz: 41280f3dad32b9374076f160e8bad5438d426180ccacff58aebc0cb40d69b5ffddac3627518bd4970ed587ac652606726dc1ebb4bb2676979a99d6dcaaf7c8bd
-  data.tar.gz: 7beedce71dcd9d5765325712481f0bd6962ad4c96bd0341a09138ffaac827c0b20950a1f051b77ac83cdf73c7fe291a262c86fd97494df06d10992af6e504d03
+  metadata.gz: 339109e33de55680a01d41003b6ac9706bba72228b486b04e53585986087ce76c380d215b920f3007915ebe05db45060a089db0953398c79a98545190dd82f11
+  data.tar.gz: 5eebb293cc28bee1f895ff24795f9e0307c68e512cce3e63e6b33f12ff4dbf06a3d060e04201ba3f8a7342aefdb1c041345bfed5b7c112d83b46d41fef1dbd50

data/lib/autostacker24/stacker.rb

@@ -7,6 +7,8 @@ require_relative 'template_preprocessor.rb'
 STDOUT.sync = true
 STDERR.sync = true
 
+DEFAULT_TIMEOUT = 60
+
 module Stacker
 
   attr_reader :region, :credentials
@@ -26,15 +28,15 @@ module Stacker
     end
   end
 
-  def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
+  def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil, timeout_in_minutes = DEFAULT_TIMEOUT)
     if find_stack(stack_name).nil?
-      create_stack(stack_name, template, parameters, parent_stack_name, tags)
+      create_stack(stack_name, template, parameters, parent_stack_name, tags, timeout_in_minutes)
     else
-      update_stack(stack_name, template, parameters, parent_stack_name, tags)
+      update_stack(stack_name, template, parameters, parent_stack_name, tags, timeout_in_minutes)
     end
   end
 
-  def create_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
+  def create_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil, timeout_in_minutes = DEFAULT_TIMEOUT)
     merge_and_validate(template, parameters, parent_stack_name)
     cloud_formation.create_stack(stack_name:    stack_name,
                                  template_body: template_body(template),
@@ -42,10 +44,10 @@ module Stacker
                                  parameters:    transform_input(parameters),
                                  capabilities:  ['CAPABILITY_IAM'],
                                  tags:          tags)
-    wait_for_stack(stack_name, :create)
+    wait_for_stack(stack_name, :create, Set.new, timeout_in_minutes)
   end
 
-  def update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
+  def update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil, timeout_in_minutes = DEFAULT_TIMEOUT)
     seen_events = get_stack_events(stack_name).map {|e| e[:event_id]}
     begin
       merge_and_validate(template, parameters, parent_stack_name)
@@ -59,7 +61,7 @@ module Stacker
       puts "stack #{stack_name} is already up to date"
       find_stack(stack_name)
     else
-      wait_for_stack(stack_name, :update, seen_events)
+      wait_for_stack(stack_name, :update, seen_events, timeout_in_minutes)
     end
   end
 
@@ -85,14 +87,13 @@ module Stacker
     cloud_formation.validate_template(template_body: template_body(template))
   end
 
-  def delete_stack(stack_name)
+  def delete_stack(stack_name, timeout_in_minutes = 60)
     seen_events = get_stack_events(stack_name).map {|e| e[:event_id]}
     cloud_formation.delete_stack(stack_name: stack_name)
-    wait_for_stack(stack_name, :delete, seen_events)
+    wait_for_stack(stack_name, :delete, seen_events, timeout_in_minutes)
   end
 
-  def wait_for_stack(stack_name, operation, seen_events = Set.new)
-    timeout_in_minutes = 60 # for now
+  def wait_for_stack(stack_name, operation, seen_events = Set.new, timeout_in_minutes = DEFAULT_TIMEOUT)
     stop_time   = Time.now + timeout_in_minutes * 60
     finished    = /(CREATE_COMPLETE|UPDATE_COMPLETE|DELETE_COMPLETE|ROLLBACK_COMPLETE|ROLLBACK_FAILED|CREATE_FAILED|DELETE_FAILED)$/
     puts "waiting for #{operation} stack #{stack_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core