Merge branch 'main' into corymhall/integ-runner/arrays

README.md

@@ -28,6 +28,8 @@ The CDK is available in the following languages:
 * .NET ([.NET Core ≥ 3.1](https://dotnet.microsoft.com/download))
 * Go ([Go ≥ 1.16.4](https://golang.org/))
 
+Third-party Language Deprecation: language version is only supported until its EOL (End Of Life) shared by the vendor or community and is subject to change with prior notice.
+
 \
 Jump To:
 [Developer Guide](https://docs.aws.amazon.com/cdk/latest/guide) |

packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts

@@ -80,6 +80,8 @@ export interface CommonAutoScalingGroupProps {
   /**
    * Name of SSH keypair to grant access to instances
    *
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
+   *
    * @default - No SSH access will be possible.
    */
   readonly keyName?: string;
@@ -190,6 +192,8 @@ export interface CommonAutoScalingGroupProps {
    * Whether instances in the Auto Scaling Group should have public
    * IP addresses associated with them.
    *
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
+   *
    * @default - Use subnet setting.
    */
   readonly associatePublicIpAddress?: boolean;
@@ -198,6 +202,8 @@ export interface CommonAutoScalingGroupProps {
    * The maximum hourly price (in USD) to be paid for any Spot Instance launched to fulfill the request. Spot Instances are
    * launched when the price you specify exceeds the current Spot market price.
    *
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
+   *
    * @default none
    */
   readonly spotPrice?: string;
@@ -217,6 +223,8 @@ export interface CommonAutoScalingGroupProps {
    * You can use block device mappings to specify additional EBS volumes or
    * instance store volumes to attach to an instance when it is launched.
    *
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
+   *
    * @see https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
    *
    * @default - Uses the block device mapping of the AMI
@@ -243,6 +251,8 @@ export interface CommonAutoScalingGroupProps {
    * When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account
    * is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes.
    *
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
+   *
    * @see https://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-monitoring.html#enable-as-instance-metrics
    *
    * @default - Monitoring.DETAILED
@@ -543,7 +553,7 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
   /**
    * Type of instance to launch
    *
-   * `launchTemplate` must not be specified when this property is specified.
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
    *
    * @default - Do not provide any instance type
    */
@@ -552,7 +562,7 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
   /**
    * AMI to launch
    *
-   * `launchTemplate` must not be specified when this property is specified.
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
    *
    * @default - Do not provide any machine image
    */
@@ -561,7 +571,7 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
   /**
    * Security group to launch the instances in.
    *
-   * `launchTemplate` must not be specified when this property is specified.
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
    *
    * @default - A SecurityGroup will be created if none is specified.
    */
@@ -572,7 +582,7 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
    *
    * The UserData may still be mutated after creation.
    *
-   * `launchTemplate` must not be specified when this property is specified.
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
    *
    * @default - A UserData object appropriate for the MachineImage's
    * Operating System is created.
@@ -584,7 +594,7 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
    *
    * The role must be assumable by the service principal `ec2.amazonaws.com`:
    *
-   * `launchTemplate` must not be specified when this property is specified.
+   * `launchTemplate` and `mixedInstancesPolicy` must not be specified when this property is specified
    *
    * @example
    *
@@ -1523,7 +1533,7 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
     if (props.instanceMonitoring) {
       throw new Error('Setting \'instanceMonitoring\' must not be set when \'launchTemplate\' or \'mixedInstancesPolicy\' is set');
     }
-    if (props.associatePublicIpAddress) {
+    if (props.associatePublicIpAddress !== undefined) {
       throw new Error('Setting \'associatePublicIpAddress\' must not be set when \'launchTemplate\' or \'mixedInstancesPolicy\' is set');
     }
     if (props.spotPrice) {

packages/@aws-cdk/aws-autoscaling/test/auto-scaling-group.test.ts

@@ -1525,6 +1525,7 @@ describe('auto scaling group', () => {
       launchTemplateId: 'test-lt-id',
       versionNumber: '0',
     });
+    const vpc = mockVpc(stack);
 
     // THEN
     expect(() => {
@@ -1535,9 +1536,16 @@ describe('auto scaling group', () => {
           generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
           cpuType: AmazonLinuxCpuType.X86_64,
         }),
-        vpc: mockVpc(stack),
+        vpc,
       });
     }).toThrow('Setting \'machineImage\' must not be set when \'launchTemplate\' or \'mixedInstancesPolicy\' is set');
+    expect(() => {
+      new autoscaling.AutoScalingGroup(stack, 'imported-lt-asg-2', {
+        launchTemplate: lt,
+        associatePublicIpAddress: true,
+        vpc,
+      });
+    }).toThrow('Setting \'associatePublicIpAddress\' must not be set when \'launchTemplate\' or \'mixedInstancesPolicy\' is set');
   });
 
   test('Cannot specify Launch Template without instance type', () => {

packages/@aws-cdk/core/lib/feature-flags.ts

@@ -32,6 +32,6 @@ export class FeatureFlags {
       }
       return true;
     }
-    return context ?? cxapi.futureFlagDefault(featureFlag);
+    return context !== undefined ? Boolean(context) : cxapi.futureFlagDefault(featureFlag);
   }
 }

packages/@aws-cdk/core/test/feature-flags.test.ts

@@ -23,5 +23,13 @@ describe('feature flags', () => {
 
       expect(FeatureFlags.of(stack).isEnabled('non-existent-flag')).toEqual(false);
     });
+
+    test('strings are evaluated as boolean', () => {
+      const stack = new Stack();
+      stack.node.setContext(cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT, 'true');
+
+      const actual = FeatureFlags.of(stack).isEnabled(cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT);
+      expect(actual).toEqual(true);
+    });
   });
 });

packages/aws-cdk/README.md

@@ -191,6 +191,8 @@ In order to deploy them, you can list the stacks you want to deploy. If your app
 
 If you want to deploy all of them, you can use the flag `--all` or the wildcard `*` to deploy all stacks in an app. Please note that, if you have a hierarchy of stacks as described above, `--all` and `*` will only match the stacks on the top level. If you want to match all the stacks in the hierarchy, use `**`. You can also combine these patterns. For example, if you want to deploy all stacks in the `Prod` stage, you can use `cdk deploy PipelineStack/Prod/**`.
 
+`--concurrency N` allows deploying multiple stacks in parallel while respecting inter-stack dependencies to speed up deployments. It does not protect against CloudFormation and other AWS account rate limiting.
+
 #### Parameters
 
 Pass parameters to your template during deployment by using `--parameters
@@ -456,6 +458,15 @@ locally to your terminal. To disable this feature you can pass the `--no-logs` o
 $ cdk watch --no-logs
 ```
 
+You can increase the concurrency by which `watch` will deploy and hotswap
+your stacks by specifying `--concurrency N`. `--concurrency` for `watch`
+acts the same as `--concurrency` for `deploy`, in that it will deploy or
+hotswap your stacks while respecting inter-stack dependencies.
+
+```console
+$ cdk watch --concurrency 5
+```
+
 **Note**: This command is considered experimental, and might have breaking changes in the future.
 The same limitations apply to to `watch` deployments as do to `--hotswap` deployments. See the
 *Hotswap deployments for faster development* section for more information.

packages/aws-cdk/THIRD_PARTY_LICENSES

@@ -1143,6 +1143,32 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+----------------
+
+** eventemitter3@4.0.7 - https://www.npmjs.com/package/eventemitter3/v/4.0.7 | MIT
+The MIT License (MIT)
+
+Copyright (c) 2014 Arnout Kazemier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ----------------
 
 ** fast-deep-equal@3.1.3 - https://www.npmjs.com/package/fast-deep-equal/v/3.1.3 | MIT
@@ -2274,6 +2300,60 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+----------------
+
+** p-finally@1.0.0 - https://www.npmjs.com/package/p-finally/v/1.0.0 | MIT
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+----------------
+
+** p-queue@6.6.2 - https://www.npmjs.com/package/p-queue/v/6.6.2 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+----------------
+
+** p-timeout@3.2.0 - https://www.npmjs.com/package/p-timeout/v/3.2.0 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ----------------
 
 ** pac-proxy-agent@5.0.0 - https://www.npmjs.com/package/pac-proxy-agent/v/5.0.0 | MIT

packages/aws-cdk/lib/api/hotswap/common.ts

@@ -61,23 +61,34 @@ export class HotswappableChangeCandidate {
   }
 }
 
+type Exclude = { [key: string]: Exclude | true }
+
 /**
  * This function transforms all keys (recursively) in the provided `val` object.
  *
  * @param val The object whose keys need to be transformed.
  * @param transform The function that will be applied to each key.
+ * @param exclude The keys that will not be transformed and copied to output directly
  * @returns A new object with the same values as `val`, but with all keys transformed according to `transform`.
  */
-export function transformObjectKeys(val: any, transform: (str: string) => string): any {
+export function transformObjectKeys(val: any, transform: (str: string) => string, exclude: Exclude = {}): any {
   if (val == null || typeof val !== 'object') {
     return val;
   }
   if (Array.isArray(val)) {
-    return val.map((input: any) => transformObjectKeys(input, transform));
+    // For arrays we just pass parent's exclude object directly
+    // since it makes no sense to specify different exclude options for each array element
+    return val.map((input: any) => transformObjectKeys(input, transform, exclude));
   }
   const ret: { [k: string]: any; } = {};
   for (const [k, v] of Object.entries(val)) {
-    ret[transform(k)] = transformObjectKeys(v, transform);
+    const childExclude = exclude[k];
+    if (childExclude === true) {
+      // we don't transform this object if the key is specified in exclude
+      ret[transform(k)] = v;
+    } else {
+      ret[transform(k)] = transformObjectKeys(v, transform, childExclude);
+    }
   }
   return ret;
 }

packages/aws-cdk/lib/api/hotswap/ecs-services.ts

@@ -91,7 +91,25 @@ class EcsServiceHotswapOperation implements HotswapOperation {
     // Step 1 - update the changed TaskDefinition, creating a new TaskDefinition Revision
     // we need to lowercase the evaluated TaskDef from CloudFormation,
     // as the AWS SDK uses lowercase property names for these
-    const lowercasedTaskDef = transformObjectKeys(this.taskDefinitionResource, lowerCaseFirstCharacter);
+    const lowercasedTaskDef = transformObjectKeys(this.taskDefinitionResource, lowerCaseFirstCharacter, {
+      // All the properties that take arbitrary string as keys i.e. { "string" : "string" }
+      // https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RegisterTaskDefinition.html#API_RegisterTaskDefinition_RequestSyntax
+      ContainerDefinitions: {
+        DockerLabels: true,
+        FirelensConfiguration: {
+          Options: true,
+        },
+        LogConfiguration: {
+          Options: true,
+        },
+      },
+      Volumes: {
+        DockerVolumeConfiguration: {
+          DriverOpts: true,
+          Labels: true,
+        },
+      },
+    });
     const registerTaskDefResponse = await sdk.ecs().registerTaskDefinition(lowercasedTaskDef).promise();
     const taskDefRevArn = registerTaskDefResponse.taskDefinition?.taskDefinitionArn;