feat(cli): support hotswap for AWS::BedrockAgentCore::Runtime (#991)

Fixes #947 

This PR adds hotswap support for `AWS::Bedrock::AgentRuntime`.

This feature can detect both of S3 code files and ECR images changes to
deploy with hotswap.

## Changes

1. Added hotswap support for Bedrock Agent Runtime resources
2. Added `@aws-sdk/client-bedrock-agentcore-control` dependency
~~3. Added yarn `resolutions` to prevent ESM/CommonJS incompatibility
(see [the
comment](#991 (comment))
for details)~~
~~4. Modified `yarn-cling` to support yarn resolutions field (see [the
comment](#991 (comment))
for rationale)~~

~~**Note on 3 and 4**: I chose this approach to resolve build failures
after adding the Bedrock SDK, though I'm not certain it's the optimal
solution. If there's a better approach, I'd welcome your feedback. See
the [commit
"3904aab4"](3904aab)
for details. FYI, I deleted the yarn.lock file and did a clean install
again instead of resolutions, but I got the same error.~~

Tried to revert the commit and modify the lock file manually, build
succeeded.

To be specific, after installing
`@aws-sdk/client-bedrock-agentcore-control`, this
[change](e747f2c)
was automatically made. I then manually reverted
[everything](a6f2daf)
except `"@aws-sdk/client-bedrock-agentcore-control@^3":` (since it was
not directly related to that SDK). The build then succeeded.

---
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license

---------

Co-authored-by: Momo Kornher <kornherm@amazon.co.uk>

Author: go-to-k

.projenrc.ts

@@ -808,6 +808,7 @@ const toolkitLib = configureProject(
       cdkAssetsLib.customizeReference({ versionType: 'any-minor' }), // stay within the same MV, otherwise any should work
       `${cxApi}@^2`, // stay within the same MV, otherwise any should work
       sdkDepForLib('@aws-sdk/client-appsync'),
+      sdkDepForLib('@aws-sdk/client-bedrock-agentcore-control'),
       sdkDepForLib('@aws-sdk/client-cloudformation'),
       sdkDepForLib('@aws-sdk/client-cloudwatch-logs'),
       sdkDepForLib('@aws-sdk/client-cloudcontrol'),
@@ -1128,6 +1129,7 @@ const cli = configureProject(
       toolkitLib,
       'archiver',
       '@aws-sdk/client-appsync',
+      '@aws-sdk/client-bedrock-agentcore-control',
       '@aws-sdk/client-cloudformation',
       '@aws-sdk/client-cloudwatch-logs',
       '@aws-sdk/client-cloudcontrol',

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js

@@ -32,6 +32,7 @@ if (process.env.PACKAGE_LAYOUT_VERSION === '1') {
     aws_lambda_nodejs: node_lambda,
     aws_ecr_assets: docker,
     aws_appsync: appsync,
+    aws_bedrockagentcore: bedrockagentcore,
     Stack
   } = require('aws-cdk-lib');
 }
@@ -672,6 +673,44 @@ class EcsHotswapStack extends cdk.Stack {
   }
 }
 
+class AgentCoreHotswapStack extends cdk.Stack {
+  constructor(parent, id, props) {
+    super(parent, id, props);
+
+    const role = new iam.Role(this, 'RuntimeRole', {
+      assumedBy: new iam.ServicePrincipal('bedrock-agentcore.amazonaws.com'),
+      managedPolicies: [
+        iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonBedrockFullAccess'),
+      ],
+    });
+
+    const image = new docker.DockerImageAsset(this, 'Image', {
+      directory: path.join(__dirname, 'docker'),
+      platform: docker.Platform.LINUX_ARM64,
+    });
+    image.repository.grantPull(role);
+
+    const runtime = new bedrockagentcore.CfnRuntime(this, 'Runtime', {
+      agentRuntimeName: 'test_runtime',
+      roleArn: role.roleArn,
+      networkConfiguration: {
+        networkMode: 'PUBLIC',
+      },
+      agentRuntimeArtifact: {
+        containerConfiguration: {
+          containerUri: image.imageUri,
+        },
+      },
+      description: process.env.DYNAMIC_BEDROCK_RUNTIME_DESCRIPTION ?? 'runtime',
+      environmentVariables: {
+        TEST_VAR: process.env.DYNAMIC_BEDROCK_RUNTIME_ENV_VAR ?? 'original',
+      },
+    });
+    runtime.node.addDependency(role);
+    new cdk.CfnOutput(this, 'RuntimeId', { value: runtime.ref });
+  }
+}
+
 class DockerStack extends cdk.Stack {
   constructor(parent, id, props) {
     super(parent, id, props);
@@ -928,6 +967,7 @@ switch (stackSet) {
     new SessionTagsWithNoExecutionRoleCustomSynthesizerStack(app, `${stackPrefix}-session-tags-with-custom-synthesizer`);
     new LambdaHotswapStack(app, `${stackPrefix}-lambda-hotswap`);
     new EcsHotswapStack(app, `${stackPrefix}-ecs-hotswap`);
+    new AgentCoreHotswapStack(app, `${stackPrefix}-agentcore-hotswap`);
     new AppSyncHotswapStack(app, `${stackPrefix}-appsync-hotswap`);
     new DockerStack(app, `${stackPrefix}-docker`);
     new DockerInUseStack(app, `${stackPrefix}-docker-in-use`);

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-bedrock-agentcore-runtime.integtest.ts

@@ -0,0 +1,69 @@
+import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation';
+import { integTest, withDefaultFixture } from '../../../lib';
+
+jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
+
+// Bedrock AgentCore Runtime is only available in specific regions
+// Source: https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/agentcore-regions.html
+const SUPPORTED_REGIONS = [
+  'ap-south-1',
+  'ap-southeast-1',
+  'ap-southeast-2',
+  'ap-northeast-1',
+  'eu-west-1',
+  'eu-central-1',
+  'us-east-1',
+  'us-east-2',
+  'us-west-2',
+];
+
+integTest(
+  'hotswap deployment supports Bedrock AgentCore Runtime',
+  withDefaultFixture(async (fixture) => {
+    const currentRegion = fixture.aws.region;
+    if (!SUPPORTED_REGIONS.includes(currentRegion)) {
+      fixture.log(`Skipping test: Bedrock AgentCore Runtime is not supported in region ${currentRegion}`);
+      return;
+    }
+
+    // GIVEN
+    const stackArn = await fixture.cdkDeploy('agentcore-hotswap', {
+      captureStderr: false,
+      modEnv: {
+        DYNAMIC_BEDROCK_RUNTIME_DESCRIPTION: 'original description',
+        DYNAMIC_BEDROCK_RUNTIME_ENV_VAR: 'original value',
+      },
+    });
+
+    // WHEN
+    const deployOutput = await fixture.cdkDeploy('agentcore-hotswap', {
+      options: ['--hotswap'],
+      captureStderr: true,
+      onlyStderr: true,
+      modEnv: {
+        DYNAMIC_BEDROCK_RUNTIME_DESCRIPTION: 'new description',
+        DYNAMIC_BEDROCK_RUNTIME_ENV_VAR: 'new value',
+      },
+    });
+
+    // Extract stack name from ARN (format: arn:aws:cloudformation:region:account:stack/name/id)
+    // Using the full ARN can cause "Stack name cannot exceed 128 characters" error in some cases
+    const stackName = stackArn.split('/')[1];
+
+    const response = await fixture.aws.cloudFormation.send(
+      new DescribeStacksCommand({
+        StackName: stackName,
+      }),
+    );
+    const runtimeId = response.Stacks?.[0].Outputs?.find((output) => output.OutputKey === 'RuntimeId')?.OutputValue;
+
+    // THEN
+
+    // The deployment should not trigger a full deployment, thus the stack's status must remains
+    // "CREATE_COMPLETE"
+    expect(response.Stacks?.[0].StackStatus).toEqual('CREATE_COMPLETE');
+    // The entire string fails locally due to formatting. Making this test less specific
+    expect(deployOutput).toMatch(/hotswapped!/);
+    expect(deployOutput).toContain(runtimeId);
+  }),
+);

packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

@@ -822,6 +822,212 @@ The @aws-cdk/integ-runner package includes the following third-party software/li
    limitations under the License.
 
 
+----------------
+
+** @aws-sdk/client-bedrock-agentcore-control@3.953.0 - https://www.npmjs.com/package/@aws-sdk/client-bedrock-agentcore-control/v/3.953.0 | Apache-2.0
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ----------------
 
 ** @aws-sdk/client-cloudcontrol@3.953.0 - https://www.npmjs.com/package/@aws-sdk/client-cloudcontrol/v/3.953.0 | Apache-2.0