Skip to content

Commit 7e77e02

Browse files
authored
2 parents d86bb1a + dc2dde6 commit 7e77e02

File tree

277 files changed

+90924
-2475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+90924
-2475
lines changed

.github/workflows/github-merit-badger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f
22+
uses: tj-actions/changed-files@62f4729b5df35e6e0e01265fa70a82ccaf196b4b
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

.github/workflows/sync-from-upstream.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ jobs:
1111

1212
# Check for the presence of a PROJEN_GITHUB_TOKEN secret.
1313
#
14-
# This is expected to contain a personal access token of someone
15-
# who pas permissions to bypass branch protection rules.
14+
# This is expected to contain a personal access token of someone who has
15+
# permissions to bypass branch protection rules.
1616
#
17-
# If not present, we will use GitHub Actions Token permissions,
18-
# but those are bound by branch protection rules.
17+
# If not present, we can only use GitHub Actions Token permissions,
18+
# but this has the following downsides:
19+
#
20+
# - Those are bound by branch protection rules (so automated pushing won't work).
21+
# - As soon as a workflow file needs to be changed, GitHub will reject the push.
22+
# Only Apps and Users can be allowed to modify workflows.
1923
check-secret:
2024
# Don't run on the target repo itself, only forks
2125
if: github.repository != 'aws/aws-cdk'
@@ -52,7 +56,7 @@ jobs:
5256
- name: Sync from aws/aws-cdk
5357
run: |-
5458
git remote add upstream https://github.com/aws/aws-cdk.git
55-
git fetch upstream
59+
git fetch upstream $BRANCHES
5660
5761
for branch in $BRANCHES; do
5862
git push origin --force refs/remotes/upstream/$branch:refs/heads/$branch

.mergify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pull_request_rules:
1111
label:
1212
add: [ contribution/core ]
1313
conditions:
14-
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ)$
14+
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore)$
1515
- -label~="contribution/core"
1616
- name: automatic merge
1717
actions:

CHANGELOG.v2.alpha.md

