cfndsl 1.2.0 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +13 -3
  3. data/.travis.yml +5 -2
  4. data/CHANGELOG.md +49 -2
  5. data/README.md +1 -1
  6. data/cfndsl.gemspec +2 -2
  7. data/lib/cfndsl/aws/patches/900_SageMakerTags_patch.json +41 -0
  8. data/lib/cfndsl/aws/resource_specification.json +76883 -33363
  9. data/lib/cfndsl/globals.rb +1 -0
  10. data/lib/cfndsl/jsonable.rb +5 -4
  11. data/lib/cfndsl/orchestration_template.rb +12 -7
  12. data/lib/cfndsl/plurals.rb +2 -2
  13. data/lib/cfndsl/rake_task.rb +6 -6
  14. data/lib/cfndsl/ref_check.rb +2 -2
  15. data/lib/cfndsl/runner.rb +2 -2
  16. data/lib/cfndsl/specification.rb +11 -13
  17. data/lib/cfndsl/types.rb +83 -72
  18. data/lib/cfndsl/version.rb +1 -1
  19. data/lib/deep_merge/core.rb +6 -6
  20. data/sample/config_service.rb +1 -1
  21. data/sample/vpc_example.rb +3 -3
  22. data/sample/vpc_with_vpn_example.rb +3 -3
  23. data/spec/cli_spec.rb +2 -0
  24. metadata +7 -7
  25. data/lib/cfndsl/aws/patches/800_List_types_patch.json +0 -115
data/sample/config_service.rb CHANGED
@@ -9,7 +9,7 @@ CloudFormation do
9
9
  QueueName 'ConfigServiceQueue'
10
10
  end
11
11
 
12
- Bucket('ConfigServiceBucket') do
12
+ S3_Bucket('ConfigServiceBucket') do
13
13
  end
14
14
 
15
15
  IAM_Policy('ConfigServiceS3BucketAccessPolicy') do
data/sample/vpc_example.rb CHANGED
@@ -23,8 +23,8 @@ CloudFormation do
23
23
 
24
24
  10.times do |i|
25
25
  subnet = "subnet#{i}"
26
- route_table = subnet + 'RouteTable'
27
- route_table_assoc = route_table + 'Assoc'
26
+ route_table = "#{subnet}RouteTable"
27
+ route_table_assoc = "#{route_table}Assoc"
28
28
 
29
29
  Subnet(subnet) do
30
30
  VpcId Ref(:VPC)
@@ -42,7 +42,7 @@ CloudFormation do
42
42
  RouteTableId Ref(route_table)
43
43
  end
44
44
 
45
- EC2_Route(subnet + 'GatewayRoute') do
45
+ EC2_Route("#{subnet}GatewayRoute") do
46
46
  DependsOn :GatewayToInternet
47
47
  RouteTableId Ref(route_table)
48
48
  DestinationCidrBlock '0.0.0.0/0'
data/sample/vpc_with_vpn_example.rb CHANGED
@@ -41,8 +41,8 @@ CloudFormation do
41
41
 
42
42
  10.times do |i|
43
43
  subnet = "subnet#{i}"
44
- route_table = subnet + 'RouteTable'
45
- route_table_assoc = route_table + 'Assoc'
44
+ route_table = "#{subnet}RouteTable"
45
+ route_table_assoc = "#{route_table}Assoc"
46
46
 
47
47
  Subnet(subnet) do
48
48
  VpcId Ref(:VPC)
@@ -60,7 +60,7 @@ CloudFormation do
60
60
  RouteTableId Ref(route_table)
61
61
  end
62
62
 
63
- EC2_Route(subnet + 'GatewayRoute') do
63
+ EC2_Route("#{subnet}GatewayRoute") do
64
64
  DependsOn :GatewayToInternet
65
65
  RouteTableId Ref(route_table)
66
66
  DestinationCidrBlock '0.0.0.0/0'
data/spec/cli_spec.rb CHANGED
@@ -36,7 +36,9 @@ describe 'cfndsl', type: :aruba do
36
36
  before(:each) { write_file('template.rb', template_content) }
37
37
 
38
38
  # The known working version is the embedded version
39
+ # rubocop:disable Lint/ConstantDefinitionInBlock
39
40
  WORKING_SPEC_VERSION = JSON.parse(File.read(CfnDsl::LOCAL_SPEC_FILE))['ResourceSpecificationVersion']
41
+ # rubocop:enable Lint/ConstantDefinitionInBlock
40
42
 
41
43
  context "cfndsl -u #{WORKING_SPEC_VERSION}" do
42
44
  it 'updates the specification file' do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfndsl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steven Jack
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: exe
13
13
  cert_chain: []
14
- date: 2020-07-29 00:00:00.000000000 Z
14
+ date: 2021-07-14 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: bundler
@@ -19,14 +19,14 @@ dependencies:
19
19
  requirements:
