Skip to content

Commit 2584f68

Browse files
author
Chuck Meyer
authored
Merge pull request #230 from fatbasstard/master
update specs to July 20, 2018
2 parents be02de2 + 465b20b commit 2584f68

14 files changed

+16191
-15848
lines changed

‎src/cfnlint/data/CloudSpecs/ap-northeast-1.json

+2,120-2,097
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ap-northeast-2.json

+1,464-1,454
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ap-south-1.json

+1,528-1,493
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ap-southeast-1.json

+1,610-1,612
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ap-southeast-2.json

+1,570-1,560
Large diffs are not rendered by default.

‎src/cfnlint/data/CloudSpecs/ca-central-1.json

+67-32
Original file line numberDiff line numberDiff line change
@@ -3532,6 +3532,12 @@
35323532
"PrimitiveType": "Double",
35333533
"UpdateType": "Mutable"
35343534
},
3535+
"FieldLevelEncryptionId": {
3536+
"Required": false,
3537+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-fieldlevelencryptionid",
3538+
"PrimitiveType": "String",
3539+
"UpdateType": "Mutable"
3540+
},
35353541
"AllowedMethods": {
35363542
"PrimitiveItemType": "String",
35373543
"Type": "List",
@@ -4474,25 +4480,56 @@
44744480
"PrimitiveType": "Boolean",
44754481
"UpdateType": "Mutable"
44764482
},
4477-
"AllowedMethods": {
4483+
"LambdaFunctionAssociations": {
4484+
"Type": "List",
4485+
"Required": false,
4486+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-lambdafunctionassociations",
4487+
"ItemType": "LambdaFunctionAssociation",
4488+
"UpdateType": "Mutable"
4489+
},
4490+
"TargetOriginId": {
4491+
"Required": true,
4492+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-targetoriginid",
4493+
"PrimitiveType": "String",
4494+
"UpdateType": "Mutable"
4495+
},
4496+
"ViewerProtocolPolicy": {
4497+
"Required": true,
4498+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-viewerprotocolpolicy",
4499+
"PrimitiveType": "String",
4500+
"UpdateType": "Mutable"
4501+
},
4502+
"TrustedSigners": {
44784503
"PrimitiveItemType": "String",
44794504
"Type": "List",
44804505
"Required": false,
4481-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-allowedmethods",
4506+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-trustedsigners",
44824507
"UpdateType": "Mutable"
44834508
},
4484-
"CachedMethods": {
4509+
"DefaultTTL": {
4510+
"Required": false,
4511+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-defaultttl",
4512+
"PrimitiveType": "Double",
4513+
"UpdateType": "Mutable"
4514+
},
4515+
"FieldLevelEncryptionId": {
4516+
"Required": false,
4517+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-fieldlevelencryptionid",
4518+
"PrimitiveType": "String",
4519+
"UpdateType": "Mutable"
4520+
},
4521+
"AllowedMethods": {
44854522
"PrimitiveItemType": "String",
44864523
"Type": "List",
44874524
"Required": false,
4488-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-cachedmethods",
4525+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-allowedmethods",
44894526
"UpdateType": "Mutable"
44904527
},
4491-
"LambdaFunctionAssociations": {
4528+
"CachedMethods": {
4529+
"PrimitiveItemType": "String",
44924530
"Type": "List",
44934531
"Required": false,
4494-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-lambdafunctionassociations",
4495-
"ItemType": "LambdaFunctionAssociation",
4532+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-cachedmethods",
44964533
"UpdateType": "Mutable"
44974534
},
44984535
"SmoothStreaming": {
@@ -4501,18 +4538,6 @@
45014538
"PrimitiveType": "Boolean",
45024539
"UpdateType": "Mutable"
45034540
},
4504-
"TargetOriginId": {
4505-
"Required": true,
4506-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-targetoriginid",
4507-
"PrimitiveType": "String",
4508-
"UpdateType": "Mutable"
4509-
},
4510-
"ViewerProtocolPolicy": {
4511-
"Required": true,
4512-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-viewerprotocolpolicy",
4513-
"PrimitiveType": "String",
4514-
"UpdateType": "Mutable"
4515-
},
45164541
"ForwardedValues": {
45174542
"Type": "ForwardedValues",
45184543
"Required": true,
@@ -4530,19 +4555,6 @@
45304555
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-maxttl",
45314556
"PrimitiveType": "Double",
45324557
"UpdateType": "Mutable"
4533-
},
4534-
"TrustedSigners": {
4535-
"PrimitiveItemType": "String",
4536-
"Type": "List",
4537-
"Required": false,
4538-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-trustedsigners",
4539-
"UpdateType": "Mutable"
4540-
},
4541-
"DefaultTTL": {
4542-
"Required": false,
4543-
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-defaultttl",
4544-
"PrimitiveType": "Double",
4545-
"UpdateType": "Mutable"
45464558
}
45474559
}
45484560
},
@@ -12428,6 +12440,29 @@
1242812440
}
1242912441
}
1243012442
},
12443+
"AWS::IAM::ServiceLinkedRole": {
12444+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html",
12445+
"Properties": {
12446+
"CustomSuffix": {
12447+
"Required": false,
12448+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-customsuffix",
12449+
"PrimitiveType": "String",
12450+
"UpdateType": "Immutable"
12451+
},
12452+
"Description": {
12453+
"Required": false,
12454+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-description",
12455+
"PrimitiveType": "String",
12456+
"UpdateType": "Mutable"
12457+
},
12458+
"AWSServiceName": {
12459+
"Required": true,
12460+
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-awsservicename",
12461+
"PrimitiveType": "String",
12462+
"UpdateType": "Immutable"
12463+
}
12464+
}
12465+
},
1243112466
"AWS::ServiceCatalog::LaunchTemplateConstraint": {
1243212467
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html",
1243312468
"Properties": {

0 commit comments

Comments
 (0)