cfndsl 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903e5bbbe4c6bf5e02d3b3a9d6ca8582c0e2836d136347bbe7afd6baf7b2b4d5
-  data.tar.gz: cd8e5b739f8c2ef469cfa67a17ec90ab736aab0381e69f65b2fd9d7ad1a1e460
+  metadata.gz: 4888acd0e17faf09fae382e22f218de5c1fcf3c734d2d6354df78f2980fab112
+  data.tar.gz: 90983fc52aba48a1f8ed2b171b15bdc6c87c4e8797938b821bb2f9063bbaa897
 SHA512:
-  metadata.gz: 023716cdcc14ff56fac40cfd7851ffb706969886147b42fe9ba3d1b2dee0749c1e819bb8507a4e3671549d15edb426c8022e80e00c90933cacc8ffbfc2ae8967
-  data.tar.gz: 12f33663d5de5405f109e7ad95d0b0235b35e19513af12081fb175887a5f86b0ae6652d3c3cd44415dce67a30dcebd309b41e82d091119eea1939fdaf5e496f0
+  metadata.gz: 55bef3d697fabf51322e0e460d5a1c408ad3eed169eda5bf9ef41d722391327dff41a593f92eb2d89b258cf31a31919e3e055d4a6538ba46c1fbd6251664fc61
+  data.tar.gz: 821e4142a8e694f14c69ef73efecb65d757096f2b8255fa4cf7c172dca1299e5184e00c06119e6ad94aa6d4d75aac1b274237122532d854b34c6c197d6055efa

data/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/CyclomaticComplexity:
   Max: 10
 
 Metrics/AbcSize:
-  Max: 25
+  Max: 30
 
 Metrics/BlockLength:
   Enabled: false
@@ -13,6 +13,12 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 25
 
+Metrics/PerceivedComplexity:
+  Max: 15
+
+Metrics/ClassLength:
+  Max: 105
+
 # Due to our @Properties style instance names
 Naming/VariableName:
   Enabled: false
@@ -25,6 +31,9 @@ Naming/MethodName:
 Lint/Void:
   Enabled: false
 
+Lint/MissingSuper:
+  Enabled: false
+
 Style/SafeNavigation:
   Enabled: false
 
@@ -33,7 +42,8 @@ Lint/MixedRegexpCaptureTypes:
   Enabled: false
 
 AllCops:
-  NewCops: enable
-  TargetRubyVersion: 2.4
+  NewCops: disable
+  SuggestExtensions: false
+  TargetRubyVersion: 2.7
   Exclude:
     - 'tmp/**/*'

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.6
+- 2.7
 sudo: false
 before_install:
   - gem update --system

data/CHANGELOG.md

@@ -1,8 +1,22 @@
 # Changelog
 
