sfn 1.1.10 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee7d09945927cfc75821041ef90090dba2ef9c0
-  data.tar.gz: fad23bceb0be9ba52eab93f31e51d508c5109de1
+  metadata.gz: e7c94cea72644d2789ca1bbc6bb3a235e6f45356
+  data.tar.gz: 67108e9ccf029399a1892ed96e520db1515b4216
 SHA512:
-  metadata.gz: adac24b09b2ab1681f88fc4c60d41fb21ca9026e4246527ff63a337c1300de2a8186cfab28b88df7599a2ae092206493ea29e053cd3d1e1dccd3b117844ae827
-  data.tar.gz: 55e2b6bdc3cbd30512c8818c2551f2c8253dfc2f5058b03b557816c2cdc8afe48e01c52f2ba2daa057e61b71e70a4791ddac17374b2a8c78bf084dbf7d021bc6
+  metadata.gz: aff9a0b880bf2173a721107d5ad9fbea43af78f6b1aa6ed2e650a705b298679e7287355684cbca221cc19fd3e433403cf3eff0294483827fcaa1aee9aecd4dd6
+  data.tar.gz: eabc758d5854532e50aa9b1905d2518b3d6f7e37bcc79a3c1046308ce1e4d702f542ceb87768a3df14ea96c4a761cd5bfaa1fa68080d660e73616dac1fac5bf3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.12
+* [enhancement] Include updated time information on stack list
+* [enhancement] Support pseudo-parameters in update planning
+  * AWS only as it is currently the only implementation
+
 ## v1.1.10
 * [enhancement] Better configuration related errors
 * [fix] Planning display on stack removal (#75)

data/docs/callbacks.md

@@ -80,8 +80,10 @@ Builtin callbacks distributed with `sfn`:
 
 #### Stack Policy Callback
 
-The Stack Policy Callback utilizes the [policy feature][sparkle_policy]
-built into the [SparkleFormation][sparkle_formation] library.
+The Stack Policy Callback utilizes the [policy feature](http://www.sparkleformation.io/docs/sparkle_formation/stack-policies.html)
+built into the [SparkleFormation](http://www.sparkleformation.io/docs/sparkle_formation)
+library.
+
 To enable the callback:
 
 ~~~ruby

data/docs/overview.md

@@ -36,7 +36,7 @@ $ gem install sfn
 or, if you use [Bundler](http://bundler.io/), add the following to your Gemfile:
 
 ~~~sh
-gem sfn', '~> 1.0.4'
+gem 'sfn'
 ~~~
 
 See [Configuration](configuration.md) and [Usage](usage.md) for further instructions.

data/lib/sfn/command/list.rb

@@ -48,9 +48,9 @@ module Sfn
       # @return [Array<String>] default attributes to display
       def default_attributes
         if(provider.connection.provider == :aws)
-          %w(name created status template_description)
+          %w(name created updated status template_description)
         else
-          %w(name created status description)
+          %w(name created updated status description)
         end
       end
 

data/lib/sfn/command/update.rb

@@ -164,57 +164,58 @@ module Sfn
 
 
       def print_plan_result(info, names=[])
-        said_things = false
+        said_any_things = false
         unless(info[:stacks].empty?)
           info[:stacks].each do |s_name, s_info|
             said_things = print_plan_result(s_info, [*names, s_name].compact)
           end
         end
         unless(names.flatten.compact.empty?)
+          said_things = false
           ui.puts
           ui.puts "  #{ui.color('Update plan for:', :bold)} #{ui.color(names.join(' > '), :blue)}"
           unless(info[:unknown].empty?)
             ui.puts "    #{ui.color('!!! Unknown update effect:', :red, :bold)}"
             print_plan_items(info, :unknown, :red)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(info[:unavailable].empty?)
             ui.puts "    #{ui.color('Update request not allowed:', :red, :bold)}"
             print_plan_items(info, :unavailable, :red)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(info[:replace].empty?)
             ui.puts "    #{ui.color('Resources to be replaced:', :red, :bold)}"
             print_plan_items(info, :replace, :red)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(info[:interrupt].empty?)
             ui.puts "    #{ui.color('Resources to be interrupted:', :yellow, :bold)}"
             print_plan_items(info, :interrupt, :yellow)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(info[:removed].empty?)
             ui.puts "    #{ui.color('Resources to be removed:', :red, :bold)}"
             print_plan_items(info, :removed, :red)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(info[:added].empty?)
             ui.puts "    #{ui.color('Resources to be added:', :green, :bold)}"
             print_plan_items(info, :added, :green)
             ui.puts
-            said_things = true
+            said_any_things = said_things = true
           end
           unless(said_things)
             ui.puts "    #{ui.color('No resource lifecycle changes detected!', :green)}"
             ui.puts
           end
         end
-        said_things
+        said_any_things
       end
 
       # Print planning items

data/lib/sfn/command_module/template.rb

@@ -247,6 +247,12 @@ module Sfn
               )
               unless(config[:plan])
                 resource.properties.delete!(:stack)
+              else
+                (stack_definition['Resources'] || {}).each do |_, info|
+                  if(valid_stack_types.include?(info['Type']))
+                    info['Properties'].delete('Stack')
+                  end
+                end
               end
               bucket = provider.connection.api_for(:storage).buckets.get(
                 config[:nesting_bucket]

data/lib/sfn/planner.rb

@@ -14,6 +14,8 @@ module Sfn
     attr_reader :arguments
     # @return [Miasma::Models::Orchestration::Stack] existing remote stack
     attr_reader :origin_stack
+    # @return [Hash] custom options
+    attr_reader :options
 
     # Create a new planner instance
     #
@@ -21,13 +23,15 @@ module Sfn
     # @param config [Smash]
     # @param arguments [Array<String>]
     # @param stack [Miasma::Models::Orchestration::Stack]
+    # @param opts [Hash]
     #
     # @return [self]
-    def initialize(ui, config, arguments, stack)
+    def initialize(ui, config, arguments, stack, opts={})
       @ui = ui
       @config = config
       @arguments = arguments
       @origin_stack = stack
+      @options = opts
     end
 
     # Generate update report

data/lib/sfn/planner/aws.rb

@@ -1,6 +1,3 @@
-require 'pp'
-
-
 require 'sfn'
 require 'sparkle_formation/aws'
 require 'hashdiff'
@@ -13,11 +10,15 @@ module Sfn
       # Customized translator to dereference template
       class Translator < SparkleFormation::Translation
 
+        MAP = {}
+        REF_MAPPING = {}
+        FN_MAPPING = {}
+
         # @return [Array<String>] flagged items for value replacement
         attr_reader :flagged
 
         # Override to init flagged array
-        def initialize(*_)
+        def initialize(template_hash, args={})
           super
           @flagged = []
         end
@@ -147,6 +148,21 @@ module Sfn
 
       protected
 
+      # Set global parameters available for all template translations.
+      # These are pseudo-parameters that are provided by the
+      # orchestration api runtime.
+      #
+      # @return [Hash]
+      def get_global_parameters(stack)
+        Smash.new(
+          'AWS::Region' => stack.api.aws_region,
+          'AWS::AccountId' => stack.id.split(':')[4],
+          'AWS::NotificationARNs' => stack.notification_topics,
+          'AWS::StackId' => stack.id,
+          'AWS::StackName' => stack.name
+        ).merge(config.fetch(:planner, :global_parameters, {}))
+      end
+
       # Generate plan for stack
       #
       # @param stack [Miasma::Models::Orchestration::Stack]
@@ -166,7 +182,11 @@ module Sfn
           :n_outputs => []
         )
 
-        origin_template = dereference_template("#{stack.data.checksum}_origin", stack.template, stack.parameters)
+        origin_template = dereference_template(
+          "#{stack.data.checksum}_origin",
+          stack.template,
+          stack.parameters.merge(get_global_parameters(stack))
+        )
 
         t_key = "#{stack.data.checksum}_#{stack.data.fetch(:logical_id, stack.name)}"
         run_stack_diff(stack, t_key, plan_results, origin_template, new_template, new_parameters)
@@ -227,23 +247,22 @@ module Sfn
           end
         end
 
-        update_template = dereference_template(
-          t_key, new_template.to_smash, new_parameters,
-          plan_results[:replace].keys + plan_results[:unavailable].keys
-        )
+        new_parameters.merge!(get_global_parameters(stack))
+
+        new_template_hash = new_template.to_smash
 
         o_nested_stacks = origin_template['Resources'].find_all do |s_name, s_val|
           is_stack?(s_val['Type'])
         end.map(&:first)
-        n_nested_stacks = new_template['Resources'].find_all do |s_name, s_val|
+        n_nested_stacks = new_template_hash['Resources'].find_all do |s_name, s_val|
           is_stack?(s_val['Type'])
         end.map(&:first)
         [o_nested_stacks + n_nested_stacks].flatten.compact.uniq.each do |n_name|
           o_stack = stack.nested_stacks(false).detect{|s| s.data[:logical_id] == n_name}
-          n_exists = is_stack?(update_template['Resources'].fetch(n_name, {})['Type'])
-          n_template = update_template['Resources'].fetch(n_name, {}).fetch('Properties', {})['Stack']
-          n_parameters = update_template['Resources'].fetch(n_name, {}).fetch('Properties', {})['Parameters']
-          n_type = update_template['Resources'].fetch(n_name, {})['Type'] ||
+          n_exists = is_stack?(new_template_hash['Resources'].fetch(n_name, {})['Type'])
+          n_template = new_template_hash['Resources'].fetch(n_name, {}).fetch('Properties', {})['Stack']
+          n_parameters = new_template_hash['Resources'].fetch(n_name, {}).fetch('Properties', {}).fetch('Parameters', {})
+          n_type = new_template_hash['Resources'].fetch(n_name, {})['Type'] ||
             origin_template['Resources'][n_name]['Type']
           resource = Smash.new(
             :name => n_name,
@@ -267,9 +286,16 @@ module Sfn
             plan_results[:added][n_name] = resource
           end
         end
+
         n_nested_stacks.each do |ns_name|
-          update_template['Resources'][ns_name]['Properties'].delete('Stack')
+          new_template_hash['Resources'][ns_name]['Properties'].delete('Stack')
         end
+
+        update_template = dereference_template(
+          t_key, new_template_hash, new_parameters,
+          plan_results[:replace].keys + plan_results[:unavailable].keys
+        )
+
         HashDiff.diff(origin_template, MultiJson.load(MultiJson.dump(update_template))).group_by do |item|
           item[1]
         end.each do |a_path, diff_items|
@@ -374,8 +400,14 @@ module Sfn
         flagged.each do |item|
           translator.flag_ref(item)
         end
-        template['Resources'] = translator.dereference_processor(template['Resources'], ['Ref', 'Fn', 'DEREF'])
-        template['Outputs'] = translator.dereference_processor(template['Outputs'], ['Ref', 'Fn', 'DEREF'])
+        template.keys.each do |t_key|
+          next if ['Outputs', 'Resources'].include?(t_key)
+          template[t_key] = translator.dereference_processor(template[t_key], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
+        end
+        translator.original.replace(template)
+        template['Resources'] = translator.dereference_processor(template['Resources'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
+        template['Outputs'] = translator.dereference_processor(template['Outputs'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap'])
+        translator.original.replace({})
         template
       end
 
@@ -388,7 +420,9 @@ module Sfn
       def translator_for(t_key, template=nil, parameters=nil)
         o_translator = translators[t_key]
         if(template)
-          translator = Translator.new(template, :parameters => parameters)
+          translator = Translator.new(template,
+            :parameters => parameters
+          )
           if(o_translator)
             o_translator.flagged.each do |i|
               translator.flag_ref(i)
@@ -398,7 +432,9 @@ module Sfn
           o_translator = translator
         else
           unless(o_translator)
-            o_translator = Translator.new({}, :parameters => {})
+            o_translator = Translator.new({},
+              :parameters => {}
+            )
           end
         end
         o_translator

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('1.1.10')
+  VERSION = Gem::Version.new('1.1.12')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli