Skip to content

Commit b04f852

Browse files
authored
2 parents 20bda4f + e12f8ed commit b04f852

File tree

165 files changed

+4430
-840
lines changed

Some content is hidden

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

165 files changed

+4430
-840
lines changed

.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@
1111
*.jpg binary
1212
*.tgz binary
1313
*.tar.gz binary
14+
15+
# Hide snapshots from GitHub UI, except for the actual templates
16+
**/*.snapshot/** linguist-generated
17+
**/*.snapshot/**/*.template.json -linguist-generated
18+
**/*.snapshot/**/*DeployAssert*.template.json linguist-generated

.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@76c4d81a6acd339b55bd7407a016981c853eb702
22+
uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

CHANGELOG.v2.alpha.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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.98.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.97.1-alpha.0...v2.98.0-alpha.0) (2023-09-26)
6+
7+
8+
### Features
9+
10+
* **scheduler:** disable Schedule on creation ([#27236](https://github.com/aws/aws-cdk/issues/27236)) ([193cd3f](https://github.com/aws/aws-cdk/commit/193cd3f575974e4058fcec957640a3d28d114fd1))
11+
512
## [2.97.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.97.0-alpha.0...v2.97.1-alpha.0) (2023-09-25)
613

714
## [2.97.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.2-alpha.0...v2.97.0-alpha.0) (2023-09-22)

CHANGELOG.v2.md

+13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
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.98.0](https://github.com/aws/aws-cdk/compare/v2.97.1...v2.98.0) (2023-09-26)
6+
7+
8+
### Features
9+
10+
* update AWS Service Spec ([#27276](https://github.com/aws/aws-cdk/issues/27276)) ([3d9ca8d](https://github.com/aws/aws-cdk/commit/3d9ca8dad29e6e6f813ab2340da7639c24ba5494))
11+
* **aws-cdk-lib:** reduce load time of JavaScript library ([#27217](https://github.com/aws/aws-cdk/issues/27217)) ([faffce0](https://github.com/aws/aws-cdk/commit/faffce06c3f1d543600f7e8dc430a5105c73ac5a))
12+
13+
14+
### Bug Fixes
15+
16+
* **rds:** prevent rendering deprecated credentials when creating a database cluster from a snapshot (under feature flag) ([#27174](https://github.com/aws/aws-cdk/issues/27174)) ([1fd22a7](https://github.com/aws/aws-cdk/commit/1fd22a7498223ae5d2faf1799056e81be4f71f5c)), closes [#23815](https://github.com/aws/aws-cdk/issues/23815)
17+
518
## [2.97.1](https://github.com/aws/aws-cdk/compare/v2.97.0...v2.97.1) (2023-09-25)
619

720

lerna.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"tools/@aws-cdk/prlint",
2121
"tools/@aws-cdk/spec2cdk",
2222
"tools/@aws-cdk/yarn-cling",
23+
"tools/@aws-cdk/lazify",
2324
"scripts/@aws-cdk/script-tests"
2425
],
2526
"rejectCycles": true,

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
"tools/@aws-cdk/prlint",
8989
"tools/@aws-cdk/spec2cdk",
9090
"tools/@aws-cdk/yarn-cling",
91+
"tools/@aws-cdk/lazify",
9192
"scripts/@aws-cdk/script-tests"
9293
],
9394
"nohoist": [

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

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as path from 'path';
2+
import * as fs from 'fs-extra';
13
import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '../../lib';
24

35
['app', 'sample-app'].forEach(template => {
@@ -13,3 +15,43 @@ import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '..
1315
await shell.shell(['cdk', 'synth']);
1416
})));
1517
});
18+
19+
integTest('Test importing CDK from ESM', withTemporaryDirectory(withPackages(async (context) => {
20+
// Use 'cdk init -l=javascript' to get set up, but use a different file
21+
const shell = ShellHelper.fromContext(context);
22+
await context.packages.makeCliAvailable();
23+
24+
await shell.shell(['cdk', 'init', '-l', 'javascript', 'app']);
25+
26+
// Rewrite some files
27+
await fs.writeFile(path.join(context.integTestDir, 'new-entrypoint.mjs'), `
28+
// Test two styles of imports
29+
import { Stack, aws_sns as sns, aws_sns_subscriptions as subs, aws_sqs as sqs } from 'aws-cdk-lib';
30+
import * as cdk from 'aws-cdk-lib';
31+
32+
class TestjsStack extends Stack {
33+
constructor(scope, id, props) {
34+
super(scope, id, props);
35+
36+
const queue = new sqs.Queue(this, 'TestjsQueue', {
37+
visibilityTimeout: cdk.Duration.seconds(300)
38+
});
39+
40+
const topic = new sns.Topic(this, 'TestjsTopic');
41+
42+
topic.addSubscription(new subs.SqsSubscription(queue));
43+
}
44+
}
45+
46+
const app = new cdk.App();
47+
new TestjsStack(app, 'TestjsStack');
48+
`, { encoding: 'utf-8' });
49+
50+
// Rewrite 'cdk.json' to use new entrypoint
51+
const cdkJson = await fs.readJson(path.join(context.integTestDir, 'cdk.json'));
52+
cdkJson.app = 'node new-entrypoint.mjs';
53+
await fs.writeJson(path.join(context.integTestDir, 'cdk.json'), cdkJson);
54+
55+
await shell.shell(['cdk', 'synth']);
56+
57+
})));

packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.assets.json

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

packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json

+8-44
Original file line numberDiff line numberDiff line change
@@ -426,12 +426,12 @@
426426
"Type": "AWS::RDS::DBCluster",
427427
"Properties": {
428428
"CopyTagsToSnapshot": true,
429-
"DBClusterParameterGroupName": "default.aurora-mysql5.7",
429+
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
430430
"DBSubnetGroupName": {
431431
"Ref": "ClusterSubnetsDCFA5CB7"
432432
},
433433
"Engine": "aurora-mysql",
434-
"EngineVersion": "5.7.mysql_aurora.2.10.2",
434+
"EngineVersion": "8.0.mysql_aurora.3.04.0",
435435
"MasterUserPassword": {
436436
"Fn::Join": [
437437
"",
@@ -474,7 +474,7 @@
474474
"DBClusterIdentifier": {
475475
"Ref": "ClusterEB0386A7"
476476
},
477-
"DBInstanceClass": "db.t3.small",
477+
"DBInstanceClass": "db.t3.medium",
478478
"DBSubnetGroupName": {
479479
"Ref": "ClusterSubnetsDCFA5CB7"
480480
},
@@ -495,7 +495,7 @@
495495
"DBClusterIdentifier": {
496496
"Ref": "ClusterEB0386A7"
497497
},
498-
"DBInstanceClass": "db.t3.small",
498+
"DBInstanceClass": "db.t3.medium",
499499
"DBSubnetGroupName": {
500500
"Ref": "ClusterSubnetsDCFA5CB7"
501501
},
@@ -1357,42 +1357,6 @@
13571357
}
13581358
}
13591359
},
1360-
"FromSnapshotSecret9100F61C": {
1361-
"Type": "AWS::SecretsManager::Secret",
1362-
"Properties": {
1363-
"Description": {
1364-
"Fn::Join": [
1365-
"",
1366-
[
1367-
"Generated by the CDK for stack: ",
1368-
{
1369-
"Ref": "AWS::StackName"
1370-
}
1371-
]
1372-
]
1373-
},
1374-
"GenerateSecretString": {
1375-
"ExcludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\",
1376-
"GenerateStringKey": "password",
1377-
"PasswordLength": 30,
1378-
"SecretStringTemplate": "{\"username\":\"admin\"}"
1379-
}
1380-
},
1381-
"UpdateReplacePolicy": "Delete",
1382-
"DeletionPolicy": "Delete"
1383-
},
1384-
"FromSnapshotSecretAttachmentB62DA1C6": {
1385-
"Type": "AWS::SecretsManager::SecretTargetAttachment",
1386-
"Properties": {
1387-
"SecretId": {
1388-
"Ref": "FromSnapshotSecret9100F61C"
1389-
},
1390-
"TargetId": {
1391-
"Ref": "FromSnapshotEE0682C5"
1392-
},
1393-
"TargetType": "AWS::RDS::DBCluster"
1394-
}
1395-
},
13961360
"cdkintegclustersnapshotFromSnapshotSnapshotSecretD93327943fdaad7efa858a3daf9490cf0a702aeb": {
13971361
"Type": "AWS::SecretsManager::Secret",
13981362
"Properties": {
@@ -1486,12 +1450,12 @@
14861450
"Type": "AWS::RDS::DBCluster",
14871451
"Properties": {
14881452
"CopyTagsToSnapshot": true,
1489-
"DBClusterParameterGroupName": "default.aurora-mysql5.7",
1453+
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
14901454
"DBSubnetGroupName": {
14911455
"Ref": "FromSnapshotSubnets9ED4B8EE"
14921456
},
14931457
"Engine": "aurora-mysql",
1494-
"EngineVersion": "5.7.mysql_aurora.2.10.2",
1458+
"EngineVersion": "8.0.mysql_aurora.3.04.0",
14951459
"MasterUserPassword": {
14961460
"Fn::Join": [
14971461
"",
@@ -1528,7 +1492,7 @@
15281492
"DBClusterIdentifier": {
15291493
"Ref": "FromSnapshotEE0682C5"
15301494
},
1531-
"DBInstanceClass": "db.t3.small",
1495+
"DBInstanceClass": "db.t3.medium",
15321496
"DBSubnetGroupName": {
15331497
"Ref": "FromSnapshotSubnets9ED4B8EE"
15341498
},
@@ -1549,7 +1513,7 @@
15491513
"DBClusterIdentifier": {
15501514
"Ref": "FromSnapshotEE0682C5"
15511515
},
1552-
"DBInstanceClass": "db.t3.small",
1516+
"DBInstanceClass": "db.t3.medium",
15531517
"DBSubnetGroupName": {
15541518
"Ref": "FromSnapshotSubnets9ED4B8EE"
15551519
},

packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/manifest.json

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

0 commit comments

Comments
 (0)