20
20
  - - "~>"
21
21
  - !ruby/object:Gem::Version
22
- version: '2.1'
22
+ version: '2.2'
23
23
  type: :development
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - "~>"
28
28
  - !ruby/object:Gem::Version
29
- version: '2.1'
29
+ version: '2.2'
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: hana
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ files:
83
83
  - lib/cfndsl/aws/patches/520_ServiceDiscovery_InstanceAttributes_patch.json
84
84
  - lib/cfndsl/aws/patches/600_RefKinds_patch.json
85
85
  - lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
86
- - lib/cfndsl/aws/patches/800_List_types_patch.json
86
+ - lib/cfndsl/aws/patches/900_SageMakerTags_patch.json
87
87
  - lib/cfndsl/aws/resource_specification.json
88
88
  - lib/cfndsl/aws/types.rb
89
89
  - lib/cfndsl/aws/types.yaml
@@ -183,9 +183,9 @@ require_paths:
183
183
  - lib
184
184
  required_ruby_version: !ruby/object:Gem::Requirement
185
185
  requirements:
186
- - - "~>"
186
+ - - ">="
187
187
  - !ruby/object:Gem::Version
188
- version: '2.4'
188
+ version: '2.6'
189
189
  required_rubygems_version: !ruby/object:Gem::Requirement
190
190
  requirements:
191
191
  - - ">="
data/lib/cfndsl/aws/patches/800_List_types_patch.json DELETED
@@ -1,115 +0,0 @@
1
- {
2
- "broken" : "6.3.0",
3
- "ResourceTypes": {
4
- "AWS::AppSync::GraphQLApi": {
5
- "patch": {
6
- "operations": [
7
- {
8
- "op": "replace",
9
- "path": "/Properties/Tags",
10
- "value": {
11
- "Type": "List",
12
- "ItemType": "Tag",
13
- "Required": false,
14
- "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-tags",
15
- "UpdateType": "Mutable"
16
- }
17
- },
18
- {
19
- "op": "replace",
20
- "path": "/Properties/AdditionalAuthenticationProviders",
21
- "value": {
22
- "Type": "List",
23
- "Required": false,
24
- "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationproviders.html",
25
- "ItemType": "AdditionalAuthenticationProvider",
26
- "UpdateType": "Mutable"
27
- }
28
- }
29
- ],
30
- "description": "Fix GraphQLApi to be List of Tag"
31
- }
32
- },
33
- "AWS::LakeFormation::DataLakeSettings": {
34
- "patch": {
35
- "operations": [
36
- {
37
- "op": "replace",
38
- "path": "/Properties/Admins",
39
- "value": {
40
- "Type": "List",
41
- "Required": false,
42
- "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-admins.html",
43
- "ItemType": "DataLakePrincipal",
44
- "UpdateType": "Mutable"
45
- }
46
- }
47
- ],
48
- "description": "Fix GraphQLApi to be List of Tag"
49
- }
50
- }
51
- },
52
- "PropertyTypes": {
53
- "AWS::CodeBuild::Project.ProjectTriggers": {
54
- "patch": {
55
- "operations": [
56
- {
57
- "op": "replace",
58
- "path": "/Properties/FilterGroups",
59
- "value": {
60
- "Type": "List",
61
- "Required": false,
62
- "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-filtergroup.html",
63
- "ItemType": "WebhookFilter",
64
- "UpdateType": "Mutable"
65
- }
66
- }
67
- ],
68
- "description": "Fix FilterGroups to be List of WebhookFilter"
69
- }
70
- },
71
- "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
72
- "patch": {
73
- "operations": [
74
- {
75
- "op": "replace",
76
- "path": "/Properties/S3Encryptions",
77
- "value": {
78
- "Type": "List",
79
- "Required": false,
80
- "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryptions.html",
81
- "ItemType": "S3Encryption",
82
- "UpdateType": "Mutable"
83
- }
84
- }
85
- ],
86
- "description": "Fix S3Encryptions to be List of S3Encryption"
87
- }
88
- },
89
- "patch": {
90
- "operations": [
91
- {
92
- "op": "remove",
93
- "path": "/AWS::AppSync::GraphQLApi.Tags"
94
- },
95
- {
96
- "op": "remove",
97
- "path": "/AWS::CodeBuild::Project.FilterGroup"
98
- },
99
- {
100
- "op": "remove",
101
- "path": "/AWS::LakeFormation::DataLakeSettings.Admins"
102
- },
103
- {
104
- "op": "remove",
105
- "path": "/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
106
- },
107
- {
108
- "op": "remove",
109
- "path": "/AWS::Glue::SecurityConfiguration.S3Encryptions"
110
- }
111
- ],
112
- "description": "Remove bogus List Types"
113
- }
114
- }
115
- }