sfn 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189a8f6f45b7c8e21e0736702c1b3491a575a19a
-  data.tar.gz: 2b45e84280906712c07a932087be8ef583b01afc
+  metadata.gz: ff21ffb339f3f1e06331e13f7766efc450968c8d
+  data.tar.gz: 80fad1d08580b2d49cd5d8b78faf863cd81675b4
 SHA512:
-  metadata.gz: aee4b5d4a44cb4bdcd821522b1b302f9d480ad761a5e2de375a4699d758d9dabce84a488ab514cc65f0c9b83c1d0fd83f7418fcb0e9fccc553547e5f88070f21
-  data.tar.gz: e81546c3197913706bc5b15551fd63fd6a2ba058262fe04df59e27f6e52ec2e9674a599ca5960aab23f4184e0414ab1bbe7d9af64ddcc998b935674e0fa2ac20
+  metadata.gz: 8f292c003150464857fa0ce03605704d67a27f5d7f867d23fe9c4ac839c2797ed18e325bb85b393ce6f379b4c41087bb738ce4fa2b8f8b60256c4c7f7a34730c
+  data.tar.gz: 18c983f3de8d5319be07f723e10e7cfde201e2330b03508b3cba6af0b81f0b27f7ee0c937c64f456c7f0b48a55772e7af65802faf95126eb0b4f1c614f045329

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v3.0.2
+* [fix] Properly scrub nested stack pseudo property on update (#189)
+* [fix] Process nested stacks before removal within AWS planner (#190)
+* [enhancement] Add configuration options for Google cloud (#188)
+
 # v3.0.0
 _Major release includes breaking changes!_
 * [feature] Add support for Google Cloud Deployment Manager (#181)

data/README.md

@@ -8,9 +8,11 @@ with orchestration APIs.
 ## API Compatibility
 
 * AWS
-* Rackspace
-* OpenStack
 * Azure
+* Google
+* Heat
+* OpenStack
+* Rackspace
 
 ## Documentation
 

data/lib/sfn/command/conf.rb

@@ -81,7 +81,7 @@ Configuration.new do
   # nesting_prefix 'nested-templates'
   #   Remote provider credentials
   credentials do
-    #  Remote provider name (:aws, :azure, :open_stack, :rackspace)
+    #  Remote provider name (:aws, :azure, :google, :open_stack, :rackspace)
     provider :aws
     #  AWS credentials information
     aws_access_key_id ENV['AWS_ACCESS_KEY_ID']
@@ -117,6 +117,10 @@ Configuration.new do
     rackspace_api_key ENV['RACKSPACE_API_KEY']
     rackspace_username ENV['RACKSPACE_USERNAME']
     rackspace_region ENV['RACKSPACE_REGION']
+    #  Google Cloud Deployment Manager credentials
+    google_service_account_email ENV['GOOGLE_SERVICE_ACCOUNT_EMAIL']
+    google_service_account_private_key ENV['GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY']
+    google_project ENV['GOOGLE_PROJECT']
   end
 end
 EOF

data/lib/sfn/command/update.rb

@@ -274,7 +274,7 @@ module Sfn
                     if(diff[:updated].nil?)
                       ui.puts
                     else
-                      ui.puts ui.color("+#{diff[:updated]}", :green)
+                      ui.puts ui.color("+#{diff[:updated].to_s.gsub('__MODIFIED_REFERENCE_VALUE__', '<Dependency Modified>')}", :green)
                     end
                   end
                 end

data/lib/sfn/command_module/template.rb

@@ -312,13 +312,13 @@ module Sfn
 
         # Extract currently defined parameters for nested template
         #
-        # @param stack [SparkleFormation]
+        # @param template [SparkleFormation]
         # @param stack_name [String]
         # @param c_stack [Miasma::Models::Orchestration::Stack]
         # @return [Hash]
-        def extract_current_nested_template_parameters(stack, stack_name, c_stack=nil)
-          if(stack.parent)
-            current_parameters = stack.parent.compile.resources.set!(stack_name).properties.parameters
+        def extract_current_nested_template_parameters(template, stack_name, c_stack=nil)
+          if(template.parent)
+            current_parameters = template.parent.compile.resources.set!(stack_name).properties.parameters
             current_parameters.nil? ? Smash.new : current_parameters._dump
           else
             Smash.new
@@ -328,11 +328,11 @@ module Sfn
         # Store template in remote bucket and update given result hash
         #
         # @param full_stack_name [String] unique resource name for template
-        # @param stack [SparkleFormation] template instance
+        # @param template [SparkleFormation, Hash] template instance
         # @param result [Hash]
         # @return [Hash]
-        def store_template(full_stack_name, stack, result)
-          stack_definition = stack.is_a?(SparkleFormation) ? dump_stack_for_storage(stack) : stack
+        def store_template(full_stack_name, template, result)
+          stack_definition = template.is_a?(SparkleFormation) ? dump_stack_for_storage(template) : template
           bucket = provider.connection.api_for(:storage).buckets.get(
             config[:nesting_bucket]
           )
@@ -352,16 +352,16 @@ module Sfn
         # Remove internally used `Stack` property from Stack resources and
         # and generate compiled Hash
         #
-        # @param stack [SparkleFormation]
+        # @param template [SparkleFormation]
         # @return [Hash]
-        def dump_stack_for_storage(stack)
-          nested_stacks = stack.nested_stacks.map do |nested_resource|
-            [nested_resource.resource_name!, stack.compile.resources.set!(nested_resource.resource_name!).properties.delete!(:stack)]
+        def dump_stack_for_storage(template)
+          nested_stacks = template.nested_stacks(:with_resource, :with_name).map do |nested_stack, nested_resource, nested_name|
+            [nested_name, nested_resource, nested_resource.properties.delete!(:stack)]
           end
-          stack_definition = stack.compile.dump!
+          stack_definition = template.dump
           if(config[:plan])
-            nested_stacks.each do |nested_name, nested_data|
-              stack.compile.resources.set!(nested_name).properties.stack nested_data
+            nested_stacks.each do |nested_name, nested_resource, nested_data|
+              nested_resource.properties.set!(:stack, nested_data)
             end
           end
           stack_definition

data/lib/sfn/planner/aws.rb

@@ -272,10 +272,10 @@ module Sfn
         end
         new_parameters.merge!(get_global_parameters(stack))
         new_template_hash = new_template.to_smash
-        scrub_stack_properties(new_template_hash)
 
         plan_nested_stacks(stack, translator, origin_template, new_template_hash, plan_results)
 
+        scrub_stack_properties(new_template_hash)
         update_template = dereference_template(
           t_key, new_template_hash, new_parameters,
           plan_results[:replace].keys + plan_results[:unavailable].keys
@@ -315,7 +315,7 @@ module Sfn
             stk.data[:logical_id] == stack_name
           end
           new_stack_exists = is_stack?(new_template_hash.get('Resources', stack_name, 'Type'))
-          new_stack_template = new_template_hash.get('Resources', stack_name, 'Properties', 'Stack')
+          new_stack_template = new_template_hash.fetch('Resources', stack_name, 'Properties', 'Stack', Smash.new)
           new_stack_parameters = new_stack_template.fetch('Parameters', Smash.new)
           new_stack_type = new_template_hash.fetch('Resources', stack_name, 'Type',
             origin_template.get('Resources', stack_name, 'Type')

data/lib/sfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli