cfndsl 0.16.6 → 0.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32406255a9011d3aed5a47d015a3b55e3d7f2f500cff17847aba34e29f02e03f
-  data.tar.gz: f340711869f18db7f011c2a9e4dadf928ca32efa12ab977590d54f72d0db37a3
+  metadata.gz: d5288f90b75b1ba02860fc1b9a7a6feea6a90d1d18476dc4f9f6779ffea073d1
+  data.tar.gz: f4b821f8261b474bd85bbf9d248b83a4971e017932df31f54e0d99fbcea105c8
 SHA512:
-  metadata.gz: 7186f763335491c5777d1194cddce0b96687cfd335cc6d50dcff13ee7491ee25b37713f968d8579c980688bbfa399d3c5b8cd783bef2164416c15214a0ccd029
-  data.tar.gz: 8793e4e15dfad5a6d03ffaf7c43742ee9aedd24d649780366f197a5e9fa7c2f5b81a06cd30122155f8034b0d8011e1e8f7e96ef34d0e1e945945befa999228f1
+  metadata.gz: 9dce8cb78e563d0d8a514c7c4a5c9034c2b94f05a7abc0cdef51b83ab6dba0b5edfbf0af791d51283af69ab4820abb4f57c048f5ca2d1955edc0f8ea41b6c5b1
+  data.tar.gz: 1ca869af3522ddc2b719b1d6620bed102bfd691de702271bff9c3cb633dd353070f0e3929cd1249f02cc832ad03f2c2aaaab957b53ebb760475f5ecd41afcbfd

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.16.6](https://github.com/cfndsl/cfndsl/tree/0.16.6) (2018-05-31)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.5...0.16.6)
+## [0.16.7](https://github.com/cfndsl/cfndsl/tree/0.16.7) (2018-11-12)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.6...0.16.7)
+
+**Closed issues:**
+
+- Cloudformation Specification version 2.12.0 has missing types [\#377](https://github.com/cfndsl/cfndsl/issues/377)
+- Value of property CreditSpecification must be an object [\#376](https://github.com/cfndsl/cfndsl/issues/376)
+
+**Merged pull requests:**
+
+- add missing types fixes \#377 [\#378](https://github.com/cfndsl/cfndsl/pull/378) ([gergnz](https://github.com/gergnz))
+
+## [v0.16.6](https://github.com/cfndsl/cfndsl/tree/v0.16.6) (2018-05-30)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.5...v0.16.6)
 
 **Fixed bugs:**
 
@@ -49,10 +61,6 @@
 ## [v0.16.1](https://github.com/cfndsl/cfndsl/tree/v0.16.1) (2017-12-02)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.0...v0.16.1)
 
-**Closed issues:**
-
-- Metadata / AWS::CloudFormation::Interface support? [\#357](https://github.com/cfndsl/cfndsl/issues/357)
-
 **Merged pull requests:**
 
 - 352 update contacts repos [\#355](https://github.com/cfndsl/cfndsl/pull/355) ([gergnz](https://github.com/gergnz))
@@ -83,7 +91,6 @@
 **Closed issues:**
 
 - backtrace shown when incorrect resource name is passed to -g [\#338](https://github.com/cfndsl/cfndsl/issues/338)
-- Condition and ALB ListenerRule Conditions get merged [\#337](https://github.com/cfndsl/cfndsl/issues/337)
 - Request to include support for AWS::Logs::SubscriptionFilter [\#335](https://github.com/cfndsl/cfndsl/issues/335)
 - Support for Lambda backed custom resources with shorthand [\#315](https://github.com/cfndsl/cfndsl/issues/315)
 - Merging cfnlego, cfn2dsl into cfndsl [\#272](https://github.com/cfndsl/cfndsl/issues/272)

data/bin/cfndsl

@@ -39,6 +39,7 @@ optparse = OptionParser.new do |opts|
 
   opts.on('-f', '--format FORMAT', 'Specify the output format (JSON default)') do |format|
     raise "Format #{format} not supported" unless %w[json yaml].include?(format)
+
     options[:outformat] = format
   end
 

data/cfndsl.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license               = 'MIT'
   s.test_files            = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths         = ['lib']
-  s.required_ruby_version = '~> 2.1'
+  s.required_ruby_version = '~> 2.2'
 
   s.executables << 'cfndsl'
 

data/lib/cfndsl/jsonable.rb

@@ -44,6 +44,7 @@ module CfnDsl
     # Equivalent to the CloudFormation template built in function Fn::And
     def FnAnd(array)
       raise 'The array passed to Fn::And must have at least 2 elements and no more than 10' if !array || array.count < 2 || array.count > 10
+
       Fn.new('And', array)
     end
 
@@ -69,6 +70,7 @@ module CfnDsl
     # Equivalent to the CloudFormation template built in function Fn::Or
     def FnOr(array)
       raise 'The array passed to Fn::Or must have at least 2 elements and no more than 10' if !array || array.count < 2 || array.count > 10
+
       Fn.new('Or', array)
     end
 
@@ -80,8 +82,10 @@ module CfnDsl
     # Equivalent to the CloudFormation template built in function Fn::Sub
     def FnSub(string, substitutions = nil)
       raise ArgumentError, 'The first argument passed to Fn::Sub must be a string' unless string.is_a? String
+
       if substitutions
         raise ArgumentError, 'The second argument passed to Fn::Sub must be a Hash' unless substitutions.is_a? Hash
+
         Fn.new('Sub', [string, substitutions])
       else
         Fn.new('Sub', string)

data/lib/cfndsl/orchestration_template.rb

@@ -29,6 +29,7 @@ module CfnDsl
           parts = resource.split('::')
           until parts.empty?
             break if CfnDsl.reserved_items.include? parts.first
+
             abreve_name = parts.join('_')
             if accessors.key? abreve_name
               accessors.delete abreve_name # Delete potentially ambiguous names
@@ -78,6 +79,7 @@ module CfnDsl
         sname = CfnDsl::Plurals.singularize pname
 
         return if sname == pname
+
         resource.class_eval do
           CfnDsl.method_names(sname) do |method|
             define_method(method) do |value = nil, &block|

data/lib/cfndsl/patches.rb

@@ -8,56 +8,56 @@ module CfnDsl
       {
         'AWS::Serverless::Function' => {
           'Properties' => {
-            'Handler'                      => { 'PrimitiveType' => 'String' },
-            'Runtime'                      => { 'PrimitiveType' => 'String' },
-            'CodeUri'                      => { 'PrimitiveType' => 'String' },
-            'FunctionName'                 => { 'PrimitiveType' => 'String' },
-            'Description'                  => { 'PrimitiveType' => 'String' },
-            'MemorySize'                   => { 'PrimitiveType' => 'Integer' },
-            'Timeout'                      => { 'PrimitiveType' => 'Integer' },
-            'Role'                         => { 'PrimitiveType' => 'String' },
-            'Policies'                     => { 'Type' => 'List', 'ItemType' => 'Policy' },
-            'Environment'                  => { 'PrimitiveType' => 'Json' },
-            'VpcConfig'                    => { 'Type' => 'VpcConfig' },
-            'Events'                       => { 'PrimitiveType' => 'Json' },
-            'Tags'                         => { 'PrimitiveType' => 'Json' },
-            'Tracing'                      => { 'PrimitiveType' => 'String' },
-            'KmsKeyArn'                    => { 'PrimitiveType' => 'String' },
-            'DeadLetterQueue'              => { 'PrimitiveType' => 'Json' },
-            'DeploymentPreference'         => { 'Type' => 'DeploymentPreference' },
-            'AutoPublishAlias'             => { 'PrimitiveType' => 'String' },
+            'Handler' => { 'PrimitiveType' => 'String' },
+            'Runtime' => { 'PrimitiveType' => 'String' },
+            'CodeUri' => { 'PrimitiveType' => 'String' },
+            'FunctionName' => { 'PrimitiveType' => 'String' },
+            'Description' => { 'PrimitiveType' => 'String' },
+            'MemorySize' => { 'PrimitiveType' => 'Integer' },
+            'Timeout' => { 'PrimitiveType' => 'Integer' },
+            'Role' => { 'PrimitiveType' => 'String' },
+            'Policies' => { 'Type' => 'List', 'ItemType' => 'Policy' },
+            'Environment' => { 'PrimitiveType' => 'Json' },
+            'VpcConfig' => { 'Type' => 'VpcConfig' },
+            'Events' => { 'PrimitiveType' => 'Json' },
+            'Tags' => { 'PrimitiveType' => 'Json' },
+            'Tracing' => { 'PrimitiveType' => 'String' },
+            'KmsKeyArn' => { 'PrimitiveType' => 'String' },
+            'DeadLetterQueue' => { 'PrimitiveType' => 'Json' },
+            'DeploymentPreference' => { 'Type' => 'DeploymentPreference' },
+            'AutoPublishAlias' => { 'PrimitiveType' => 'String' },
             'ReservedConcurrentExecutions' => { 'PrimitiveType' => 'Integer' }
           }
         },
         'AWS::Serverless::Api' => {
           'Properties' => {
-            'Name'                  => { 'PrimitiveType' => 'String' },
-            'StageName'             => { 'PrimitiveType' => 'String' },
-            'DefinitionUri'         => { 'PrimitiveType' => 'String' },
-            'DefinitionBody'        => { 'PrimitiveType' => 'Json' },
-            'CacheClusterEnabled'   => { 'PrimitiveType' => 'Boolean' },
-            'CacheClusterSize'      => { 'PrimitiveType' => 'String' },
-            'Variables'             => { 'PrimitiveType' => 'Json' },
-            'MethodSettings'        => { 'PrimitiveType' => 'Json' },
+            'Name' => { 'PrimitiveType' => 'String' },
+            'StageName' => { 'PrimitiveType' => 'String' },
+            'DefinitionUri' => { 'PrimitiveType' => 'String' },
+            'DefinitionBody' => { 'PrimitiveType' => 'Json' },
+            'CacheClusterEnabled' => { 'PrimitiveType' => 'Boolean' },
+            'CacheClusterSize' => { 'PrimitiveType' => 'String' },
+            'Variables' => { 'PrimitiveType' => 'Json' },
+            'MethodSettings' => { 'PrimitiveType' => 'Json' },
             'EndpointConfiguration' => { 'PrimitiveType' => 'String' },
-            'BinaryMediaTypes'      => { 'Type' => 'List', 'PrimitiveType' => 'String' },
-            'Cors'                  => { 'PrimitiveType' => 'String' }
+            'BinaryMediaTypes' => { 'Type' => 'List', 'PrimitiveType' => 'String' },
+            'Cors' => { 'PrimitiveType' => 'String' }
           }
         },
         'AWS::Serverless::SimpleTable' => {
           'Properties' => {
             'PrimaryKey' => { 'Type' => 'PrimaryKey' },
             'ProvisionedThroughput' => { 'Type' => 'ProvisionedThroughput' },
-            'Tags'                  => { 'PrimitiveType' => 'Json' },
-            'TableName'             => { 'PrimitiveType' => 'String' }
+            'Tags' => { 'PrimitiveType' => 'Json' },
+            'TableName' => { 'PrimitiveType' => 'String' }
           }
         },
         'AWS::SSM::Parameter' => {
           'Properties' => {
-            'Name'        => { 'PrimitiveType' => 'String' },
+            'Name' => { 'PrimitiveType' => 'String' },
             'Description' => { 'PrimitiveType' => 'String' },
-            'Type'        => { 'PrimitiveType' => 'String' },
-            'Value'       => { 'PrimitiveType' => 'String' }
+            'Type' => { 'PrimitiveType' => 'String' },
+            'Value' => { 'PrimitiveType' => 'String' }
           }
         }
       }
@@ -71,7 +71,19 @@ module CfnDsl
         'AWS::EC2::LaunchTemplate.Tag' => {
           'Properties' => {
             'Value' => { 'PrimitiveType' => 'String' },
-            'Key'   => { 'PrimitiveType' => 'String' }
+            'Key' => { 'PrimitiveType' => 'String' }
+          }
+        },
+        'AWS::EC2::SpotFleet.Tag' => {
+          'Properties' => {
+            'Value' => { 'PrimitiveType' => 'String' },
+            'Key' => { 'PrimitiveType' => 'String' }
+          }
+        },
+        'AWS::DLM::LifecyclePolicy.Tag' => {
+          'Properties' => {
+            'Value' => { 'PrimitiveType' => 'String' },
+            'Key' => { 'PrimitiveType' => 'String' }
           }
         },
         'AWS::Serverless::SimpleTable.PrimaryKey' => {
@@ -82,14 +94,14 @@ module CfnDsl
         },
         'AWS::Serverless::SimpleTable.ProvisionedThroughput' => {
           'Properties' => {
-            'ReadCapacityUnits'  => { 'PrimitiveType' => 'Integer' },
+            'ReadCapacityUnits' => { 'PrimitiveType' => 'Integer' },
             'WriteCapacityUnits' => { 'PrimitiveType' => 'Integer' }
           }
         },
         'AWS::Serverless::Function.Policy' => {
           'Properties' => {
             'PolicyDocument' => { 'PrimitiveType' => 'Json' },
-            'PolicyName'     => { 'PrimitiveType' => 'String' }
+            'PolicyName' => { 'PrimitiveType' => 'String' }
           }
         },
         'AWS::Serverless::Function.VpcConfig' => {
@@ -101,9 +113,9 @@ module CfnDsl
         'AWS::Serverless::Function.DeploymentPreference' => {
           'Properties' => {
             'Enabled' => { 'PrimitiveType' => 'Boolean' },
-            'Type'    => { 'PrimitiveType' => 'String' },
-            'Alarms'  => { 'Type' => 'List', 'PrimitiveType' => 'String' },
-            'Hooks'   => { 'Type' => 'List', 'PrimitiveType' => 'String' }
+            'Type' => { 'PrimitiveType' => 'String' },
+            'Alarms' => { 'Type' => 'List', 'PrimitiveType' => 'String' },
+            'Hooks' => { 'Type' => 'List', 'PrimitiveType' => 'String' }
           }
         }
       }

data/lib/cfndsl/plurals.rb

@@ -5,15 +5,15 @@ module CfnDsl
 
     @plurals = {
       'AssumeRolePolicyDocument' => 'AssumeRolePolicyDocument',
-      'CreationPolicy'           => 'CreationPolicy',
-      'DBSecurityGroupIngress'   => 'DBSecurityGroupIngress',
-      'Metadata'                 => 'Metadata',
-      'Policy'                   => 'Policies',
-      'PolicyDocument'           => 'PolicyDocument',
-      'Property'                 => 'Properties',
-      'SecurityGroupEgress'      => 'SecurityGroupEgress',
-      'SecurityGroupIngress'     => 'SecurityGroupIngress',
-      'UpdatePolicy'             => 'UpdatePolicy'
+      'CreationPolicy' => 'CreationPolicy',
+      'DBSecurityGroupIngress' => 'DBSecurityGroupIngress',
+      'Metadata' => 'Metadata',
+      'Policy' => 'Policies',
+      'PolicyDocument' => 'PolicyDocument',
+      'Property' => 'Properties',
+      'SecurityGroupEgress' => 'SecurityGroupEgress',
+      'SecurityGroupIngress' => 'SecurityGroupIngress',
+      'UpdatePolicy' => 'UpdatePolicy'
     }
     @singles = @plurals.invert
 

data/lib/cfndsl/rake_task.rb

@@ -44,6 +44,7 @@ module CfnDsl
 
     def model(filename)
       raise "#{filename} doesn't exist" unless File.exist?(filename)
+
       verbose.puts("using extras #{extra}") if verbose
       CfnDsl.eval_file_with_extras(filename, extra, verbose)
     end

data/lib/cfndsl/specification.rb

@@ -41,14 +41,14 @@ module CfnDsl
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
     def self.extract_types(spec)
       primitive_types = {
-        'String'    => 'String',
-        'Boolean'   => 'Boolean',
-        'Json'      => 'Json',
-        'Integer'   => 'Integer',
-        'Number'    => 'Number',
-        'Double'    => 'Double',
+        'String' => 'String',
+        'Boolean' => 'Boolean',
+        'Json' => 'Json',
+        'Integer' => 'Integer',
+        'Number' => 'Number',
+        'Double' => 'Double',
         'Timestamp' => 'Timestamp',
-        'Long'      => 'Long'
+        'Long' => 'Long'
       }
       spec.each_with_object(primitive_types) do |(property_name, property_info), types|
         # In order to name things uniquely and allow for connections
@@ -58,6 +58,7 @@ module CfnDsl
         root_resource_name = root_resource ? root_resource[1].gsub(/::/, '') : property_name
         property_name = property_name.gsub(/::|\./, '')
         next unless property_info['Properties']
+
         properties = property_info['Properties'].each_with_object({}) do |(nested_prop_name, nested_prop_info), extracted|
           if nested_prop_info['Type'] == 'Map' || nested_prop_info['Type'] == 'Json'
             # The Map type and the incorrectly labelled Json type
@@ -84,6 +85,7 @@ module CfnDsl
 
     def self.determine_spec_file
       return CfnDsl.specification_file if File.exist? CfnDsl.specification_file
+
       File.expand_path('aws/resource_specification.json', __dir__)
     end
 

data/lib/cfndsl/types.rb

@@ -58,6 +58,7 @@ module CfnDsl
       classes.each_pair do |typename, type|
         typeval = types_list['Types'][typename]
         next unless typeval.respond_to?(:each_pair)
+
         typeval.each_pair do |attr_name, attr_type|
           if attr_type.is_a?(Array)
             klass = type_def.const_get(attr_type[0])

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.16.6'.freeze
+  VERSION = '0.16.7'.freeze
 end

data/lib/deep_merge/core.rb

@@ -85,6 +85,7 @@ module DeepMerge
     knockout_prefix = options[:knockout_prefix] || nil
     raise InvalidParameter, 'knockout_prefix cannot be an empty string in deep_merge!' if knockout_prefix == ''
     raise InvalidParameter, 'overwrite_unmergeable must be true if knockout_prefix is specified in deep_merge!' if knockout_prefix && !overwrite_unmergeable
+
     # if present: we will split and join arrays on this char before merging
     array_split_char = options[:unpack_arrays] || false
     # request that we avoid merging arrays
@@ -103,6 +104,7 @@ module DeepMerge
     di = options[:debug_indent] || ''
     # do nothing if source is nil
     return dest if !merge_nil_values && source.nil?
+
     # if dest doesn't exist, then simply copy source to it
     if !dest && overwrite_unmergeable
       dest = source; return dest

data/sample/autoscale.rb

@@ -1,4 +1,3 @@
-
 # We start things off by calling the CloudFormation function.
 CloudFormation do
   # Declare the template format version

data/sample/autoscale2.rb

@@ -89,8 +89,8 @@ a stack from this template.
   AutoScalingGroup('WebServerGroup') do
     UpdatePolicy('AutoScalingRollingUpdate',
                  'MinInstancesInService' => '1',
-                 'MaxBatchSize'          => '1',
-                 'PauseTime'             => 'PT15M')
+                 'MaxBatchSize' => '1',
+                 'PauseTime' => 'PT15M')
     AvailabilityZones FnGetAZs('')
     LaunchConfigurationName Ref('LaunchConfig')
     MinSize 1

data/sample/export.rb

@@ -3,10 +3,10 @@ CloudFormation do
     GroupDescription 'Allow incoming HTTP traffic from anywhere'
     SecurityGroupIngress [
       {
-        'CidrIp'     => '0.0.0.0/0',
+        'CidrIp' => '0.0.0.0/0',
         'IpProtocol' => 'tcp',
-        'FromPort'   => 80,
-        'ToPort'     => 80
+        'FromPort' => 80,
+        'ToPort' => 80
       }
     ]
   end

data/sample/import.rb

@@ -5,8 +5,8 @@ CloudFormation do
       {
         'SourceSecurityGroupId' => FnImportValue(:webSecurityGroupId),
         'IpProtocol' => 'tcp',
-        'FromPort'   => 7777,
-        'ToPort'     => 7777
+        'FromPort' => 7777,
+        'ToPort' => 7777
       }
     ]
   end

data/spec/fixtures/test.rb

@@ -73,8 +73,8 @@ CloudFormation do
   AutoScalingGroup('ASG') do
     UpdatePolicy('AutoScalingRollingUpdate',
                  'MinInstancesInService' => '1',
-                 'MaxBatchSize'          => '1',
-                 'PauseTime'             => 'PT15M')
+                 'MaxBatchSize' => '1',
+                 'PauseTime' => 'PT15M')
     AvailabilityZones FnGetAZs('')
     LaunchConfigurationName Ref('LaunchConfig')
     MinSize 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.16.7
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL