sparkle_formation 3.0.16 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff339020395b4fde4837cc5e7deb4001b53ffae
-  data.tar.gz: 0dede473ebcec2f710162af551f0a88da821b8cf
+  metadata.gz: 14385f4b5ede6c882f0f996a4f19c58c551d6b26
+  data.tar.gz: e4a313a0d73d91d7fa512d2e67dfc70f8e281e3e
 SHA512:
-  metadata.gz: a7dae3cb305e19d69618541583e6eba0bd472a69db5d0d4d0335cf8469378ac456df131d6c5be9b2b68f2ed01b2394c8aae2c4d8b9021f38cc2e323bb349463a
-  data.tar.gz: f6d7bea2bea0e9ae058e3d5a1769fbe286767f90627484d801111823df9d4ac2ad3b2d99d9298799e79d92693bb52ebf3280eb1dfb4c05601259071724da02f4
+  metadata.gz: b5ec3a38b93458caf38e9119cdcfc07c97726955ea68630af1504afd33f3a61af4e4f01a7a44623da62e448dbc0f9d5c81f40f223161d0059e7b69f1dddb0489
+  data.tar.gz: 5158012d4f61b3f2a1f1afcc555fd6a5004ae534b9d8a6a10b3583c82dae0ce48e4694408752d24487ff3412de2c839d7efb45997d8f4d4d237c1b904dd941a5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.18
+* Fix deeply nested parameter pushing (#209)
+* Remap known nested variable functions in Azure templates (#210)
+
 # v3.0.16
 * Allow data structure arguments in AWS helpers
 * Add AWS sub intrinsic function helper

data/lib/sparkle_formation.rb

@@ -5,6 +5,7 @@ require 'attribute_struct'
 # Unicorns and rainbows
 class SparkleFormation
   autoload :Aws, 'sparkle_formation/aws'
+  autoload :AzureVariableStruct, 'sparkle_formation/function_struct'
   autoload :Composition, 'sparkle_formation/composition'
   autoload :Error, 'sparkle_formation/error'
   autoload :FunctionStruct, 'sparkle_formation/function_struct'

data/lib/sparkle_formation/function_struct.rb

@@ -175,6 +175,44 @@ class SparkleFormation
 
   end
 
+  # Function struct specialized for Azure variables to check nested
+  # variable function value and properly match defined case
+  class AzureVariableStruct < FunctionStruct
+    # [SparkleStruct] context of function usage
+    attr_reader :_fn_context
+
+    # Set current function context
+    #
+    # @param ctx [SparkleStruct] current context
+    # @return [SparkleStruct]
+    def _fn_context=(ctx)
+      @_fn_context = ctx
+    end
+
+    # Wrapper to check for nested function call and properly case
+    # the function if found.
+    def _dump
+      # Remap nested function keys if possible
+      if(_fn_context && _fn_context.root!.data![_fn_name] && _fn_context.root!.data![_fn_name].data![_fn_args.first])
+        __valid_keys = _fn_context.root!.data![_fn_name].data![_fn_args.first].keys!
+        __current_key = @table.keys.first
+        __match_key = __current_key.to_s.downcase.gsub('_', '')
+        __key_remap = __valid_keys.detect do |__nested_key|
+          __nested_key.to_s.downcase.gsub('_', '') == __match_key
+        end
+        if(__key_remap)
+          @table[__key_remap] = @table.delete(@table.keys.first)
+        end
+      end
+      super
+    end
+
+    # @return [Class]
+    def _klass
+      ::SparkleFormation::AzureVariableStruct
+    end
+  end
+
   # FunctionStruct for jinja expressions
   class JinjaExpressionStruct < FunctionStruct
 

data/lib/sparkle_formation/provider/aws.rb

@@ -57,7 +57,7 @@ class SparkleFormation
           unless(stack.root?)
             stack.compile.parameters.keys!.each do |parameter_name|
               next if stack.compile.parameters.set!(parameter_name).stack_unique == true
-              if(!stack.parent.compile.parameters.set!(parameter_name).nil?)
+              if(!stack.parent.compile.parameters.data![parameter_name].nil?)
                 resource.properties.parameters.set!(parameter_name, resource.ref!(parameter_name))
               elsif(output_name = output_matched?(parameter_name, outputs.keys))
                 next if outputs[output_name] == stack

data/lib/sparkle_formation/provider/azure.rb

@@ -33,11 +33,16 @@ class SparkleFormation
           unless(stack.nested_stacks.empty?)
             stack.apply_deep_nesting(*args)
           end
-          stack.compile.parameters.keys!.each do |parameter_name|
-            if(output_name = output_matched?(parameter_name, outputs.keys))
-              next if outputs[output_name] == stack
-              stack_output = stack.make_output_available(output_name, outputs)
-              resource.properties.parameters._set(parameter_name).value stack_output
+          unless(stack.root?)
+            stack.compile.parameters.keys!.each do |parameter_name|
+              next if stack.compile.parameters.set!(parameter_name).stack_unique == true
+              if(!stack.parent.compile.parameters.data![parameter_name].nil?)
+                resource.properties.parameters.set!(parameter_name, resource.ref!(parameter_name))
+              elsif(output_name = output_matched?(parameter_name, outputs.keys))
+                next if outputs[output_name] == stack
+                stack_output = stack.make_output_available(output_name, outputs)
+                resource.properties.parameters.set!(parameter_name, stack_output)
+              end
             end
           end
         end

data/lib/sparkle_formation/sparkle_attribute/azure.rb

@@ -69,7 +69,6 @@ class SparkleFormation
         'uri',
         'deployment',
         'parameters',
-        'variables',
         'listKeys',
         'providers',
         'reference',
@@ -103,6 +102,16 @@ class SparkleFormation
         alias_method "#{f_name}!".to_sym, "_#{f_name}".to_sym
       end
 
+      # Variables generator
+      #
+      # @return [SparkleFormation::AzureVariableStruct]
+      def _variables(*args)
+        x = ::SparkleFormation::AzureVariableStruct.new('variables', *args)
+        x._fn_context = self
+        x
+      end
+      alias_method :variables!, :_variables
+
       # @overload _resource_id(resource_name)
       #   Customized resourceId generator that will perform automatic
       #   lookup on defined resources for building the function if Symbol

data/lib/sparkle_formation/sparkle_formation.rb

@@ -755,14 +755,16 @@ class SparkleFormation
     if(compile[:resources])
       compile.resources.keys!.map do |key|
         if(stack_resource_type?(compile.resources[key].type))
-          result = [compile.resources[key].properties.stack]
-          if(args.include?(:with_resource))
-            result.push(compile[:resources][key])
-          end
-          if(args.include?(:with_name))
-            result.push(key)
+          if(compile.resources[key].properties.stack.is_a?(::SparkleFormation))
+            result = [compile.resources[key].properties.stack]
+            if(args.include?(:with_resource))
+              result.push(compile[:resources][key])
+            end
+            if(args.include?(:with_name))
+              result.push(key)
+            end
+            result.size == 1 ? result.first : result
           end
-          result.size == 1 ? result.first : result
         end
       end.compact
     else

data/lib/sparkle_formation/version.rb

@@ -1,5 +1,5 @@
 # Unicorns and rainbows
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new('3.0.16')
+  VERSION = Gem::Version.new('3.0.18')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 3.0.18
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct