sparkle_formation 3.0.26 → 3.0.28

data/lib/sparkle_formation/sparkle_struct.rb

@@ -11,21 +11,25 @@ class SparkleFormation
       include SparkleAttribute
       include SparkleAttribute::Aws
     end
+
     # Azure specific struct
     class Azure < SparkleStruct
       include SparkleAttribute
       include SparkleAttribute::Azure
     end
+
     # Google specific struct
     class Google < SparkleStruct
       include SparkleAttribute
       include SparkleAttribute::Google
     end
+
     # Heat specific struct
     class Heat < SparkleStruct
       include SparkleAttribute
       include SparkleAttribute::Heat
     end
+
     OpenStack = Heat
     Rackspace = Heat
     # Rackspace specific struct
@@ -33,6 +37,7 @@ class SparkleFormation
       include SparkleAttribute
       include SparkleAttribute::Rackspace
     end
+
     # Terraform specific struct
     class Terraform < SparkleStruct
       include SparkleAttribute
@@ -59,7 +64,7 @@ class SparkleFormation
     # @param inst [SparkleFormation]
     # @return [SparkleFormation]
     def _set_self(inst)
-      unless(inst.is_a?(::SparkleFormation))
+      unless inst.is_a?(::SparkleFormation)
         ::Kernel.raise ::TypeError.new "Expecting type of `SparkleFormation` but got `#{inst.class}`"
       end
       @self = inst
@@ -67,8 +72,8 @@ class SparkleFormation
 
     # @return [SparkleFormation]
     def _self(*_)
-      unless(@self)
-        if(_parent.nil?)
+      unless @self
+        if _parent.nil?
           ::Kernel.raise ::ArgumentError.new 'Creator did not provide return reference!'
         else
           _parent._self
@@ -84,8 +89,8 @@ class SparkleFormation
     # @param item [Object]
     # @return [Object]
     def function_bubbler(item)
-      if(item.is_a?(::Enumerable))
-        if(item.respond_to?(:keys))
+      if item.is_a?(::Enumerable)
+        if item.respond_to?(:keys)
           item.class[
             *item.map do |entry|
               function_bubbler(entry)
@@ -98,7 +103,7 @@ class SparkleFormation
             end
           ]
         end
-      elsif(item.is_a?(::SparkleFormation::FunctionStruct))
+      elsif item.is_a?(::SparkleFormation::FunctionStruct)
         item._root
       else
         item
@@ -108,14 +113,14 @@ class SparkleFormation
     # Override to inspect result value and fetch root if value is a
     # FunctionStruct
     def method_missing(sym, *args, &block)
-      if(sym.is_a?(::String) || sym.is_a?(::Symbol))
-        if(sym.to_s.start_with?('_') || sym.to_s.end_with?('!'))
+      if sym.is_a?(::String) || sym.is_a?(::Symbol)
+        if sym.to_s.start_with?('_') || sym.to_s.end_with?('!')
           ::Kernel.raise ::NoMethodError.new "Undefined method `#{sym}` for #{_klass.name}"
         end
       end
       super(*[sym, *args], &block)
-      if(sym.is_a?(::String) || sym.is_a?(::Symbol))
-        if((s = sym.to_s).end_with?('='))
+      if sym.is_a?(::String) || sym.is_a?(::Symbol)
+        if (s = sym.to_s).end_with?('=')
           s.slice!(-1, s.length)
           sym = s
         end
@@ -125,13 +130,13 @@ class SparkleFormation
       end
       # When setting an AttributeStruct type instance check parent or context if
       # available and reset if it has been moved.
-      if(@table[sym].is_a?(::AttributeStruct))
-        if(@table[sym].is_a?(::SparkleFormation::FunctionStruct))
-          if(@table[sym].respond_to?(:_fn_context) && @table[sym]._fn_context != self)
+      if @table[sym].is_a?(::AttributeStruct)
+        if @table[sym].is_a?(::SparkleFormation::FunctionStruct)
+          if @table[sym].respond_to?(:_fn_context) && @table[sym]._fn_context != self
             @table[sym] = @table[sym]._clone
             @table[sym]._fn_context = self
           end
-        elsif(@table[sym]._parent != self)
+        elsif @table[sym]._parent != self
           @table[sym]._parent(self)
         end
       end
@@ -151,10 +156,10 @@ class SparkleFormation
       inst = super()
       inst._set_self(_self)
       inst._struct_class = _struct_class
-      if(args.first.is_a?(::Hash))
+      if args.first.is_a?(::Hash)
         inst._load(args.first)
       end
-      if(block)
+      if block
         inst.build!(&block)
       end
       inst
@@ -168,9 +173,9 @@ class SparkleFormation
     # @raises [ArgumentError]
     def _state(arg)
       result = super
-      if(@self && result.nil?)
-        if(_self.parameters.keys.map(&:to_s).include?(arg.to_s))
-          unless(_self.parameters[arg.to_sym].key?(:default))
+      if @self && result.nil?
+        if _self.parameters.keys.map(&:to_s).include?(arg.to_s)
+          unless _self.parameters[arg.to_sym].key?(:default)
             ::Kernel.raise ::ArgumentError.new "No value provided for compile time parameter: `#{arg}`!"
           else
             result = _self.parameters[arg.to_sym][:default]
@@ -179,6 +184,7 @@ class SparkleFormation
       end
       result
     end
+
     alias_method :state!, :_state
 
     # TODO: Need to refactor attribute_struct dumping to allow hooking
@@ -190,8 +196,8 @@ class SparkleFormation
     # @param item [Object]
     # @return [Object]
     def _sparkle_dump_unpacker(item)
-      if(item.is_a?(::Enumerable))
-        if(item.respond_to?(:keys))
+      if item.is_a?(::Enumerable)
+        if item.respond_to?(:keys)
           item.class[
             *item.map do |entry|
               _sparkle_dump_unpacker(entry)
@@ -204,9 +210,9 @@ class SparkleFormation
             end
           ]
         end
-      elsif(item.is_a?(::AttributeStruct))
+      elsif item.is_a?(::AttributeStruct)
         item.nil? ? UNSET_VALUE : item._sparkle_dump
-      elsif(item.is_a?(::SparkleFormation))
+      elsif item.is_a?(::SparkleFormation)
         item.sparkle_dump
       else
         item
@@ -222,7 +228,7 @@ class SparkleFormation
       end.compact
       __hashish[*processed.flatten(1)]
     end
-    alias_method :sparkle_dump!, :_sparkle_dump
 
+    alias_method :sparkle_dump!, :_sparkle_dump
   end
 end

data/lib/sparkle_formation/translation/heat.rb

@@ -20,9 +20,9 @@ class SparkleFormation
         cache.fetch('Parameters', {}).each do |k, v|
           translated['parameters'][k] = Hash[
             v.map do |key, value|
-              if(key == 'Type')
+              if key == 'Type'
                 [snake(key).to_s, value.downcase]
-              elsif(key == 'AllowedValues')
+              elsif key == 'AllowedValues'
                 # @todo fix this up to properly build constraints
                 ['constraints', [{'allowed_values' => value}]]
               else
@@ -51,11 +51,11 @@ class SparkleFormation
         translated['heat_template_version'] = '2013-05-23'
         # no HOT support for mappings, so remove and clean pseudo
         # params in refs
-        if(translated['resources'])
+        if translated['resources']
           translated['resources'] = dereference_processor(translated['resources'], ['Fn::FindInMap', 'Ref'])
           translated['resources'] = rename_processor(translated['resources'])
         end
-        if(translated['outputs'])
+        if translated['outputs']
           translated['outputs'] = dereference_processor(translated['outputs'], ['Fn::FindInMap', 'Ref'])
           translated['outputs'] = rename_processor(translated['outputs'])
         end
@@ -82,24 +82,24 @@ class SparkleFormation
 
         # if health check is provided, create resource and apply to
         # all pools generated
-        if(healthcheck)
+        if healthcheck
           healthcheck_name = "#{resource_name}HealthCheck"
           check = {
             healthcheck_name => {
               'Type' => 'OS::Neutron::HealthMonitor',
-              'Properties' => {}.tap{ |properties|
+              'Properties' => {}.tap { |properties|
                 {'Timeout' => 'timeout', 'Interval' => 'delay', 'HealthyThreshold' => 'max_retries'}.each do |aws, hot|
-                  if(healthcheck[aws])
+                  if healthcheck[aws]
                     properties[hot] = healthcheck[aws]
                   end
                 end
-                type, port, path = healthcheck['Target'].split(%r{(:|/.*)}).find_all{|x| x != ':'}
+                type, port, path = healthcheck['Target'].split(%r{(:|/.*)}).find_all { |x| x != ':' }
                 properties['type'] = type
-                if(path)
+                if path
                   properties['url_path'] = path
                 end
-              }
-            }
+              },
+            },
           }
           translated['Resources'].merge!(check)
         end
@@ -112,21 +112,21 @@ class SparkleFormation
             'Properties' => {
               'lb_method' => 'ROUND_ROBIN',
               'monitors' => [
-                {'get_resource' => healthcheck_name}
+                {'get_resource' => healthcheck_name},
               ],
               'protocol' => base_listener['Protocol'],
               'vip' => {
-                'protocol_port' => base_listener['LoadBalancerPort']
+                'protocol_port' => base_listener['LoadBalancerPort'],
               },
-              'subnet' => subnet
-            }
-          }
+              'subnet' => subnet,
+            },
+          },
         }
-        if(healthcheck)
+        if healthcheck
           base_pool[base_pool_name]['Properties'].merge(
             'monitors' => [
-              {'get_resource' => healthcheck_name}
-            ]
+              {'get_resource' => healthcheck_name},
+            ],
           )
         end
 
@@ -144,16 +144,16 @@ class SparkleFormation
                 'protocol' => listener['Protocol'],
                 'subnet' => subnet,
                 'vip' => {
-                  'protocol_port' => listener['LoadBalancerPort']
-                }
-              }
-            }
+                  'protocol_port' => listener['LoadBalancerPort'],
+                },
+              },
+            },
           }
-          if(healthcheck)
+          if healthcheck
             pool[pool_name]['Properties'].merge(
               'monitors' => [
-                {'get_resource' => healthcheck_name}
-              ]
+                {'get_resource' => healthcheck_name},
+              ],
             )
           end
 
@@ -174,7 +174,7 @@ class SparkleFormation
         translated['resources'].find_all do |resource_name, resource|
           resource['type'] == 'OS::Heat::AutoScalingGroup'
         end.each do |name, value|
-          if(lbs = value['properties'].delete('load_balancers'))
+          if lbs = value['properties'].delete('load_balancers')
             lbs.each do |lb_ref|
               lb_name = resource_name(lb_ref)
               lb_resource = translated['resources'][lb_name]
@@ -199,7 +199,7 @@ class SparkleFormation
       # @option args [Hash] :original_resource
       # @return [Array<String, Object>] name and new value
       # @todo implement
-      def nova_server_block_device_mapping(value, args={})
+      def nova_server_block_device_mapping(value, args = {})
         ['block_device_mapping', value]
       end
 
@@ -211,7 +211,7 @@ class SparkleFormation
       # @option args [Hash] :new_properties
       # @option args [Hash] :original_resource
       # @return [Array<String, Object>] name and new value
-      def nova_server_user_data(value, args={})
+      def nova_server_user_data(value, args = {})
         args[:new_properties][:user_data_format] = 'RAW'
         args[:new_properties][:config_drive] = 'true'
         [:user_data, Hash[value.values.first]]
@@ -225,18 +225,18 @@ class SparkleFormation
       # @param old_resource [Hash]
       # @return [Object]
       def nova_server_finalizer(resource_name, new_resource, old_resource)
-        if(old_resource['Metadata'])
+        if old_resource['Metadata']
           new_resource['Metadata'] = old_resource['Metadata']
           proceed = new_resource['Metadata'] &&
-            new_resource['Metadata']['AWS::CloudFormation::Init'] &&
-            config = new_resource['Metadata']['AWS::CloudFormation::Init']['config']
-          if(proceed)
+                    new_resource['Metadata']['AWS::CloudFormation::Init'] &&
+                    config = new_resource['Metadata']['AWS::CloudFormation::Init']['config']
+          if proceed
             # NOTE: This is a stupid hack since HOT gives the URL to
             # wget directly and if special characters exist, it fails
-            if(files = config['files'])
+            if files = config['files']
               files.each do |key, args|
