cfndsl 1.2.0 → 1.3.3

data/sample/config_service.rb

@@ -9,7 +9,7 @@ CloudFormation do
     QueueName 'ConfigServiceQueue'
   end
 
-  Bucket('ConfigServiceBucket') do
+  S3_Bucket('ConfigServiceBucket') do
   end
 
   IAM_Policy('ConfigServiceS3BucketAccessPolicy') do

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.3
 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-07-14 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
@@ -83,7 +83,7 @@ files:
 - lib/cfndsl/aws/patches/520_ServiceDiscovery_InstanceAttributes_patch.json
 - 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
@@ -183,9 +183,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/cfndsl/aws/patches/800_List_types_patch.json

@@ -1,115 +0,0 @@
-{
-  "broken" : "6.3.0",
-  "ResourceTypes": {
-    "AWS::AppSync::GraphQLApi": {
-      "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-appsync-graphqlapi.html#cfn-appsync-graphqlapi-tags",
-              "UpdateType": "Mutable"
-            }
-          },
-          {
-            "op": "replace",
-            "path": "/Properties/AdditionalAuthenticationProviders",
-            "value": {
-              "Type": "List",
-              "Required": false,
-              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationproviders.html",
-              "ItemType": "AdditionalAuthenticationProvider",
-              "UpdateType": "Mutable"
-            }
-          }
-        ],
-        "description": "Fix GraphQLApi to be List of Tag"
-      }
-    },
-    "AWS::LakeFormation::DataLakeSettings": {
-      "patch": {
-        "operations": [
-          {
-            "op": "replace",
-            "path": "/Properties/Admins",
-            "value": {
-              "Type": "List",
-              "Required": false,
-              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-admins.html",
-              "ItemType": "DataLakePrincipal",
-              "UpdateType": "Mutable"
-            }
-          }
-        ],
-        "description": "Fix GraphQLApi to be List of Tag"
-      }
-    }
-  },
-  "PropertyTypes": {
-    "AWS::CodeBuild::Project.ProjectTriggers": {
-      "patch": {
-        "operations": [
-          {
-            "op": "replace",
-            "path": "/Properties/FilterGroups",
-            "value": {
-              "Type": "List",
-              "Required": false,
-              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-filtergroup.html",
-              "ItemType": "WebhookFilter",
-              "UpdateType": "Mutable"
-            }
-          }
-        ],
-        "description": "Fix FilterGroups to be List of WebhookFilter"
-      }
-    },
-    "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
-      "patch": {
-        "operations": [
-          {
-            "op": "replace",
-            "path": "/Properties/S3Encryptions",
-            "value": {
-              "Type": "List",
-              "Required": false,
-              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryptions.html",
-              "ItemType": "S3Encryption",
-              "UpdateType": "Mutable"
-            }
-          }
-        ],
-        "description": "Fix S3Encryptions to be List of S3Encryption"
-      }
-    },
-    "patch": {
-      "operations": [
-        {
-          "op": "remove",
-          "path": "/AWS::AppSync::GraphQLApi.Tags"
-        },
-        {
-          "op": "remove",
-          "path": "/AWS::CodeBuild::Project.FilterGroup"
-        },
-        {
-          "op": "remove",
-          "path": "/AWS::LakeFormation::DataLakeSettings.Admins"
-        },
-        {
-          "op": "remove",
-          "path": "/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
-        },
-        {
-          "op": "remove",
-          "path": "/AWS::Glue::SecurityConfiguration.S3Encryptions"
-        }
-      ],
-      "description": "Remove bogus List Types"
-    }
-  }
-}