sparkle_formation 3.0.26 → 3.0.28

data/lib/sparkle_formation/provider/google.rb

@@ -16,12 +16,12 @@ class SparkleFormation
       # @param dump_copy [Smash] translated dump
       # @param parent_names [Array<String>] name of parent resources
       # @return [Smash] dump_copy
-      def google_template_extractor(template_hash, dump_copy, parent_names=[])
+      def google_template_extractor(template_hash, dump_copy, parent_names = [])
         template_hash.fetch('resources', []).each do |t_resource|
-          if(t_resource['type'] == stack_resource_type)
+          if t_resource['type'] == stack_resource_type
             full_names = parent_names + [t_resource['name']]
             stack = t_resource['properties'].delete('stack')
-            if(t_resource['properties'].empty?)
+            if t_resource['properties'].empty?
               t_resource.delete('properties')
             end
             google_template_extractor(stack, dump_copy, full_names)
@@ -45,18 +45,18 @@ class SparkleFormation
         dump_copy[:imports].push(
           Smash.new(
             :name => f_name,
-            :content => r_stack
+            :content => r_stack,
           )
         )
-        if(r_parameters)
+        if r_parameters
           dump_copy[:imports].push(
             Smash.new(
               :name => "#{f_name}.schema",
-              :content => Smash.new.tap{|schema|
+              :content => Smash.new.tap { |schema|
                 schema.set(:info, :title, "#{f_name} template")
                 schema.set(:info, :description, "#{f_name} template schema")
                 schema.set(:properties, r_parameters)
-              }
+              },
             )
           )
         end
@@ -69,13 +69,12 @@ class SparkleFormation
       # @return [Hash]
       def google_dump
         result = non_google_dump
-        if(root?)
+        if root?
           dump_copy = Smash.new(:imports => [])
           google_template_extractor(result, dump_copy)
           dump_copy.set(:config, :content, result)
           dump_copy.set(:config, :content, :imports,
-            dump_copy[:imports].map{|i| i[:name]}
-          )
+                        dump_copy[:imports].map { |i| i[:name] })
           dump_copy.to_hash
         else
           result
@@ -125,21 +124,21 @@ class SparkleFormation
       def apply_deep_nesting(*args, &block)
         outputs = collect_outputs
         nested_stacks(:with_resource).each do |stack, resource|
-          unless(stack.nested_stacks.empty?)
+          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))
+            if output_name = output_matched?(parameter_name, outputs.keys)
               next if outputs[output_name] == stack
               stack_output = stack.make_output_available(output_name, outputs, self)
               # NOTE: Only set value if not already explicitly set
-              if(resource.properties._set(parameter_name).nil?)
+              if resource.properties._set(parameter_name).nil?
                 resource.properties._set(parameter_name, stack_output)
               end
             end
           end
         end
-        if(block_given?)
+        if block_given?
           extract_templates(&block)
         end
         self
@@ -169,20 +168,20 @@ class SparkleFormation
             )
           )
         end
-        if(bubble_path.empty?)
-          if(drip_path.size == 1)
+        if bubble_path.empty?
+          if drip_path.size == 1
             parent = drip_path.first.parent
-            if(parent && !parent.compile.parameters._set(output_name).nil?)
+            if parent && !parent.compile.parameters._set(output_name).nil?
               return compile.parameter!(output_name)
             end
           end
           raise ArgumentError.new "Failed to detect available bubbling path for output `#{output_name}`. " <<
-            'This may be due to a circular dependency! ' <<
-            "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
-            "Requester Path: #{root_path.map(&:name).join(' > ')})"
+                                    'This may be due to a circular dependency! ' <<
+                                    "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
+                                    "Requester Path: #{root_path.map(&:name).join(' > ')})"
         end
         result = source_stack.compile._stack_output(bubble_path.first.name, output_name)
-        if(drip_path.size > 1)
+        if drip_path.size > 1
           parent = drip_path.first.parent
           drip_path.unshift(parent) if parent
           drip_path.each_slice(2) do |base_sparkle, ref_sparkle|
@@ -194,7 +193,6 @@ class SparkleFormation
         end
         result
       end
-
     end
   end
 end

data/lib/sparkle_formation/provider/heat.rb

@@ -30,18 +30,18 @@ class SparkleFormation
       def apply_deep_nesting(*args, &block)
         outputs = collect_outputs
         nested_stacks(:with_resource).each do |stack, resource|
-          unless(stack.nested_stacks.empty?)
+          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))
+            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, stack_output)
             end
           end
         end
-        if(block_given?)
+        if block_given?
           extract_templates(&block)
         end
         compile
@@ -63,7 +63,7 @@ class SparkleFormation
           remap_nested_parameters(compile, parameters, stack_name, stack_resource, output_map)
         end
         extract_templates(&block)
-        if(args.include?(:bubble_outputs))
+        if args.include?(:bubble_outputs)
           output_map.each do |o_name, o_val|
             compile.outputs._set(o_name).value compile._stack_output(*o_val)
           end
@@ -88,20 +88,20 @@ class SparkleFormation
             )
           )
         end
-        if(bubble_path.empty?)
-          if(drip_path.size == 1)
+        if bubble_path.empty?
+          if drip_path.size == 1
             parent = drip_path.first.parent
-            if(parent && !parent.compile.parameters._set(output_name).nil?)
+            if parent && !parent.compile.parameters._set(output_name).nil?
               return compile.parameter!(output_name)
             end
           end
           raise ArgumentError.new "Failed to detect available bubbling path for output `#{output_name}`. " <<