-                if(args['source'])
-                  if(args['source'].is_a?(String))
+                if args['source']
+                  if args['source'].is_a?(String)
                     args['source'].replace("\"#{args['source']}\"")
                   else
                     args['source'] = {
@@ -244,9 +244,9 @@ class SparkleFormation
                         '', [
                           "\"",
                           args['source'],
-                          "\""
-                        ]
-                      ]
+                          "\"",
+                        ],
+                      ],
                     }
                   end
                 end
@@ -266,10 +266,10 @@ class SparkleFormation
       # @return [TrueClass]
       def neutron_subnet_finalizer(resource_name, new_resource, old_resource)
         azs = new_resource['Properties'].delete('availability_zone')
-        if(azs)
+        if azs
           network_name = "NetworkFor#{resource_name}"
           translated['Resources'][network_name] = {
-            'type' => 'OS::Neutron::Network'
+            'type' => 'OS::Neutron::Network',
           }
           new_resource['Properties']['network'] = {'get_resource' => network_name}
         end
@@ -295,7 +295,7 @@ class SparkleFormation
       # @return [TrueClass]
       def resource_finalizer(resource_name, new_resource, old_resource)
         %w(DependsOn Metadata).each do |key|
-          if(old_resource[key] && !new_resource[key])
+          if old_resource[key] && !new_resource[key]
             new_resource[key] = old_resource[key]
           end
         end
@@ -311,7 +311,7 @@ class SparkleFormation
       # @option args [Hash] :original_resource
       # @return [Array<String, Object>] name and new value
       # @todo implement
-      def autoscaling_group_launchconfig(value, args={})
+      def autoscaling_group_launchconfig(value, args = {})
         ['resource', value]
       end
 
@@ -339,8 +339,8 @@ class SparkleFormation
               'SecurityGroups' => 'security_groups',
               'SecurityGroupIds' => 'security_groups',
               'Tags' => 'metadata',
-              'UserData' => :nova_server_user_data
-            }
+              'UserData' => :nova_server_user_data,
+            },
           },
           'AWS::AutoScaling::AutoScalingGroup' => {
             :name => 'OS::Heat::AutoScalingGroup',
@@ -349,8 +349,8 @@ class SparkleFormation
               'DesiredCapacity' => 'desired_capacity',
               'MaxSize' => 'max_size',
               'MinSize' => 'min_size',
-              'LaunchConfigurationName' => :autoscaling_group_launchconfig
-            }
+              'LaunchConfigurationName' => :autoscaling_group_launchconfig,
+            },
           },
           'AWS::AutoScaling::LaunchConfiguration' => :delete,
           'AWS::ElasticLoadBalancing::LoadBalancer' => {
@@ -360,15 +360,15 @@ class SparkleFormation
               'Instances' => 'members',
               'Listeners' => 'listeners',
               'HealthCheck' => 'health_check',
-              'Subnets' => 'subnets'
-            }
+              'Subnets' => 'subnets',
+            },
           },
           'AWS::EC2::VPC' => {
             :name => 'OS::Neutron::Net',
             :finalizer => :neutron_net_finalizer,
             :properties => {
-              'CidrBlock' => 'cidr'
-            }
+              'CidrBlock' => 'cidr',
+            },
           },
           'AWS::EC2::Subnet' => {
             :name => 'OS::Neutron::Subnet',
@@ -376,23 +376,22 @@ class SparkleFormation
             :properties => {
               'CidrBlock' => 'cidr',
               'VpcId' => 'network',
-              'AvailabilityZone' => 'availability_zone'
-            }
-          }
-        }
+              'AvailabilityZone' => 'availability_zone',
+            },
+          },
+        },
       }
 
       REF_MAPPING = {
         'AWS::StackName' => 'OS::stack_name',
         'AWS::StackId' => 'OS::stack_id',
-        'AWS::Region' => 'OS::stack_id' # @todo i see it set in source, but no function. wat
+        'AWS::Region' => 'OS::stack_id', # @todo i see it set in source, but no function. wat
       }
 
       FN_MAPPING = {
         'Fn::GetAtt' => 'get_attr',
-        'Fn::Join' => 'list_join'
+        'Fn::Join' => 'list_join',
       }
-
     end
   end
 end