-## [1.2.0](https://github.com/cfndsl/cfndsl/tree/1.2.0) (2020-07-30)
+## [1.3.0](https://github.com/cfndsl/cfndsl/tree/1.3.0) (2021-01-04)
 
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.1.1...1.2.0)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.2.0...1.3.0)
+
+**Closed issues:**
+
+- Freeze specifications version [\#466](https://github.com/cfndsl/cfndsl/issues/466)
+- Outdated assertion in Readme [\#459](https://github.com/cfndsl/cfndsl/issues/459)
+- Composing and merging CfnDsl templates [\#375](https://github.com/cfndsl/cfndsl/issues/375)
+
+**Merged pull requests:**
+
+- enable resource version 22.0.0, some type processing fixes [\#467](https://github.com/cfndsl/cfndsl/pull/467) ([toshke](https://github.com/toshke))
+
+## [v1.2.0](https://github.com/cfndsl/cfndsl/tree/v1.2.0) (2020-07-29)
+
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.1.1...v1.2.0)
 
 **Implemented enhancements:**
 
@@ -27,6 +41,7 @@
 - test workaround for \#460 [\#463](https://github.com/cfndsl/cfndsl/pull/463) ([lwoggardner](https://github.com/lwoggardner))
 - Bring up to date [\#462](https://github.com/cfndsl/cfndsl/pull/462) ([lwoggardner](https://github.com/lwoggardner))
 - Update cfndsl raison d'être [\#461](https://github.com/cfndsl/cfndsl/pull/461) ([lwoggardner](https://github.com/lwoggardner))
+- Fix \#455 [\#456](https://github.com/cfndsl/cfndsl/pull/456) ([lwoggardner](https://github.com/lwoggardner))
 
 ## [v1.1.1](https://github.com/cfndsl/cfndsl/tree/v1.1.1) (2020-06-02)
 
@@ -45,10 +60,6 @@
 
 - Shorthand method of accessing resource attributes via FnSub fails reference checks [\#455](https://github.com/cfndsl/cfndsl/issues/455)
 
-**Merged pull requests:**
-
-- Fix \#455 [\#456](https://github.com/cfndsl/cfndsl/pull/456) ([lwoggardner](https://github.com/lwoggardner))
-
 ## [v1.0.6](https://github.com/cfndsl/cfndsl/tree/v1.0.6) (2020-04-23)
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.0.5...v1.0.6)
@@ -178,10 +189,8 @@
 **Merged pull requests:**
 
 - 1.0.0 pre rake and spec [\#427](https://github.com/cfndsl/cfndsl/pull/427) ([lwoggardner](https://github.com/lwoggardner))
-- 1.0.0.pre merge fix403 [\#426](https://github.com/cfndsl/cfndsl/pull/426) ([lwoggardner](https://github.com/lwoggardner))
 - 1.0.0.pre merge with master  [\#425](https://github.com/cfndsl/cfndsl/pull/425) ([lwoggardner](https://github.com/lwoggardner))
 - implement json patch for patches and pull in patches from CDK [\#386](https://github.com/cfndsl/cfndsl/pull/386) ([gergnz](https://github.com/gergnz))
-- 0.x changes to 1.0.0.pre [\#361](https://github.com/cfndsl/cfndsl/pull/361) ([gergnz](https://github.com/gergnz))
 - merge ruby version fix into 1.0.0.pre branch [\#333](https://github.com/cfndsl/cfndsl/pull/333) ([gergnz](https://github.com/gergnz))
 - remove 'disable\_binding', merge 0.x changes [\#329](https://github.com/cfndsl/cfndsl/pull/329) ([gergnz](https://github.com/gergnz))
 - Modernize cfndsl executable [\#319](https://github.com/cfndsl/cfndsl/pull/319) ([kornypoet](https://github.com/kornypoet))
@@ -206,6 +215,7 @@
 
 **Merged pull requests:**
 
+- 1.0.0.pre merge fix403 [\#426](https://github.com/cfndsl/cfndsl/pull/426) ([lwoggardner](https://github.com/lwoggardner))
 - Fix for \#418. This time with less pre 1.0.... [\#420](https://github.com/cfndsl/cfndsl/pull/420) ([cmaxwellau](https://github.com/cmaxwellau))
 
 ## [v0.17.2](https://github.com/cfndsl/cfndsl/tree/v0.17.2) (2019-09-05)
@@ -384,6 +394,7 @@
 
 - add Fn::Cidr [\#364](https://github.com/cfndsl/cfndsl/pull/364) ([gergnz](https://github.com/gergnz))
 - fixes for rubocop [\#363](https://github.com/cfndsl/cfndsl/pull/363) ([gergnz](https://github.com/gergnz))
+- 0.x changes to 1.0.0.pre [\#361](https://github.com/cfndsl/cfndsl/pull/361) ([gergnz](https://github.com/gergnz))
 
 ## [v0.16.2](https://github.com/cfndsl/cfndsl/tree/v0.16.2) (2017-12-07)
 
@@ -437,10 +448,6 @@
 - 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)
 
-**Merged pull requests:**
-
-- Fix parameter parsing when its value contains equal symbol [\#340](https://github.com/cfndsl/cfndsl/pull/340) ([ans0600](https://github.com/ans0600))
-
 ## [v0.15.2](https://github.com/cfndsl/cfndsl/tree/v0.15.2) (2017-06-20)
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.15.1...v0.15.2)
@@ -472,6 +479,7 @@
 
 **Merged pull requests:**
 
+- Fix parameter parsing when its value contains equal symbol [\#340](https://github.com/cfndsl/cfndsl/pull/340) ([ans0600](https://github.com/ans0600))
 - Clean up of README [\#330](https://github.com/cfndsl/cfndsl/pull/330) ([elmobp](https://github.com/elmobp))
 - enable deep merge as the default for yaml [\#328](https://github.com/cfndsl/cfndsl/pull/328) ([gergnz](https://github.com/gergnz))
 
@@ -515,6 +523,7 @@
 **Merged pull requests:**
 
 - Remove release\_url config from github changelog generator [\#316](https://github.com/cfndsl/cfndsl/pull/316) ([mikechau](https://github.com/mikechau))
+- IAM Managed Policy: Add support for ManagedPolicyName property [\#310](https://github.com/cfndsl/cfndsl/pull/310) ([mikechau](https://github.com/mikechau))
 - WIP: Aws schema [\#278](https://github.com/cfndsl/cfndsl/pull/278) ([kornypoet](https://github.com/kornypoet))
 
 ## [v0.12.11](https://github.com/cfndsl/cfndsl/tree/v0.12.11) (2017-05-10)
@@ -548,7 +557,6 @@
 **Merged pull requests:**
 
 - CloudFormation::Stack: Add Tags property [\#311](https://github.com/cfndsl/cfndsl/pull/311) ([mikechau](https://github.com/mikechau))
-- IAM Managed Policy: Add support for ManagedPolicyName property [\#310](https://github.com/cfndsl/cfndsl/pull/310) ([mikechau](https://github.com/mikechau))
 
 ## [v0.12.7](https://github.com/cfndsl/cfndsl/tree/v0.12.7) (2017-04-23)
 
@@ -978,6 +986,10 @@
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.8.0...v0.8.1)
 
+**Implemented enhancements:**
+
+- Use as\_json instead of to\_json [\#157](https://github.com/cfndsl/cfndsl/pull/157) ([johnf](https://github.com/johnf))
+
 **Merged pull requests:**
 
 - Add in Route53 Health Check Tags as a type [\#185](https://github.com/cfndsl/cfndsl/pull/185) ([gergnz](https://github.com/gergnz))

data/README.md

@@ -22,7 +22,7 @@ The cnfdsl gem provides a DSL that allows you to write templates using friendly
 
 ## Getting Started
 
-ruby version > 2.4 is required to run cfndsl, you should look at using rbenv example for installing with rbenv
+ruby version > 2.7 is required to run cfndsl, you should look at using rbenv example for installing with rbenv
 
     rbenv exec gem install cfndsl
 

data/cfndsl.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.test_files            = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths         = ['lib']
   s.bindir                = 'exe'
-  s.required_ruby_version = '~> 2.4'
+  s.required_ruby_version = '~> 2.7'
 
   s.executables << 'cfndsl'
 
-  s.add_development_dependency 'bundler', '~> 2.1'
+  s.add_development_dependency 'bundler', '~> 2.2'
   s.add_runtime_dependency 'hana', '~> 1.3'
 end

data/lib/cfndsl/aws/patches/900_SageMakerTags_patch.json

@@ -0,0 +1,41 @@
+{
+  "broken": "22.0.0",
+  "ResourceTypes": {
+    "AWS::SageMaker::Device": {
+      "patch": {
+        "operations": [
+          {
+            "op": "replace",
+            "path": "/Properties/Tags",
+            "value": {
+              "Type": "List",
+              "ItemType": "Tag",
+              "Required": false,
+              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-tags",
+              "UpdateType": "Mutable"
+            }
+          }
+        ],
+        "description": "Fix SageMaker Device to be List of Tag"
+      }
+    },
+    "AWS::SageMaker::DeviceFleet": {
+      "patch": {
+        "operations": [
+          {
+            "op": "replace",
+            "path": "/Properties/Tags",
+            "value": {
+              "Type": "List",
+              "ItemType": "Tag",
+              "Required": false,
+              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-tags",
+              "UpdateType": "Mutable"
+            }
+          }
+        ],
+        "description": "Fix SageMaker Device to be List of Tag"
+      }
+    }
+  }
+}

data/lib/cfndsl/globals.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'version'
+require 'fileutils'
 
 # Global variables to adjust CfnDsl behavior
 module CfnDsl

data/lib/cfndsl/jsonable.rb

@@ -136,12 +136,13 @@ module CfnDsl
       check_names
       hash = {}
       instance_variables.each do |var|
-        name = var[1..-1]
+        name = var[1..]
 
-        if name =~ /^__/
+        case name
+        when /^__/
           # if a variable starts with double underscore, strip one off
-          name = name[1..-1]
-        elsif name =~ /^_/
+          name = name[1..]
+        when /^_/
           # Hide variables that start with single underscore
           name = nil
         end

data/lib/cfndsl/orchestration_template.rb

@@ -83,7 +83,6 @@ module CfnDsl
         resource_name
       end
 
-      # rubocop:disable Metrics/PerceivedComplexity
       def create_array_property_def(resource, pname, pclass, info)
         singular_name = CfnDsl::Plurals.singularize pname
         plural_name = singular_name == pname ? CfnDsl::Plurals.pluralize(pname) : pname
@@ -111,7 +110,6 @@ module CfnDsl
         # Singular form understands concatenation and Fn::If property
         create_singular_property_def(resource, pname, pclass, singular_name) if singular_name
       end
-      # rubocop:enable Metrics/PerceivedComplexity
 
       def create_resource_accessor(accessor, resource, type)
         class_eval do
@@ -245,7 +243,7 @@ module CfnDsl
       end
     end
 
-    # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity
     def _check_refs(container_name, method, source_containers)
       container = instance_variable_get("@#{container_name}s")
       return [] unless container
@@ -279,7 +277,7 @@ module CfnDsl
 
       invalids
     end
-    # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def validate
       errors = check_refs || []

data/lib/cfndsl/plurals.rb

@@ -20,7 +20,7 @@ module CfnDsl
     @singles = @plurals.invert
 
     def pluralize(name)
-      @plurals.fetch(name.to_s) { |key| key + 's' }
+      @plurals.fetch(name.to_s) { |key| "#{key}s" }
     end
 
     def singularize(name)
@@ -29,7 +29,7 @@ module CfnDsl
         when /List$/
           key[0..-5]
         when /ies$/
-          key[0..-4] + 'y'
+          "#{key[0..-4]}y"
         when /s$/
           key[0..-2]
         else

data/lib/cfndsl/rake_task.rb

@@ -79,7 +79,7 @@ module CfnDsl
     #    then any existing file is considered sufficient, and 'latest' is the version used for downloading
     #
     # @todo Add capability to provide a user spec/patches dir
-    def specification(name: nil, file:, version: nil)
+    def specification(file:, name: nil, version: nil)
       if name
         desc 'Update Resource Specification' unless ::Rake.application.last_description
         task name, [:cfn_spec_version] => file
@@ -218,7 +218,7 @@ module CfnDsl
     end
 
     def verbose
-      (Rake.verbose? || cfndsl_opts&.fetch(:verbose, false)) && STDERR
+      (Rake.verbose? || cfndsl_opts&.fetch(:verbose, false)) && $stderr
     end
 
     def generate(opts)
@@ -238,8 +238,8 @@ module CfnDsl
       verbose&.puts("Writing to #{type}")
     end
 
-    def outputter(opts)
-      opts[:output].nil? ? yield(STDOUT) : file_output(opts[:output]) { |f| yield f }
+    def outputter(opts, &block)
+      opts[:output].nil? ? yield($stdout) : file_output(opts[:output], &block)
     end
 
     def model(filename)
@@ -253,8 +253,8 @@ module CfnDsl
       cfndsl_opts.fetch(:extras, [])
     end
 
-    def file_output(path)
-      File.open(File.expand_path(path), 'w') { |f| yield f }
+    def file_output(path, &block)
+      File.open(File.expand_path(path), 'w', &block)
     end
   end
   # rubocop:enable Metrics/ClassLength

data/lib/cfndsl/ref_check.rb

@@ -10,7 +10,7 @@ module RefCheck
   end
 
   # Build up a set of references.
-  # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/CyclomaticComplexity
   def build_references(refs = [], origin = nil, method = :all_refs)
     if respond_to?(method)
       send(method).each do |ref|
@@ -30,7 +30,7 @@ module RefCheck
 
     refs
   end
-  # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def ref_children
     []

data/lib/cfndsl/runner.rb

@@ -117,14 +117,14 @@ module CfnDsl
       end
 
       filename = File.expand_path(ARGV[0])
-      verbose = options[:verbose] && STDERR
+      verbose = options[:verbose] && $stderr
 
       verbose.puts "Using specification file #{CfnDsl.specification_file}" if verbose
 
       require_relative 'cloudformation'
       model = CfnDsl.eval_file_with_extras(filename, options[:extras], verbose)
 
-      output = STDOUT
+      output = $stdout
       if options[:output] != '-'
         verbose.puts("Writing to #{options[:output]}") if verbose
         output = File.open(File.expand_path(options[:output]), 'w')

data/lib/cfndsl/specification.rb

@@ -70,20 +70,18 @@ module CfnDsl
         next unless %w[ResourceTypes PropertyTypes].include?(top_level_type)
 
         patches.each_pair do |property_type_name, patch_details|
-          begin
-            applies_to = spec[top_level_type]
-            unless property_type_name == 'patch'
-              # Patch applies within a specific property type
-              applies_to = applies_to[property_type_name]
-              patch_details = patch_details['patch']
-            end
-
-            Hana::Patch.new(patch_details['operations']).apply(applies_to) if patch_required?(patch_details)
-          rescue Hana::Patch::MissingTargetException => e
-            raise "Failed specification patch #{top_level_type} #{property_type_name} from #{from_file}" if fail_patches
-
-            warn "Ignoring failed specification patch #{top_level_type} #{property_type_name} from #{from_file} - #{e.class.name}:#{e.message}"
+          applies_to = spec[top_level_type]
+          unless property_type_name == 'patch'
+            # Patch applies within a specific property type
+            applies_to = applies_to[property_type_name]
+            patch_details = patch_details['patch']
           end
+
+          Hana::Patch.new(patch_details['operations']).apply(applies_to) if patch_required?(patch_details)
+        rescue Hana::Patch::MissingTargetException => e
+          raise "Failed specification patch #{top_level_type} #{property_type_name} from #{from_file}" if fail_patches
+
+          warn "Ignoring failed specification patch #{top_level_type} #{property_type_name} from #{from_file} - #{e.class.name}:#{e.message}"
         end
       end
     end

data/lib/cfndsl/types.rb

@@ -16,7 +16,7 @@ module CfnDsl
       { 'Resources' => resources, 'Types' => types, 'Version' => spec.version, 'File' => spec.file }
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
     def self.extract_resources(spec)
       spec.each_with_object({}) do |(resource_name, resource_info), resources|
         properties = resource_info['Properties'].each_with_object({}) do |(property_name, property_info), extracted|
@@ -43,7 +43,8 @@ module CfnDsl
             # resource name for uniqueness and connection
             property_type = resource_name.split('::').join + property_info['Type']
           else
-            warn "could not extract resource type from #{resource_name}"
+            warn "could not extract resource type for property #{property_name} from #{resource_name}, assuming Json"
+            property_type = 'Json'
           end
           extracted[property_name] = property_type
           extracted
@@ -52,7 +53,7 @@ module CfnDsl
         resources
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength
     def self.extract_types(spec)
@@ -99,6 +100,8 @@ module CfnDsl
               nested_prop_type =
                 if nested_prop_info['ItemType'] == 'Tag'
                   ['Tag']
+                elsif (nested_prop_info['ItemType'] == 'Json') && (nested_prop_info['Type'] == 'List')
+                  ['Json']
                 else
                   Array(root_resource_name + nested_prop_info['ItemType'])
                 end
@@ -106,7 +109,8 @@ module CfnDsl
             elsif nested_prop_info['Type']
               nested_prop_type = root_resource_name + nested_prop_info['Type']
             else
-              warn "could not extract property type from #{property_name}"
+              warn "could not extract property type for #{nested_prop_name} from #{property_name}, assuming Json"
+              nested_prop_type = 'Json'
               p nested_prop_info
             end
             extracted[nested_prop_name] = nested_prop_type

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/deep_merge/core.rb

@@ -120,16 +120,16 @@ module DeepMerge
           puts "#{di} looping: #{src_key.inspect} => #{src_value.inspect} :: #{dest.inspect}" if merge_debug
           if dest[src_key]
             puts "#{di} ==>merging: #{src_key.inspect} => #{src_value.inspect} :: #{dest[src_key].inspect}" if merge_debug
-            dest[src_key] = deep_merge!(src_value, dest[src_key], options.merge(debug_indent: di + '  '))
+            dest[src_key] = deep_merge!(src_value, dest[src_key], options.merge(debug_indent: "#{di}  "))
           else # dest[src_key] doesn't exist so we want to create and overwrite it (but we do this via deep_merge!)
             puts "#{di} ==>merging over: #{src_key.inspect} => #{src_value.inspect}" if merge_debug
-            # note: we rescue here b/c some classes respond to "dup" but don't implement it (Numeric, TrueClass, FalseClass, NilClass among maybe others)
+            # NOTE: we rescue here b/c some classes respond to "dup" but don't implement it (Numeric, TrueClass, FalseClass, NilClass among maybe others)
             begin
               src_dup = src_value.dup # we dup src_value if possible because we're going to merge into it (since dest is empty)
             rescue TypeError
               src_dup = src_value
             end
-            dest[src_key] = deep_merge!(src_value, src_dup, options.merge(debug_indent: di + '  '))
+            dest[src_key] = deep_merge!(src_value, src_dup, options.merge(debug_indent: "#{di}  "))
           end
         elsif dest.is_a?(Array) && extend_existing_arrays
           dest.push(source)
@@ -181,12 +181,12 @@ module DeepMerge
             list = []
             dest.each_index do |i|
               list[i] = deep_merge!(source[i] || {}, dest[i],
-                                    options.merge(debug_indent: di + '  '))
+                                    options.merge(debug_indent: "#{di}  "))
             end
-            list += source[dest.count..-1] if source.count > dest.count
+            list += source[dest.count..] if source.count > dest.count
             dest = list
           elsif keep_array_duplicates
-            dest = dest.concat(source)
+            dest.concat(source)
           else
             dest |= source
           end

data/sample/vpc_example.rb

@@ -23,8 +23,8 @@ CloudFormation do
 
   10.times do |i|
     subnet = "subnet#{i}"
-    route_table = subnet + 'RouteTable'
-    route_table_assoc = route_table + 'Assoc'
+    route_table = "#{subnet}RouteTable"
+    route_table_assoc = "#{route_table}Assoc"
 
     Subnet(subnet) do
       VpcId Ref(:VPC)
@@ -42,7 +42,7 @@ CloudFormation do
       RouteTableId Ref(route_table)
     end
 
-    EC2_Route(subnet + 'GatewayRoute') do
+    EC2_Route("#{subnet}GatewayRoute") do
       DependsOn :GatewayToInternet
       RouteTableId Ref(route_table)
       DestinationCidrBlock '0.0.0.0/0'

data/sample/vpc_with_vpn_example.rb

@@ -41,8 +41,8 @@ CloudFormation do
 
   10.times do |i|
     subnet = "subnet#{i}"
-    route_table = subnet + 'RouteTable'
-    route_table_assoc = route_table + 'Assoc'
+    route_table = "#{subnet}RouteTable"
+    route_table_assoc = "#{route_table}Assoc"
 
     Subnet(subnet) do
       VpcId Ref(:VPC)
@@ -60,7 +60,7 @@ CloudFormation do
       RouteTableId Ref(route_table)
     end
 
-    EC2_Route(subnet + 'GatewayRoute') do
+    EC2_Route("#{subnet}GatewayRoute") do
       DependsOn :GatewayToInternet
       RouteTableId Ref(route_table)
       DestinationCidrBlock '0.0.0.0/0'

data/spec/cli_spec.rb

@@ -36,7 +36,9 @@ describe 'cfndsl', type: :aruba do
   before(:each) { write_file('template.rb', template_content) }
 
   # The known working version is the embedded version
+  # rubocop:disable Lint/ConstantDefinitionInBlock
   WORKING_SPEC_VERSION = JSON.parse(File.read(CfnDsl::LOCAL_SPEC_FILE))['ResourceSpecificationVersion']
+  # rubocop:enable Lint/ConstantDefinitionInBlock
 
   context "cfndsl -u #{WORKING_SPEC_VERSION}" do
     it 'updates the specification file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,7 @@ files:
 - lib/cfndsl/aws/patches/600_RefKinds_patch.json
 - lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
 - lib/cfndsl/aws/patches/800_List_types_patch.json
+- lib/cfndsl/aws/patches/900_SageMakerTags_patch.json
 - lib/cfndsl/aws/resource_specification.json
 - lib/cfndsl/aws/types.rb
 - lib/cfndsl/aws/types.yaml
@@ -185,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="