kumogata 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3f0cb776ca09cc7162b3c08e21582de86aa421
-  data.tar.gz: d4e87584f981bba7523eaac028554032ecdfd8fb
+  metadata.gz: df82f77f6c7023cbdaa9cf336a3857bd76bdbecb
+  data.tar.gz: 0f6e167f920c80123bcf89338dbb023439eb46c8
 SHA512:
-  metadata.gz: 1488d23314c6723a1a6da704567a0321a735f15c56df3bb32ff531c439d6ed56c7b7e1b7e8d866aa0cae2b86fbf4bc18eb4c359d06df8bf74314f8fae15c49ac
-  data.tar.gz: 05f53a9aa0e64b040e510598ee38b484ba6febf493ab1f8f61995676e8d2a232ed9e1fa7918b6fefb603a8e899c8828615749ead921e8178ea4f4d94b2c3518a
+  metadata.gz: a53b163c4963b3a216e4c7e2d563f63d75f76073f4f18b0386e75120e417f0717bcc5cfbaefe007d402e16c0c92de04cbe8669c1cff80d450fe5682f68442f1e
+  data.tar.gz: ec3887e27bcecedb0ce01bf7e79a7e0077a0d6e61ee6269c88e51e9de72d9a3fbcb87f79f374c95f0c50547569ffcea2336d0ea2405043908c09e619434b8236

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403130002)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403130002)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403130235)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403130235)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 

data/kumogata.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 2.11.0'
+  spec.add_development_dependency 'timecop'
 end

data/lib/kumogata/client.rb

@@ -39,7 +39,10 @@ class Kumogata::Client
 
   def update(path_or_url, stack_name)
     validate_stack_name(stack_name)
+
+    @options.delete_stack = false
     template = open_template(path_or_url)
+    update_deletion_policy(template, :update_metadate => true)
     add_encryption_password(template)
 
     outputs = update_stack(template, stack_name)
@@ -444,11 +447,16 @@ class Kumogata::Client
     end
   end
 
-  def update_deletion_policy(template)
+  def update_deletion_policy(template, options = {})
     if @options.delete_stack? or @options.deletion_policy_retain?
       template['Resources'].each do |k, v|
         next if /\AAWS::CloudFormation::/ =~ v['Type']
         v['DeletionPolicy'] ||= 'Retain'
+
+        if options[:update_metadate]
+          v['Metadata'] ||= {}
+          v['Metadata']['DeletionPolicyUpdateKeyForKumogata'] = "DeletionPolicyUpdateValueForKumogata#{Time.now.to_i}"
+        end
       end
     end
   end

data/lib/kumogata/post_processing.rb

@@ -25,7 +25,7 @@ class Kumogata::PostProcessing
         raise "Invalid post processing: #{name} => #{attrs.inspect}"
       end
 
-      timing = [(attrs['after'] || TRIGGER_TIMING)].flatten.map {|i| i.to_sym }
+      timing = [(attrs['after'] || [:create])].flatten.map {|i| i.to_sym }
       command = attrs['command']
 
       validate_timing(name, timing)

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/kumogata_update_spec.rb

@@ -56,6 +56,69 @@ end
     end
   end
 
+  it 'update a stack from Ruby template with deletion policy retain' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    Timecop.freeze(Time.parse('2014/03/13 0:00')) do
+      run_client(:update, :arguments => ['MyStack'], :template => template, :options => {:deletion_policy_retain => true}) do |client, cf|
+        template = eval_template(template, :update_deletion_policy => true)
+        template["Resources"]["myEC2Instance"]["Metadata"] = {
+          "DeletionPolicyUpdateKeyForKumogata" => "DeletionPolicyUpdateValueForKumogata1394636400"
+        }
+        json = template.to_json
+        client.should_receive(:print_event_log).once
+        client.should_receive(:create_event_log).once
+
+        output = make_double('output') do |obj|
+          obj.should_receive(:key) { 'AZ' }
+          obj.should_receive(:value) { 'ap-northeast-1b' }
+        end
+
+        resource_summary = make_double('resource_summary') do |obj|
+          obj.should_receive(:[]).with(:logical_resource_id) { 'myEC2Instance' }
+          obj.should_receive(:[]).with(:physical_resource_id) { 'i-XXXXXXXX' }
+          obj.should_receive(:[]).with(:resource_type) { 'AWS::EC2::Instance' }
+          obj.should_receive(:[]).with(:resource_status) { 'UPDATE_COMPLETE' }
+          obj.should_receive(:[]).with(:resource_status_reason) { nil }
+          obj.should_receive(:[]).with(:last_updated_timestamp) { '2014-03-02 04:35:12 UTC' }
+        end
+
+        stack = make_double('stack') do |obj|
+          obj.should_receive(:update).with(:template => json)
+          obj.should_receive(:status).and_return(
+              'UPDATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_COMPLETE')
+          obj.should_receive(:outputs) { [output] }
+          obj.should_receive(:resource_summaries) { [resource_summary] }
+        end
+
+        stacks = make_double('stacks') do |obj|
+          obj.should_receive(:[])
+             .with('MyStack') { stack }
+        end
+
+        cf.should_receive(:stacks) { stacks }
+      end
+    end
+  end
+
   it 'update a stack from Ruby template and run command' do
     template = <<-TEMPLATE
 Resources do
@@ -137,35 +200,16 @@ end
 
       cf.should_receive(:stacks) { stacks }
 
+      process_status1 = double('process_status1')
+      process_status2 = double('process_status2')
 
-      process_status1 = make_double('process_status1') {|obj| obj.should_receive(:to_i).and_return(0) }
-      process_status2 = make_double('process_status2') {|obj| obj.should_receive(:to_i).and_return(0) }
-
-      client.instance_variable_get(:@post_processing)
-           .should_receive(:run_shell_command)
-           .with("      echo <%= Key \"AZ\" %>\n      echo <%= Key \"Region\" %>\n", {"AZ"=>"ap-northeast-1b", "Region"=>"ap-northeast-1"})
-           .and_return(["ap-northeast-1b\nap-northeast-1\n", "", process_status1])
-      client.instance_variable_get(:@post_processing)
-           .should_receive(:run_shell_command)
-           .with("      echo <%= Key \"Region\" %>\n      echo <%= Key \"AZ\" %>\n", {"AZ"=>"ap-northeast-1b", "Region"=>"ap-northeast-1"})
-           .and_return(["ap-northeast-1\nap-northeast-1b\n", "", process_status2])
-
-      client.instance_variable_get(:@post_processing)
-            .should_receive(:print_command).with('command_a')
-      client.instance_variable_get(:@post_processing)
-            .should_receive(:print_command).with('command_b')
+      Open3.should_not_receive(:capture3)
 
       client.instance_variable_get(:@post_processing)
-            .should_receive(:print_command_result)
-            .with("ap-northeast-1b\nap-northeast-1\n", "", process_status1)
-      client.instance_variable_get(:@post_processing)
-            .should_receive(:print_command_result)
-            .with("ap-northeast-1\nap-northeast-1b\n", "", process_status2)
+            .should_not_receive(:print_command_result)
 
       client.instance_variable_get(:@post_processing)
-            .should_receive(:save_command_results)
-            .with([{'command_a' => {'ExitStatus' => 0, 'StdOut' => "ap-northeast-1b\nap-northeast-1\n", 'StdErr' => ""}},
-                   {'command_b' => {'ExitStatus' => 0, 'StdOut' => "ap-northeast-1\nap-northeast-1b\n", 'StdErr' => ""}}])
+            .should_not_receive(:save_command_results)
     end
   end
 
@@ -191,6 +235,7 @@ end
 
 _post do
   ssh_command do
+    after :update
     ssh do
       host { Key "PublicIp" }
       user "ec2-user"
@@ -251,7 +296,6 @@ end
       client.instance_variable_get(:@post_processing)
             .should_receive(:save_command_results)
             .with([{'ssh_command' => {'ExitStatus' => 0, 'StdOut' => "file1\nfile2\n", 'StdErr' => ""}}])
-
     end
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'kumogata'
 require 'tempfile'
+require 'time'
+require 'timecop'
 require 'uuidtools'
 
 Kumogata::ENCRYPTION_PASSWORD.replace('EncryptionPassword')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Genki Sugawara
@@ -206,6 +206,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool for AWS CloudFormation. It can define a template in Ruby DSL.
 email:
 - sgwr_dts@yahoo.co.jp