Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cfnspec): cloudformation spec v18.5.0 #10636

Merged
merged 3 commits into from
Oct 2, 2020
Merged

feat(cfnspec): cloudformation spec v18.5.0 #10636

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6941874
feat: cloudformation spec v18.5.0
Oct 1, 2020
bb7bb0e
patching the StepFunctions Activity property Name as it was an uninte…
shivlaks Oct 1, 2020
7398cc4
Merge branch 'master' into bump-cfnspec/v18.5.0
mergify[bot] Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions packages/@aws-cdk/cfnspec/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
# CloudFormation Resource Specification v18.5.0

## New Resource Types


## Attribute Changes


## Property Changes

* AWS::Amplify::Branch EnablePerformanceMode (__added__)
* AWS::AppStream::Fleet IamRoleArn (__added__)
* AWS::AppStream::Fleet StreamView (__added__)
* AWS::AppStream::ImageBuilder IamRoleArn (__added__)
* AWS::EKS::Cluster KubernetesNetworkConfig (__added__)
* AWS::StepFunctions::Activity Name (__deleted__)
* AWS::StepFunctions::Activity Arn (__added__)
Comment on lines +16 to +17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aws-cloudformation/cfn-lint#1715 (comment)
aws-cloudformation/cfn-lint#1722

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @PatMyron!! - I've applied the same patch to our commit

* AWS::StepFunctions::Activity Tags.DuplicatesAllowed (__added__)

## Property Type Changes

* AWS::Batch::JobDefinition.LogConfiguration (__added__)
* AWS::Batch::JobDefinition.Secret (__added__)
* AWS::Batch::JobDefinition.Tmpfs (__added__)
* AWS::EKS::Cluster.KubernetesNetworkConfig (__added__)
* AWS::Amplify::App.AutoBranchCreationConfig EnablePerformanceMode (__added__)
* AWS::Batch::JobDefinition.ContainerProperties ExecutionRoleArn (__added__)
* AWS::Batch::JobDefinition.ContainerProperties LogConfiguration (__added__)
* AWS::Batch::JobDefinition.ContainerProperties Secrets (__added__)
* AWS::Batch::JobDefinition.LinuxParameters InitProcessEnabled (__added__)
* AWS::Batch::JobDefinition.LinuxParameters MaxSwap (__added__)
* AWS::Batch::JobDefinition.LinuxParameters SharedMemorySize (__added__)
* AWS::Batch::JobDefinition.LinuxParameters Swappiness (__added__)
* AWS::Batch::JobDefinition.LinuxParameters Tmpfs (__added__)
* AWS::CloudFront::CachePolicy.CachePolicyConfig DefaultTTL.Required (__changed__)
* Old: false
* New: true
* AWS::CloudFront::CachePolicy.CachePolicyConfig MaxTTL.Required (__changed__)
* Old: false
* New: true
* AWS::CloudFront::CachePolicy.CachePolicyConfig ParametersInCacheKeyAndForwardedToOrigin.Required (__changed__)
* Old: false
* New: true


# CloudFormation Resource Specification v18.4.0

