Skip to content

Commit

Permalink
Merge branch 'master' into document-policydoc-validate-return
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored May 16, 2022
2 parents 03dffe8 + 778feaf commit 9c1ed9c
Show file tree
Hide file tree
Showing 195 changed files with 959 additions and 289 deletions.
5 changes: 4 additions & 1 deletion packages/@aws-cdk/aws-ecs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ const autoScalingGroup = new autoscaling.AutoScalingGroup(this, 'ASG', {
// ... other options here ...
});

cluster.addAutoScalingGroup(autoScalingGroup);
const capacityProvider = new ecs.AsgCapacityProvider(this, 'AsgCapacityProvider', {
autoScalingGroup,
});
cluster.addAsgCapacityProvider(capacityProvider);
```

If you omit the property `vpc`, the construct will create a new VPC with two AZs.
Expand Down
38 changes: 38 additions & 0 deletions packages/@aws-cdk/cfnspec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
# CloudFormation Resource Specification v72.0.0

## New Resource Types

* AWS::IoT::RoleAlias
* AWS::NetworkManager::ConnectAttachment
* AWS::NetworkManager::ConnectPeer
* AWS::NetworkManager::CoreNetwork
* AWS::NetworkManager::SiteToSiteVpnAttachment
* AWS::NetworkManager::VpcAttachment

## Attribute Changes

* AWS::MediaTailor::PlaybackConfiguration DashConfiguration.ManifestEndpointPrefix (__added__)
* AWS::MediaTailor::PlaybackConfiguration HlsConfiguration.ManifestEndpointPrefix (__added__)
* AWS::MediaTailor::PlaybackConfiguration PlaybackConfigurationArn (__added__)
* AWS::MediaTailor::PlaybackConfiguration PlaybackEndpointPrefix (__added__)
* AWS::MediaTailor::PlaybackConfiguration SessionInitializationEndpointPrefix (__added__)

## Property Changes

* AWS::AutoScaling::AutoScalingGroup DefaultInstanceWarmup (__added__)
* AWS::MediaTailor::PlaybackConfiguration SessionInitializationEndpointPrefix (__deleted__)
* AWS::MediaTailor::PlaybackConfiguration DashConfiguration.Type (__changed__)
* Old: DashConfigurationForPut
* New: DashConfiguration
* AWS::Redshift::Cluster IamRoles.DuplicatesAllowed (__deleted__)

## Property Type Changes

* AWS::MediaTailor::PlaybackConfiguration.DashConfigurationForPut (__removed__)
* AWS::MediaTailor::PlaybackConfiguration.DashConfiguration (__added__)
* AWS::MediaTailor::PlaybackConfiguration.HlsConfiguration (__added__)

## Unapplied changes

* AWS::Rekognition is at 68.0.0

# CloudFormation Resource Specification v69.0.0

## New Resource Types
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cfnspec/cfn.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
69.0.0
72.0.0
333 changes: 249 additions & 84 deletions packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::ACMPCA::Certificate.ApiPassthrough": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-apipassthrough.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::APS::RuleGroupsNamespace": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AccessAnalyzer::Analyzer.ArchiveRule": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-archiverule.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AmazonMQ::Broker.ConfigurationId": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-configurationid.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Amplify::App.AutoBranchCreationConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AmplifyUIBuilder::Component.ActionParameters": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-actionparameters.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::ApiGateway::ApiKey.StageKey": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::ApiGatewayV2::Api.BodyS3Location": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppConfig::Application.Tags": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-application-tags.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-amplitudeconnectorprofilecredentials.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppIntegrations::DataIntegration.ScheduleConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-dataintegration-scheduleconfig.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppRunner::ObservabilityConfiguration.TraceConfiguration": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-observabilityconfiguration-traceconfiguration.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppStream::AppBlock.S3Location": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AppSync::DataSource.AuthorizationConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-authorizationconfig.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::ApplicationInsights::Application.Alarm": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarm.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Athena::WorkGroup.EncryptionConfiguration": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-encryptionconfiguration.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AuditManager::Assessment.AWSAccount": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratorcountrequest.html",
Expand Down Expand Up @@ -1063,6 +1063,12 @@
"Required": false,
"UpdateType": "Mutable"
},
"DefaultInstanceWarmup": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-defaultinstancewarmup",
"PrimitiveType": "Integer",
"Required": false,
"UpdateType": "Mutable"
},
"DesiredCapacity": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-desiredcapacity",
"PrimitiveType": "String",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-applicationsource.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-advancedbackupsettingresourcetype.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Batch::ComputeEnvironment.ComputeResources": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::BillingConductor::BillingGroup.AccountGrouping": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-billingconductor-billinggroup-accountgrouping.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Budgets::Budget.BudgetData": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CE::AnomalyMonitor.ResourceTag": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalymonitor-resourcetag.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::CUR::ReportDefinition": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Cassandra::Table.BillingMode": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-billingmode.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-account-expiryeventsconfiguration.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::Chatbot::SlackChannelConfiguration": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Cloud9::EnvironmentEC2.Repository": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloud9-environmentec2-repository.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CloudFormation::HookVersion.LoggingConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-hookversion-loggingconfig.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CloudFront::CachePolicy.CachePolicyConfig": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CloudTrail::Trail.DataResource": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CloudWatch::Alarm.Dimension": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::CodeArtifact::Domain": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeBuild::Project.Artifacts": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeCommit::Repository.Code": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-code.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeGuruProfiler::ProfilingGroup.Channel": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codeguruprofiler-profilinggroup-channel.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::CodeGuruReviewer::RepositoryAssociation": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodePipeline::CustomActionType.ArtifactDetails": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeStar::GitHubRepository.Code": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-code.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {},
"ResourceTypes": {
"AWS::CodeStarConnections::Connection": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::CodeStarNotifications::NotificationRule.Target": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestarnotifications-notificationrule-target.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Cognito::IdentityPool.CognitoIdentityProvider": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$version": "69.0.0",
"$version": "72.0.0",
"PropertyTypes": {
"AWS::Config::ConfigRule.Scope": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html",
Expand Down
Loading

0 comments on commit 9c1ed9c

Please sign in to comment.