-            'This may be due to a circular dependency! ' <<
-            "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
-            "Requester Path: #{root_path.map(&:name).join(' > ')})"
+                                    'This may be due to a circular dependency! ' <<
+                                    "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
+                                    "Requester Path: #{root_path.map(&:name).join(' > ')})"
         end
         result = compile._stack_output(bubble_path.first.name, output_name)
-        if(drip_path.size > 1)
+        if drip_path.size > 1
           parent = drip_path.first.parent
           drip_path.unshift(parent) if parent
           drip_path.each_slice(2) do |base_sparkle, ref_sparkle|
@@ -131,17 +131,17 @@ class SparkleFormation
       def remap_nested_parameters(template, parameters, stack_name, stack_resource, output_map)
         nested_template = stack_resource.properties.stack.compile
         stack_parameters = nested_template.parameters
-        unless(stack_parameters.nil?)
+        unless stack_parameters.nil?
           stack_parameters._keys.each do |pname|
             pval = stack_parameters[pname]
-            unless(pval.stack_unique.nil?)
+            unless pval.stack_unique.nil?
               check_name = [stack_name, pname].join
             else
               check_name = pname
             end
-            if(!parameters._set(check_name).nil?)
+            if !parameters._set(check_name).nil?
               template.resources._set(stack_name).properties.parameters._set(pname, template._parameter(check_name))
-            elsif(output_map[check_name])
+            elsif output_map[check_name]
               template.resources._set(stack_name).properties.parameters._set(pname)
               template._stack_output(*output_map[check_name])
             else
@@ -150,15 +150,15 @@ class SparkleFormation
             end
           end
         end
-        unless(nested_template.outputs.nil?)
+        unless nested_template.outputs.nil?
           nested_template.outputs.keys!.each do |oname|
             output_map[oname] = [stack_name, oname]
           end
         end
         true
       end
-
     end
+
     OpenStack = Heat
   end
 end

data/lib/sparkle_formation/provider/terraform.rb

@@ -14,13 +14,13 @@ class SparkleFormation
         Smash.new(
           :parameters => :variable,
           :resources => :resource,
-          :outputs => :output
+          :outputs => :output,
         ).each do |original, updated|
-          if(val = result.delete(original))
+          if val = result.delete(original)
             result[updated] = val
           end
         end
-        if(resources = result.delete(:resource))
+        if resources = result.delete(:resource)
           result[:resource] = Smash.new
           resources.each do |r_name, r_info|
             result.set(:resource, r_info[:type], r_name, r_info[:properties])
@@ -72,21 +72,21 @@ class SparkleFormation
       def apply_deep_nesting(*args, &block)
         outputs = collect_outputs
         nested_stacks(:with_resource).each do |stack, resource|
-          unless(stack.nested_stacks.empty?)
+          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))
+            if output_name = output_matched?(parameter_name, outputs.keys)
               next if outputs[output_name] == stack
               stack_output = stack.make_output_available(output_name, outputs, self)
               # NOTE: Only set value if not already explicitly set
-              if(resource.properties.parameters._set(parameter_name).nil?)
+              if resource.properties.parameters._set(parameter_name).nil?
                 resource.properties.parameters._set(parameter_name, stack_output)
               end
             end
           end
         end
-        if(block_given?)
+        if block_given?
           extract_templates(&block)
         end
         self
@@ -115,20 +115,20 @@ class SparkleFormation
             )
           )
         end
-        if(bubble_path.empty?)
-          if(drip_path.size == 1)
+        if bubble_path.empty?
+          if drip_path.size == 1
             parent = drip_path.first.parent
-            if(parent && !parent.compile.parameters._set(output_name).nil?)
+            if parent && !parent.compile.parameters._set(output_name).nil?
               return compile.parameter!(output_name)
             end
           end
           raise ArgumentError.new "Failed to detect available bubbling path for output `#{output_name}`. " <<
-            'This may be due to a circular dependency! ' <<
-            "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
-            "Requester Path: #{root_path.map(&:name).join(' > ')})"
+                                    'This may be due to a circular dependency! ' <<
+                                    "(Output Path: #{outputs[output_name].root_path.map(&:name).join(' > ')} " <<
+                                    "Requester Path: #{root_path.map(&:name).join(' > ')})"
         end
         result = source_stack.compile._stack_output(bubble_path.first.name, output_name)
-        if(drip_path.size > 1)
+        if drip_path.size > 1
           parent = drip_path.first.parent
           drip_path.unshift(parent) if parent
           drip_path.each_slice(2) do |base_sparkle, ref_sparkle|
@@ -140,7 +140,6 @@ class SparkleFormation
         end
         result
       end
-
     end
   end
 end

data/lib/sparkle_formation/provider.rb

@@ -3,13 +3,11 @@ require 'sparkle_formation'
 class SparkleFormation
   # Provider specific implementation namespace
   module Provider
-
     autoload :Aws, 'sparkle_formation/provider/aws'
     autoload :Azure, 'sparkle_formation/provider/azure'
     autoload :Google, 'sparkle_formation/provider/google'
     autoload :Heat, 'sparkle_formation/provider/heat'
     autoload :OpenStack, 'sparkle_formation/provider/heat'
     autoload :Terraform, 'sparkle_formation/provider/terraform'
-
   end
 end