Skip to content

Commit 9fca790

Browse files
authored
2 parents 1130fab + 599517d commit 9fca790

File tree

2,364 files changed

+528987
-60500
lines changed

Some content is hidden

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

2,364 files changed

+528987
-60500
lines changed

.github/dependabot.yml

-18
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,6 @@ updates:
1818
labels:
1919
- "auto-approve"
2020
open-pull-requests-limit: 5
21-
22-
# run same dependabot upgrades on v1-main
23-
- package-ecosystem: "github-actions"
24-
directory: "/"
25-
target-branch: "v1-main"
26-
schedule:
27-
interval: "weekly"
28-
labels:
29-
- "auto-approve"
30-
open-pull-requests-limit: 5
31-
- package-ecosystem: "pip"
32-
directory: "/packages/@aws-cdk/lambda-layer-awscli"
33-
target-branch: "v1-main"
34-
schedule:
35-
interval: "weekly"
36-
labels:
37-
- "auto-approve"
38-
open-pull-requests-limit: 5
3921

4022
# Non-TypeScript init template dependency updates
4123
- package-ecosystem: "pip"

.github/workflows/yarn-upgrade-v1main.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Yarn Upgrade v1-main
22

33
on:
4-
schedule:
5-
# Every wednesday at 13:37 UTC
6-
- cron: 37 13 * * 3
74
workflow_dispatch: {}
85

96
jobs:

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.87.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.86.0-alpha.0...v2.87.0-alpha.0) (2023-07-06)
6+
7+
8+
### Features
9+
10+
* **cli-lib:** support bootstrap command ([#26205](https://github.com/aws/aws-cdk/issues/26205)) ([9364e94](https://github.com/aws/aws-cdk/commit/9364e94d1b343d18d1ceceee2881f2cc59d67980))
11+
* **glue:** add ExecutionClass for FLEX ([#26203](https://github.com/aws/aws-cdk/issues/26203)) ([db923dd](https://github.com/aws/aws-cdk/commit/db923dd2df39d4085ed088d18dc93044e5a0d690)), closes [#22224](https://github.com/aws/aws-cdk/issues/22224)
12+
* **iot:** add action to start Step Functions State Machine ([#26059](https://github.com/aws/aws-cdk/issues/26059)) ([bd86993](https://github.com/aws/aws-cdk/commit/bd86993cb2e528ae036347da82c86276165111e7)), closes [#17698](https://github.com/aws/aws-cdk/issues/17698)
13+
* **scheduler:** ScheduleTargetInput ([#25663](https://github.com/aws/aws-cdk/issues/25663)) ([bc9f3de](https://github.com/aws/aws-cdk/commit/bc9f3de653248de5808f83b7fb8f3ed5f6fc554e))
14+
15+
16+
### Bug Fixes
17+
18+
* **batch:** Allow ECS JobDefinition Containers to pass Secrets as Environment Variables & Enable Kubernetes Secret Volumes ([#26126](https://github.com/aws/aws-cdk/issues/26126)) ([dc6f120](https://github.com/aws/aws-cdk/commit/dc6f120a0bf6c9335a82677e7b3c112245bf06ae)), closes [#25559](https://github.com/aws/aws-cdk/issues/25559)
19+
* **cli-lib:** bundle bootstrap template ([#26229](https://github.com/aws/aws-cdk/issues/26229)) ([41cb288](https://github.com/aws/aws-cdk/commit/41cb2883e637a429c9eeb30c48544b69dbc7b065)), closes [#26224](https://github.com/aws/aws-cdk/issues/26224)
20+
* **glue:** support Ray jobs with Runtime parameter ([#25867](https://github.com/aws/aws-cdk/issues/25867)) ([8153237](https://github.com/aws/aws-cdk/commit/81532375a8745bc7ffb439e53d042b251a43e43e)), closes [#25787](https://github.com/aws/aws-cdk/issues/25787)
21+
522
## [2.86.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.85.0-alpha.0...v2.86.0-alpha.0) (2023-06-29)
623

724

CHANGELOG.v2.md

+20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
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.87.0](https://github.com/aws/aws-cdk/compare/v2.86.0...v2.87.0) (2023-07-06)
6+
7+
8+
### Features
9+
10+
* **cfnspec:** cloudformation spec v129.0.0 ([#26179](https://github.com/aws/aws-cdk/issues/26179)) ([fa3caf3](https://github.com/aws/aws-cdk/commit/fa3caf33360e81d54897edbf3acf5495f488189b))
11+
* **codebuild:** Support for CodeBuild Image `aws/codebuild/amazonlinux2-x86_64-standard:5.0` ([#26058](https://github.com/aws/aws-cdk/issues/26058)) ([bc029fe](https://github.com/aws/aws-cdk/commit/bc029fe5ac69a8b7fd2dfdbcd8834e9a2cf8e000))
12+
* **ecs:** enable alarm-based rollbacks ([#25840](https://github.com/aws/aws-cdk/issues/25840)) ([1a44f69](https://github.com/aws/aws-cdk/commit/1a44f691bba459259417677dde5db248ee5e4584)), closes [#25346](https://github.com/aws/aws-cdk/issues/25346)
13+
* update alpha modules to sdk v3 ([#25895](https://github.com/aws/aws-cdk/issues/25895)) ([0a4140e](https://github.com/aws/aws-cdk/commit/0a4140ee5e709b04bf6c2b67de449eb29ceb01ef))
14+
15+
16+
### Bug Fixes
17+
18+
* all aws-cdk-lib custom resources now use Node18 ([#26212](https://github.com/aws/aws-cdk/issues/26212)) ([399b6bb](https://github.com/aws/aws-cdk/commit/399b6bbdbfbf6440145e6d78e18898aae6261702))
19+
* **aws-cdk-lib:** specifying EC2 private IP with associate public IP enabled generates invalid CFn ([#26208](https://github.com/aws/aws-cdk/issues/26208)) ([1520d77](https://github.com/aws/aws-cdk/commit/1520d7759ad28e5295f21cd1df115c639bb5ef1c)), closes [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html/issues/cfn-ec2) [#26187](https://github.com/aws/aws-cdk/issues/26187)
20+
* **core:** tags disappear if CDK app is bundled+minified ([#26181](https://github.com/aws/aws-cdk/issues/26181)) ([1f81718](https://github.com/aws/aws-cdk/commit/1f8171882ae9c7a75e19f247bfa70c122999d726)), closes [#26169](https://github.com/aws/aws-cdk/issues/26169)
21+
* **rds:** monitoring role is not created by default when using readers and writers ([#26006](https://github.com/aws/aws-cdk/issues/26006)) ([9065b25](https://github.com/aws/aws-cdk/commit/9065b25a6a3812cf186aaddcbc5466d422a40424)), closes [/github.com/aws/aws-cdk/blob/4c9016a264c2fec9c0e0e3fae1d7c4216c964b31/packages/aws-cdk-lib/aws-rds/lib/cluster.ts#L635](https://github.com/aws//github.com/aws/aws-cdk/blob/4c9016a264c2fec9c0e0e3fae1d7c4216c964b31/packages/aws-cdk-lib/aws-rds/lib/cluster.ts/issues/L635) [/github.com/aws/aws-cdk/blob/4c9016a264c2fec9c0e0e3fae1d7c4216c964b31/packages/aws-cdk-lib/aws-rds/lib/cluster.ts#L1228](https://github.com/aws//github.com/aws/aws-cdk/blob/4c9016a264c2fec9c0e0e3fae1d7c4216c964b31/packages/aws-cdk-lib/aws-rds/lib/cluster.ts/issues/L1228) [#25941](https://github.com/aws/aws-cdk/issues/25941)
22+
* **sns-subscriptions:** cannot add Lambda Subscription when using a Lambda Construct from a different Construct Library ([#26206](https://github.com/aws/aws-cdk/issues/26206)) ([06b33d5](https://github.com/aws/aws-cdk/commit/06b33d54c348d78df886c040e702287658573089)), closes [#24788](https://github.com/aws/aws-cdk/issues/24788)
23+
* **ssm:** cannot import a ssm parameter with a name containing unresolved token ([#25749](https://github.com/aws/aws-cdk/issues/25749)) ([1f1b642](https://github.com/aws/aws-cdk/commit/1f1b6426f00031dc0f67b9690d33f718f394733c)), closes [#17094](https://github.com/aws/aws-cdk/issues/17094)
24+
525
## [2.86.0](https://github.com/aws/aws-cdk/compare/v2.85.0...v2.86.0) (2023-06-29)
626

727

lerna.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"tools/@aws-cdk/pkglint",
1919
"tools/@aws-cdk/pkgtools",
2020
"tools/@aws-cdk/prlint",
21+
"tools/@aws-cdk/spec2cdk",
2122
"tools/@aws-cdk/yarn-cling",
2223
"scripts/@aws-cdk/script-tests"
2324
],

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@types/node": "18.11.19",
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
22-
"cdk-generate-synthetic-examples": "^0.1.269",
22+
"cdk-generate-synthetic-examples": "^0.1.287",
2323
"conventional-changelog-cli": "^2.2.2",
2424
"fs-extra": "^9.1.0",
2525
"graceful-fs": "^4.2.11",
@@ -85,6 +85,7 @@
8585
"tools/@aws-cdk/pkglint",
8686
"tools/@aws-cdk/pkgtools",
8787
"tools/@aws-cdk/prlint",
88+
"tools/@aws-cdk/spec2cdk",
8889
"tools/@aws-cdk/yarn-cling",
8990
"scripts/@aws-cdk/script-tests"
9091
],
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

3-
const aws = require('aws-sdk');
3+
const { ACM, waitUntilCertificateValidated } = require('@aws-sdk/client-acm');
4+
const { Route53, waitUntilResourceRecordSetsChanged } = require('@aws-sdk/client-route-53');
45

56
const defaultSleep = function (ms) {
67
return new Promise(resolve => setTimeout(resolve, ms));
@@ -74,12 +75,12 @@ let report = function (event, context, responseStatus, physicalResourceId, respo
7475
*/
7576
const addTags = async function(certificateArn, region, tags) {
7677
const result = Array.from(Object.entries(tags)).map(([Key, Value]) => ({ Key, Value }))
77-
const acm = new aws.ACM({ region });
78+
const acm = new ACM({ region });
7879

7980
await acm.addTagsToCertificate({
8081
CertificateArn: certificateArn,
8182
Tags: result,
82-
}).promise();
83+
});
8384
}
8485

8586
/**
@@ -96,12 +97,8 @@ const addTags = async function(certificateArn, region, tags) {
9697
*/
9798
const requestCertificate = async function (requestId, domainName, subjectAlternativeNames, certificateTransparencyLoggingPreference, hostedZoneId, region, route53Endpoint) {
9899
const crypto = require('crypto');
99-
const acm = new aws.ACM({ region });
100-
const route53 = route53Endpoint ? new aws.Route53({ endpoint: route53Endpoint }) : new aws.Route53();
101-
if (waiter) {
102-
// Used by the test suite, since waiters aren't mockable yet
103-
route53.waitFor = acm.waitFor = waiter;
104-
}
100+
const acm = new ACM({ region });
101+
const route53 = route53Endpoint ? new Route53({ endpoint: route53Endpoint }) : new Route53();
105102

106103
console.log(`Requesting certificate for ${domainName}`);
107104

@@ -113,7 +110,7 @@ const requestCertificate = async function (requestId, domainName, subjectAlterna
113110
},
114111
IdempotencyToken: crypto.createHash('sha256').update(requestId).digest('hex').slice(0, 32),
115112
ValidationMethod: 'DNS'
116-
}).promise();
113+
});
117114

118115
console.log(`Certificate ARN: ${reqCertResponse.CertificateArn}`);
119116

@@ -123,7 +120,7 @@ const requestCertificate = async function (requestId, domainName, subjectAlterna
123120
for (let attempt = 0; attempt < maxAttempts && !records.length; attempt++) {
124121
const { Certificate } = await acm.describeCertificate({
125122
CertificateArn: reqCertResponse.CertificateArn
126-
}).promise();
123+
});
127124

128125
records = getDomainValidationRecords(Certificate);
129126
if (!records.length) {
@@ -143,14 +140,13 @@ const requestCertificate = async function (requestId, domainName, subjectAlterna
143140
await commitRoute53Records(route53, records, hostedZoneId);
144141

145142
console.log('Waiting for validation...');
146-
await acm.waitFor('certificateValidated', {
147-
// Wait up to 9 minutes and 30 seconds
148-
$waiter: {
149-
delay: 30,
150-
maxAttempts: 19
151-
},
143+
await waitUntilCertificateValidated({
144+
client: acm,
145+
maxAttempts: 19,
146+
delay: 30,
147+
}, {
152148
CertificateArn: reqCertResponse.CertificateArn
153-
}).promise();
149+
})
154150

155151
return reqCertResponse.CertificateArn;
156152
};
@@ -162,12 +158,8 @@ const requestCertificate = async function (requestId, domainName, subjectAlterna
162158
* @param {string} arn The certificate ARN
163159
*/
164160
const deleteCertificate = async function (arn, region, hostedZoneId, route53Endpoint, cleanupRecords) {
165-
const acm = new aws.ACM({ region });
166-
const route53 = route53Endpoint ? new aws.Route53({ endpoint: route53Endpoint }) : new aws.Route53();
167-
if (waiter) {
168-
// Used by the test suite, since waiters aren't mockable yet
169-
route53.waitFor = acm.waitFor = waiter;
170-
}
161+
const acm = new ACM({ region });
162+
const route53 = route53Endpoint ? new Route53({ endpoint: route53Endpoint }) : new Route53();
171163

172164
try {
173165
console.log(`Waiting for certificate ${arn} to become unused`);
@@ -177,7 +169,7 @@ const deleteCertificate = async function (arn, region, hostedZoneId, route53Endp
177169
for (let attempt = 0; attempt < maxAttempts; attempt++) {
178170
const { Certificate } = await acm.describeCertificate({
179171
CertificateArn: arn
180-
}).promise();
172+
});
181173

182174
if (cleanupRecords) {
183175
records = getDomainValidationRecords(Certificate);
@@ -206,7 +198,7 @@ const deleteCertificate = async function (arn, region, hostedZoneId, route53Endp
206198

207199
await acm.deleteCertificate({
208200
CertificateArn: arn
209-
}).promise();
201+
});
210202

211203
if (cleanupRecords) {
212204
console.log(`Deleting ${records.length} DNS records from zone ${hostedZoneId}:`);
@@ -268,17 +260,16 @@ async function commitRoute53Records(route53, records, hostedZoneId, action = 'UP
268260
}),
269261
},
270262
HostedZoneId: hostedZoneId
271-
}).promise();
263+
});
272264

273265
console.log('Waiting for DNS records to commit...');
274-
await route53.waitFor('resourceRecordSetsChanged', {
275-
// Wait up to 5 minutes
276-
$waiter: {
277-
delay: 30,
278-
maxAttempts: 10
279-
},
280-
Id: changeBatch.ChangeInfo.Id
281-
}).promise();
266+
await waitUntilResourceRecordSetsChanged({
267+
client: route53,
268+
delay: 30,
269+
maxAttempts: 10,
270+
}, {
271+
Id: changeBatch.ChangeInfo.Id,
272+
});
282273
}
283274

284275
/**
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"31.0.0"}
1+
{"version":"32.0.0"}

packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ-dns-validated-certificate.assets.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"version": "31.0.0",
2+
"version": "32.0.0",
33
"files": {
4-
"ef671dfd26b6dde1f73a4325587504813605a928622ebc466f4d0de6a0f3b672": {
4+
"fb83c347f6a5e3099f787c17ce0845a70a81fd83fdc20eb2e4e1cb01961a8774": {
55
"source": {
6-
"path": "asset.ef671dfd26b6dde1f73a4325587504813605a928622ebc466f4d0de6a0f3b672",
6+
"path": "asset.fb83c347f6a5e3099f787c17ce0845a70a81fd83fdc20eb2e4e1cb01961a8774",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "ef671dfd26b6dde1f73a4325587504813605a928622ebc466f4d0de6a0f3b672.zip",
12+
"objectKey": "fb83c347f6a5e3099f787c17ce0845a70a81fd83fdc20eb2e4e1cb01961a8774.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
1616
},
17-
"1827f8b3dae882f9c01e1f56ed8c5cecc88fee8a12a8fd410bc83dd7835622bd": {
17+
"14e61dd74326fa816025a92898ba02959dd7100dccf670dec73afb2e3b13b29c": {
1818
"source": {
1919
"path": "integ-dns-validated-certificate.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "1827f8b3dae882f9c01e1f56ed8c5cecc88fee8a12a8fd410bc83dd7835622bd.json",
25+
"objectKey": "14e61dd74326fa816025a92898ba02959dd7100dccf670dec73afb2e3b13b29c.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

0 commit comments

Comments
 (0)