Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed May 24, 2023
2 parents 680df85 + a86b919 commit 3ef5ed3
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 17 deletions.
22 changes: 17 additions & 5 deletions packages/@aws-cdk/app-staging-synthesizer-alpha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ are as follows:
- the `AppStagingSynthesizer`, a new CDK synthesizer that will synthesize CDK applications with
the staging resources provided.

> Currently this module does not support CDK Pipelines. You must deploy CDK Apps using this
> synthesizer via `cdk deploy`.
> As this library is `experimental`, there are features that are not yet implemented. Please look
> at the list of [Known Limitations](#known-limitations) before getting started.
To get started, update your CDK App with a new `defaultStackSynthesizer`:

Expand Down Expand Up @@ -149,9 +149,6 @@ benefits:
controlled individually.
- Users have a familiar way to customize staging resources in the CDK Application.

> As this library is `experimental`, the accompanying Bootstrap Stack is not yet implemented. To use this
> library right now, you must reuse roles that have been traditionally bootstrapped.
## Using the Default Staging Stack per Environment

The most common use case will be to use the built-in default resources. In this scenario, the
Expand Down Expand Up @@ -387,3 +384,18 @@ const app = new App({
}),
});
```

## Known Limitations

Since this module is experimental, there are some known limitations:

- Currently this module does not support CDK Pipelines. You must deploy CDK Apps using this
synthesizer via `cdk deploy`.
- This synthesizer only needs a bootstrap stack with Roles, without staging resources. We
haven't written such a bootstrap stack yet; at the moment you can use the existing modern
bootstrap stack, the staging resources in them will just go unused.
- Due to limitations on the CloudFormation template size, CDK Applications can have
at most 38 independent ECR images.
- When you run `cdk destroy` (for example during testing), the staging bucket and ECR
repositories will be left behind because CloudFormation cannot clean up non-empty resources.
You must deploy those resources manually if you want to redeploy again using the same `appId`.
22 changes: 11 additions & 11 deletions packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -16214,16 +16214,16 @@
},
"description": "Specifies a route in a route table.\n\nYou must specify either `DestinationCidrBlock` or `DestinationIpv6CidrBlock` , plus the ID of one of the target resources.\n\nIf you create a route that references a transit gateway in the same template where you create the transit gateway, you must declare a dependency on the transit gateway attachment. The route table cannot use the transit gateway until it has successfully attached to the VPC. Add a [DependsOn Attribute](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html) in the `AWS::EC2::Route` resource to explicitly declare a dependency on the `AWS::EC2::TransitGatewayAttachment` resource.",
"properties": {
"CarrierGatewayId": "The ID of the carrier gateway.",
"DestinationCidrBlock": "The IPv4 CIDR block used for the destination match.",
"DestinationIpv6CidrBlock": "The IPv6 CIDR block used for the destination match.",
"EgressOnlyInternetGatewayId": "The ID of the egress-only internet gateway.",
"CarrierGatewayId": "The ID of the carrier gateway.\n\nYou can only use this option when the VPC contains a subnet which is associated with a Wavelength Zone.",
"DestinationCidrBlock": "The IPv4 CIDR address block used for the destination match. Routing decisions are based on the most specific match. We modify the specified CIDR block to its canonical form; for example, if you specify `100.68.0.18/18` , we modify it to `100.68.0.0/18` .",
"DestinationIpv6CidrBlock": "The IPv6 CIDR block used for the destination match. Routing decisions are based on the most specific match.",
"EgressOnlyInternetGatewayId": "[IPv6 traffic only] The ID of an egress-only internet gateway.",
"GatewayId": "The ID of an internet gateway or virtual private gateway attached to your VPC.",
"InstanceId": "The ID of a NAT instance in your VPC.",
"InstanceId": "The ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.",
"LocalGatewayId": "The ID of the local gateway.",
"NatGatewayId": "The ID of a NAT gateway.",
"NetworkInterfaceId": "The ID of the network interface.",
"RouteTableId": "The ID of the route table. The routing table must be associated with the same VPC that the virtual private gateway is attached to.",
"NatGatewayId": "[IPv4 traffic only] The ID of a NAT gateway.",
"NetworkInterfaceId": "The ID of a network interface.",
"RouteTableId": "The ID of the route table for the route.",
"TransitGatewayId": "The ID of a transit gateway.",
"VpcEndpointId": "The ID of a VPC endpoint. Supported for Gateway Load Balancer endpoints only.",
"VpcPeeringConnectionId": "The ID of a VPC peering connection."
Expand Down Expand Up @@ -41544,7 +41544,7 @@
"attributes": {},
"description": "The cluster marker configuration of the geospatial map selected point style.",
"properties": {
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration"
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration."
}
},
"AWS::QuickSight::Analysis.ColorScale": {
Expand Down Expand Up @@ -45726,7 +45726,7 @@
"attributes": {},
"description": "The cluster marker configuration of the geospatial map selected point style.",
"properties": {
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration"
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration."
}
},
"AWS::QuickSight::Dashboard.ColorScale": {
Expand Down Expand Up @@ -50617,7 +50617,7 @@
"attributes": {},
"description": "The cluster marker configuration of the geospatial map selected point style.",
"properties": {
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration"
"ClusterMarker": "The cluster marker that is a part of the cluster marker configuration."
}
},
"AWS::QuickSight::Template.ColorScale": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"31.0.0"}
{"version":"32.0.0"}

0 comments on commit 3ef5ed3

Please sign in to comment.