+17
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.122.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.121.1-alpha.0...v2.122.0-alpha.0) (2024-01-18)
6+
7+
8+
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
9+
10+
* **appconfig:** `deploymentStrategyId` prop in `fromDeploymentStrategyId` now takes a `DeploymentStrategyId` rather than a `string`. To import a predefined deployment strategy id, use `DeploymentStrategyId.CANARY_10_PERCENT_20_MINUTES`. Otherwise, use `DeploymentStrategyId.fromString('abc123')`.
11+
* **appconfig:** `ApplicationProps.name` renamed to `ApplicationProps.applicationName`
12+
- **appconfig**: `EnvironmentProps.name` renamed to `EnvironmentProps.environmentName`
13+
- **appconfig**: `DeploymentStrategyProps.name` renamed to `DeploymentStrategyProps.deploymentStrategyName`
14+
- **appconfig**: `ExtensionProps.name` renamed to `ExtensionProps.extensionName`
15+
16+
### Bug Fixes
17+
18+
* **amplify:** addBranch fails synth with "cannot find entry file..." ([#28658](https://github.com/aws/aws-cdk/issues/28658)) ([0f2b8f8](https://github.com/aws/aws-cdk/commit/0f2b8f8e329480cd35db1dc9792bff6d2f0a990a)), closes [#27955](https://github.com/aws/aws-cdk/issues/27955) [#28633](https://github.com/aws/aws-cdk/issues/28633) [#28089](https://github.com/aws/aws-cdk/issues/28089)
19+
* **appconfig:** fromDeploymentStrategyId takes an enum-like class rather than a string ([#28743](https://github.com/aws/aws-cdk/issues/28743)) ([2b59ed1](https://github.com/aws/aws-cdk/commit/2b59ed1b54b5b83f22020ed5f2c4b77c6a1292f8)), closes [#28671](https://github.com/aws/aws-cdk/issues/28671)
20+
* **appconfig:** prefix names with resource name ([#28742](https://github.com/aws/aws-cdk/issues/28742)) ([3960720](https://github.com/aws/aws-cdk/commit/396072025ea1282dd28e14158afe339c393bf0d5)), closes [#28671](https://github.com/aws/aws-cdk/issues/28671)
21+
522
## [2.121.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.121.0-alpha.0...v2.121.1-alpha.0) (2024-01-13)
623

724
## [2.121.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.120.0-alpha.0...v2.121.0-alpha.0) (2024-01-12)

CHANGELOG.v2.md

+36
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,42 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.122.0](https://github.com/aws/aws-cdk/compare/v2.121.1...v2.122.0) (2024-01-18)
6+
7+
8+
### Features
9+
10+
* **CodePipelineActions:** Add support for custom events in CodeCommit source action ([#28008](https://github.com/aws/aws-cdk/issues/28008)) ([c3802c4](https://github.com/aws/aws-cdk/commit/c3802c401a9b75bd642456c320168748ea37e511)), closes [#12045](https://github.com/aws/aws-cdk/issues/12045)
11+
* **ec2:** add dual stack vpc support ([#28480](https://github.com/aws/aws-cdk/issues/28480)) ([caf83f1](https://github.com/aws/aws-cdk/commit/caf83f1ebe65b4e3aa6f7bf8814fecbcc8f5484f)), closes [#894](https://github.com/aws/aws-cdk/issues/894)
12+
* **ecs:** L2 for ebs task attach ([#28691](https://github.com/aws/aws-cdk/issues/28691)) ([fc0a89a](https://github.com/aws/aws-cdk/commit/fc0a89a392209324a4834389722656da8fe5e0d4))
13+
* **ecs:** support for capacity provider managed instance draining ([#28672](https://github.com/aws/aws-cdk/issues/28672)) ([aaa2a09](https://github.com/aws/aws-cdk/commit/aaa2a09c3ec88760c983332278f33e0e379a6c0c))
14+
* **efs:** One-Zone filesystem ([#28501](https://github.com/aws/aws-cdk/issues/28501)) ([c0085d5](https://github.com/aws/aws-cdk/commit/c0085d50004f288b011658c4f8b0404787fdceab)), closes [/github.com/aws/aws-cdk/issues/15864#issuecomment-895483167](https://github.com/aws//github.com/aws/aws-cdk/issues/15864/issues/issuecomment-895483167) [#15864](https://github.com/aws/aws-cdk/issues/15864)
15+
* **efs:** transition to archive for `FileSystem` ([#28719](https://github.com/aws/aws-cdk/issues/28719)) ([03c08b0](https://github.com/aws/aws-cdk/commit/03c08b02e6e9edbca1a2e658dbd9ce1615e4dbf1)), closes [#28720](https://github.com/aws/aws-cdk/issues/28720)
16+
* **elbv2:** Implement IConnectable to NLB ([#28494](https://github.com/aws/aws-cdk/issues/28494)) ([1e69cc6](https://github.com/aws/aws-cdk/commit/1e69cc6e56516e8053880c334e319b1d5a829eef)), closes [#26735](https://github.com/aws/aws-cdk/issues/26735)
17+
* **firehose-destinations-alpha:** support zero buffering ([#28716](https://github.com/aws/aws-cdk/issues/28716)) ([db2e78e](https://github.com/aws/aws-cdk/commit/db2e78ea1e5c712ec02fb6d20ab42bb55f895b7a)), closes [#28714](https://github.com/aws/aws-cdk/issues/28714)
18+
* **lambda:** deprecate `logRetention` properties in favor of `logGroup` ([#28737](https://github.com/aws/aws-cdk/issues/28737)) ([4a09720](https://github.com/aws/aws-cdk/commit/4a0972039b67737191962e09156a2dc22c87c445))
19+
* **rds:** Add log group property to RDS instance and RDS cluster ([#28676](https://github.com/aws/aws-cdk/issues/28676)) ([9aa7281](https://github.com/aws/aws-cdk/commit/9aa728172857f1e274d5e08b2587ed91ab0d5a2b))
20+
* **route53:** weighted routing ([#28705](https://github.com/aws/aws-cdk/issues/28705)) ([4a0c24d](https://github.com/aws/aws-cdk/commit/4a0c24db50d99cd09c3b02c07617a71b49979f5f)), closes [#26753](https://github.com/aws/aws-cdk/issues/26753)
21+
* update L1 CloudFormation resource definitions ([#28677](https://github.com/aws/aws-cdk/issues/28677)) ([b2c60cb](https://github.com/aws/aws-cdk/commit/b2c60cb5cd3ee9b4f429b094c1ee6b6176708b7f)), closes [/docs.aws.amazon.com/transfer/latest/userguide/create-b2b-server.html#configure-as2](https://github.com/aws//docs.aws.amazon.com/transfer/latest/userguide/create-b2b-server.html/issues/configure-as2)
22+
* update L1 CloudFormation resource definitions ([#28684](https://github.com/aws/aws-cdk/issues/28684)) ([cbe2378](https://github.com/aws/aws-cdk/commit/cbe23787dfb4a47759a202bbea7faf61b449d097)), closes [/docs.aws.amazon.com/kendra/latest/dg/ds-schemas.html#ds-s3](https://github.com/aws//docs.aws.amazon.com/kendra/latest/dg/ds-schemas.html/issues/ds-s3)
23+
24+
25+
### Bug Fixes
26+
27+
* **cli:** program execution fails without debug information ([#28687](https://github.com/aws/aws-cdk/issues/28687)) ([8fbd385](https://github.com/aws/aws-cdk/commit/8fbd385cb1cac8f309554d15bed738ea756b1b09))
28+
* **cli:** running the cli with --debug does not print stack traces ([#28669](https://github.com/aws/aws-cdk/issues/28669)) ([dd04725](https://github.com/aws/aws-cdk/commit/dd047257c6d8b717c79440d9d50274e4204e9604))
29+
* **cloudformation-diff:** Fix aws-sdk dependency issue ([#28680](https://github.com/aws/aws-cdk/issues/28680)) ([109b2ab](https://github.com/aws/aws-cdk/commit/109b2abe4c713624e731afa1b82c3c1a3ba064c9)), closes [#28679](https://github.com/aws/aws-cdk/issues/28679)
30+
* **ec2:** max iops value for io2 EBS volume is wrong ([#28695](https://github.com/aws/aws-cdk/issues/28695)) ([a30a205](https://github.com/aws/aws-cdk/commit/a30a2058de1af3201e3316ce73ee8ad5f2907ec6)), closes [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html/issues/cfn-ec2)
31+
* **ecs:** EC2 metadata access is blocked when using EC2 capacity provider for autoscaling ([#28437](https://github.com/aws/aws-cdk/issues/28437)) ([30a0d33](https://github.com/aws/aws-cdk/commit/30a0d3314dfd0ad40a56cc7c69a1ccbefe1e1871)), closes [/github.com/aws/aws-cdk/blame/2d9de189e583186f2b77386ae4fcfff42c864568/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts#L502-L504](https://github.com/aws//github.com/aws/aws-cdk/blame/2d9de189e583186f2b77386ae4fcfff42c864568/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts/issues/L502-L504) [#28270](https://github.com/aws/aws-cdk/issues/28270) [#28270](https://github.com/aws/aws-cdk/issues/28270)
32+
* **lambda:** circular dependencies when EFS and Lambda are deployed in separate stacks ([#28560](https://github.com/aws/aws-cdk/issues/28560)) ([6e9045f](https://github.com/aws/aws-cdk/commit/6e9045fc17f444194b44751e0e6e6861f534deb0)), closes [/github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-lambda/lib/function.ts#L1416](https://github.com/aws//github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-lambda/lib/function.ts/issues/L1416) [/github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts#L157](https://github.com/aws//github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts/issues/L157) [/github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts#L84](https://github.com/aws//github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts/issues/L84) [/github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts#L139](https://github.com/aws//github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts/issues/L139) [/github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts#L141](https://github.com/aws//github.com/aws/aws-cdk/blob/dde59755cb71aee73a58f3b2c2068f2ae01e9b72/packages/aws-cdk-lib/aws-ec2/lib/connections.ts/issues/L141) [#18759](https://github.com/aws/aws-cdk/issues/18759)
33+
* **opensearchservice:** OpenSearchAccessPolicy unnecessarily attempts to install latest sdk version ([#28688](https://github.com/aws/aws-cdk/issues/28688)) ([d07deec](https://github.com/aws/aws-cdk/commit/d07deec4435e75c71cec6965e40b5282edfb55b1))
34+
* **rds:** RDS Parameter Group doesn't support custom removal policy ([#28660](https://github.com/aws/aws-cdk/issues/28660)) ([617a595](https://github.com/aws/aws-cdk/commit/617a5957d599904c4de21c1981418a7eafd38cf2))
35+
36+
37+
### Reverts
38+
39+
* allowing log group config for SFN CR ([#28699](https://github.com/aws/aws-cdk/issues/28699)) ([8a67f39](https://github.com/aws/aws-cdk/commit/8a67f3995a358f420dae36b3c6ada0055fe0b058)), closes [#27310](https://github.com/aws/aws-cdk/issues/27310)
40+
541
## [2.121.1](https://github.com/aws/aws-cdk/compare/v2.121.0...v2.121.1) (2024-01-13)
642

743

ROADMAP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Security and stability of the CDK is a top priority. If you think you’ve found
4848
* 👂🏽 [CDK CLI Triggers](https://github.com/aws/aws-cdk-rfcs/issues/228) - CLI enhancements are also being considered for post command hooks.
4949

5050
### L2 Abstractions
51+
* 🚀 [Enabling IPv6 on Resources and VPCs](https://github.com/aws/aws-cdk/pull/28366)
5152
* 🔍 [CloudFront Origin Access Control L2](https://github.com/aws/aws-cdk-rfcs/issues/491)
52-
* 🛠️ [Enabling IPv6 on Resources and VPCs](https://github.com/aws/aws-cdk/pull/28366)
5353
* 🔍 [Rewrite EKS L2](https://github.com/aws/aws-cdk-rfcs/issues/605) - drop the custom resource implementation in favor of the native L1.
5454

5555
We are currently investigating other L2s to build out next. Feel free to create an RFC to request.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"jsii-diff": "1.94.0",
2929
"jsii-pacmak": "1.94.0",
3030
"jsii-reflect": "1.94.0",
31-
"jsii-rosetta": "~5.3.3",
31+
"jsii-rosetta": "~5.3.4",
3232
"lerna": "^7.4.2",
3333
"nx": "^16.10.0",
3434
"patch-package": "^6.5.1",

packages/@aws-cdk-testing/cli-integ/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1532.0",
42+
"aws-sdk": "^2.1537.0",
4343
"axios": "^1.6.5",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",

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

+14-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class YourStack extends cdk.Stack {
6565
}
6666
}
6767

68-
class ImportableStack extends cdk.Stack {
68+
class MigrateStack extends cdk.Stack {
6969
constructor(parent, id, props) {
7070
super(parent, id, props);
7171

@@ -77,11 +77,22 @@ class ImportableStack extends cdk.Stack {
7777
new cdk.CfnOutput(this, 'QueueName', {
7878
value: queue.queueName,
7979
});
80+
81+
new cdk.CfnOutput(this, 'QueueUrl', {
82+
value: queue.queueUrl,
83+
});
84+
8085
new cdk.CfnOutput(this, 'QueueLogicalId', {
8186
value: queue.node.defaultChild.logicalId,
8287
});
8388
}
8489

90+
}
91+
}
92+
93+
class ImportableStack extends MigrateStack {
94+
constructor(parent, id, props) {
95+
super(parent, id, props);
8596
new cdk.CfnWaitConditionHandle(this, 'Handle');
8697
}
8798
}
@@ -470,6 +481,8 @@ switch (stackSet) {
470481

471482
new ImportableStack(app, `${stackPrefix}-importable-stack`);
472483

484+
new MigrateStack(app, `${stackPrefix}-migrate-stack`);
485+
473486
new ExportValueStack(app, `${stackPrefix}-export-value-stack`);
474487

475488
new BundlingStage(app, `${stackPrefix}-bundling-stage`);

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

+39
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,45 @@ integTest('test resource import', withDefaultFixture(async (fixture) => {
12131213
}
12141214
}));
12151215

1216+
integTest('test migrate deployment for app with localfile source in migrate.json', withDefaultFixture(async (fixture) => {
1217+
const outputsFile = path.join(fixture.integTestDir, 'outputs', 'outputs.json');
1218+
await fs.mkdir(path.dirname(outputsFile), { recursive: true });
1219+
1220+
// Initial deploy
1221+
await fixture.cdkDeploy('migrate-stack', {
1222+
modEnv: { ORPHAN_TOPIC: '1' },
1223+
options: ['--outputs-file', outputsFile],
1224+
});
1225+
1226+
const outputs = JSON.parse((await fs.readFile(outputsFile, { encoding: 'utf-8' })).toString());
1227+
const stackName = fixture.fullStackName('migrate-stack');
1228+
const queueName = outputs[stackName].QueueName;
1229+
const queueUrl = outputs[stackName].QueueUrl;
1230+
const queueLogicalId = outputs[stackName].QueueLogicalId;
1231+
fixture.log(`Created queue ${queueUrl} in stack ${fixture.fullStackName}`);
1232+
1233+
// Write the migrate file based on the ID from step one, then deploy the app with migrate
1234+
const migrateFile = path.join(fixture.integTestDir, 'migrate.json');
1235+
await fs.writeFile(
1236+
migrateFile, JSON.stringify(
1237+
{ Source: 'localfile', Resources: [{ ResourceType: 'AWS::SQS::Queue', LogicalResourceId: queueLogicalId, ResourceIdentifier: { QueueUrl: queueUrl } }] },
1238+
),
1239+
{ encoding: 'utf-8' },
1240+
);
1241+
1242+
await fixture.cdkDestroy('migrate-stack');
1243+
fixture.log(`Deleted stack ${fixture.fullStackName}, orphaning ${queueName}`);
1244+
1245+
// Create new stack from existing queue
1246+
try {
1247+
fixture.log(`Deploying new stack ${fixture.fullStackName}, migrating ${queueName} into stack`);
1248+
await fixture.cdkDeploy('migrate-stack');
1249+
} finally {
1250+
// Cleanup
1251+
await fixture.cdkDestroy('migrate-stack');
1252+
}
1253+
}));
1254+
12161255
integTest('hotswap deployment supports Lambda function\'s description and environment variables', withDefaultFixture(async (fixture) => {
12171256
// GIVEN
12181257
const stackArn = await fixture.cdkDeploy('lambda-hotswap', {

packages/@aws-cdk-testing/framework-integ/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
"@aws-cdk/integ-tests-alpha": "0.0.0",
4242
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
4343
"aws-cdk-lib": "0.0.0",
44-
"aws-sdk": "^2.1532.0",
44+
"aws-sdk": "^2.1537.0",
4545
"aws-sdk-mock": "5.6.0",
46-
"cdk8s": "2.68.25",
47-
"cdk8s-plus-27": "2.7.71",
46+
"cdk8s": "2.68.27",
47+
"cdk8s-plus-27": "2.7.73",
4848
"constructs": "^10.0.0"
4949
},
5050
"repository": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { CodePipelineClient, StartPipelineExecutionCommand } from '@aws-sdk/client-codepipeline';
2+
const codepipeline = new CodePipelineClient({});
3+
4+
export const handler = async () => {
5+
const command = new StartPipelineExecutionCommand({
6+
name: 'IntegCustomEventPipeline',
7+
});
8+
await codepipeline.send(command);
9+
};

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-custom-event.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)