## New Resource Types
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cfnspec/cfn.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.4.0
18.5.0
179 changes: 171 additions & 8 deletions packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,12 @@
"Required": false,
"UpdateType": "Mutable"
},
"EnablePerformanceMode": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enableperformancemode",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"EnablePullRequestPreview": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enablepullrequestpreview",
"PrimitiveType": "Boolean",
Expand Down Expand Up @@ -7216,6 +7222,12 @@
"Type": "List",
"UpdateType": "Mutable"
},
"ExecutionRoleArn": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-executionrolearn",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"Image": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-image",
"PrimitiveType": "String",
Expand All @@ -7240,6 +7252,12 @@
"Type": "LinuxParameters",
"UpdateType": "Mutable"
},
"LogConfiguration": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-logconfiguration",
"Required": false,
"Type": "LogConfiguration",
"UpdateType": "Mutable"
},
"Memory": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-memory",
"PrimitiveType": "Integer",
Expand Down Expand Up @@ -7272,6 +7290,13 @@
"Type": "List",
"UpdateType": "Mutable"
},
"Secrets": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-secrets",
"ItemType": "Secret",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"Ulimits": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-ulimits",
"ItemType": "Ulimit",
Expand Down Expand Up @@ -7350,6 +7375,61 @@
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"InitProcessEnabled": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-initprocessenabled",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"MaxSwap": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-maxswap",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"SharedMemorySize": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-sharedmemorysize",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"Swappiness": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-swappiness",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"Tmpfs": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-tmpfs",
"ItemType": "Tmpfs",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
}
}
},
"AWS::Batch::JobDefinition.LogConfiguration": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html",
"Properties": {
"LogDriver": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-logdriver",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
},
"Options": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-options",
"PrimitiveType": "Json",
"Required": false,
"UpdateType": "Mutable"
},
"SecretOptions": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-secretoptions",
"ItemType": "Secret",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
}
}
},
Expand Down Expand Up @@ -7445,6 +7525,23 @@
}
}
},
"AWS::Batch::JobDefinition.Secret": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html",
"Properties": {
"Name": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html#cfn-batch-jobdefinition-secret-name",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
},
"ValueFrom": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html#cfn-batch-jobdefinition-secret-valuefrom",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
}
}
},
"AWS::Batch::JobDefinition.Timeout": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-timeout.html",
"Properties": {
Expand All @@ -7456,6 +7553,30 @@
}
}
},
"AWS::Batch::JobDefinition.Tmpfs": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html",
"Properties": {
"ContainerPath": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-containerpath",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
},
"MountOptions": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-mountoptions",
"PrimitiveItemType": "String",
"Required": false,
"Type": "List",
"UpdateType": "Mutable"
},
"Size": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-size",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
}
}
},
"AWS::Batch::JobDefinition.Ulimit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html",
"Properties": {
Expand Down Expand Up @@ -7984,13 +8105,13 @@
"DefaultTTL": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-defaultttl",
"PrimitiveType": "Double",
"Required": false,
"Required": true,
"UpdateType": "Mutable"
},
"MaxTTL": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-maxttl",
"PrimitiveType": "Double",
"Required": false,
"Required": true,
"UpdateType": "Mutable"
},
"MinTTL": {
Expand All @@ -8007,7 +8128,7 @@
},
"ParametersInCacheKeyAndForwardedToOrigin": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-parametersincachekeyandforwardedtoorigin",
"Required": false,
"Required": true,
"Type": "ParametersInCacheKeyAndForwardedToOrigin",
"UpdateType": "Mutable"
}
Expand Down Expand Up @@ -16397,6 +16518,17 @@
}
}
},
"AWS::EKS::Cluster.KubernetesNetworkConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html",
"Properties": {
"ServiceIpv4Cidr": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html#cfn-eks-cluster-kubernetesnetworkconfig-serviceipv4cidr",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
}
}
},
"AWS::EKS::Cluster.Provider": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-provider.html",
"Properties": {
Expand Down Expand Up @@ -41495,7 +41627,7 @@
}
}
},
"ResourceSpecificationVersion": "18.4.0",
"ResourceSpecificationVersion": "18.5.0",
"ResourceTypes": {
"AWS::ACMPCA::Certificate": {
"Attributes": {
Expand Down Expand Up @@ -42036,6 +42168,12 @@
"Required": false,
"UpdateType": "Mutable"
},
"EnablePerformanceMode": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-enableperformancemode",
"PrimitiveType": "Boolean",
"Required": false,
"UpdateType": "Mutable"
},
"EnablePullRequestPreview": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-enablepullrequestpreview",
"PrimitiveType": "Boolean",
Expand Down Expand Up @@ -44498,6 +44636,12 @@
"Required": false,
"UpdateType": "Immutable"
},
"IamRoleArn": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-iamrolearn",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"IdleDisconnectTimeoutInSeconds": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-idledisconnecttimeoutinseconds",
"PrimitiveType": "Integer",
Expand Down Expand Up @@ -44534,6 +44678,12 @@
"Required": true,
"UpdateType": "Immutable"
},
"StreamView": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-streamview",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"Tags": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-tags",
"ItemType": "Tag",
Expand Down Expand Up @@ -44594,6 +44744,12 @@
"Required": false,
"UpdateType": "Mutable"
},
"IamRoleArn": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-iamrolearn",
"PrimitiveType": "String",
"Required": false,
"UpdateType": "Mutable"
},
"ImageArn": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-imagearn",
"PrimitiveType": "String",
Expand Down Expand Up @@ -53368,6 +53524,12 @@
"Type": "List",
"UpdateType": "Immutable"
},
"KubernetesNetworkConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-kubernetesnetworkconfig",
"Required": false,
"Type": "KubernetesNetworkConfig",
"UpdateType": "Immutable"
},
"Name": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-name",
"PrimitiveType": "String",
Expand Down Expand Up @@ -67376,14 +67538,15 @@
},
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html",
"Properties": {
"Name": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name",
"Arn": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-arn",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Immutable"
"Required": false,
"UpdateType": "Mutable"
},
"Tags": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags",
"DuplicatesAllowed": true,
"ItemType": "TagsEntry",
"Required": false,
"Type": "List",
Expand Down
25 changes: 25 additions & 0 deletions packages/@aws-cdk/cfnspec/spec-source/660_StepFunctions_Activity_patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"ResourceTypes": {
"AWS::StepFunctions::Activity": {
"patch": {
"description": "The StepFunctions resource is using the CloudFormation Registry and this was an errant entry. It will be restored in the next versions of the spec but is incorrect in v18.5",
"operations": [
{
"op": "remove",
"path": "/Properties/Arn"
},
{
"op": "add",
"path": "/Properties/Name",
"value": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Immutable"
}
}
]
}
}
}
}