Skip to content

Commit 78a0106

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.97.0
2 parents d7cf3be + 5ae9099 commit 78a0106

File tree

132 files changed

+4702
-643
lines changed

Some content is hidden

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

132 files changed

+4702
-643
lines changed

‎lerna.json

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 42 additions & 0 deletions
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-entrypoing.mjs';
53+
await fs.writeJson(path.join(context.integTestDir, 'cdk.json'), cdkJson);
54+
55+
await shell.shell(['cdk', 'synth']);
56+
57+
})));

‎packages/@aws-cdk/app-staging-synthesizer-alpha/awslint.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"exclude": [
3+
"construct-ctor:@aws-cdk/app-staging-synthesizer-alpha.DefaultStagingStack.<initializer>.params[0]",
4+
"props-no-arn-refs:@aws-cdk/app-staging-synthesizer-alpha.DefaultStagingStackProps.deployRoleArn"
5+
]
6+
}

‎packages/@aws-cdk/aws-amplify-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-amplify-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@
104104
},
105105
"stability": "experimental",
106106
"maturity": "experimental",
107-
"awslint": {
108-
"exclude": [
109-
"*:*"
110-
]
111-
},
112107
"awscdkio": {
113108
"announce": false
114109
},

‎packages/@aws-cdk/aws-apigatewayv2-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-apigatewayv2-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
"engines": {
102102
"node": ">= 14.15.0"
103103
},
104-
"awslint": {
105-
"exclude": [
106-
"*:*"
107-
]
108-
},
109104
"stability": "experimental",
110105
"maturity": "experimental",
111106
"features": [

‎packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@
112112
"tag": "latest"
113113
},
114114
"private": false,
115-
"awslint": {
116-
"exclude": [
117-
"*:*"
118-
]
119-
},
120115
"pkglint": {
121116
"exclude": [
122117
"naming/package-matches-directory",

‎packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@
108108
"publishConfig": {
109109
"tag": "latest"
110110
},
111-
"awslint": {
112-
"exclude": [
113-
"*:*"
114-
]
115-
},
116111
"pkglint": {
117112
"exclude": [
118113
"naming/package-matches-directory",

‎packages/@aws-cdk/aws-appconfig-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-appconfig-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@
102102
},
103103
"stability": "experimental",
104104
"maturity": "experimental",
105-
"awslint": {
106-
"exclude": [
107-
"*:*"
108-
]
109-
},
110105
"awscdkio": {
111106
"announce": false
112107
},

‎packages/@aws-cdk/aws-apprunner-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-apprunner-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@
109109
"tag": "latest"
110110
},
111111
"private": false,
112-
"awslint": {
113-
"exclude": [
114-
"*:*"
115-
]
116-
},
117112
"pkglint": {
118113
"exclude": [
119114
"naming/package-matches-directory",

‎packages/@aws-cdk/aws-cloud9-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-cloud9-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@
9898
"engines": {
9999
"node": ">= 14.15.0"
100100
},
101-
"awslint": {
102-
"exclude": [
103-
"*:*"
104-
]
105-
},
106101
"stability": "experimental",
107102
"maturity": "experimental",
108103
"awscdkio": {

‎packages/@aws-cdk/aws-codestar-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-codestar-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@
9898
"engines": {
9999
"node": ">= 14.15.0"
100100
},
101-
"awslint": {
102-
"exclude": [
103-
"*:*"
104-
]
105-
},
106101
"stability": "experimental",
107102
"maturity": "experimental",
108103
"awscdkio": {

‎packages/@aws-cdk/aws-cognito-identitypool-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@
9898
"engines": {
9999
"node": ">= 14.15.0"
100100
},
101-
"awslint": {
102-
"exclude": [
103-
"*:*"
104-
]
105-
},
106101
"stability": "experimental",
107102
"maturity": "experimental",
108103
"awscdkio": {

‎packages/@aws-cdk/aws-gamelift-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-gamelift-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@
9999
"engines": {
100100
"node": ">= 14.15.0"
101101
},
102-
"awslint": {
103-
"exclude": [
104-
"*:*"
105-
]
106-
},
107102
"stability": "experimental",
108103
"maturity": "experimental",
109104
"awscdkio": {

‎packages/@aws-cdk/aws-glue-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-glue-alpha/lib/external-table.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export interface ExternalTableProps extends TableBaseProps {
2525

2626
/**
2727
* A Glue table that targets an external data location (e.g. A table in a Redshift Cluster).
28+
* @resource AWS::Glue::Table
2829
*/
2930
export class ExternalTable extends TableBase {
3031
/**

‎packages/@aws-cdk/aws-glue-alpha/lib/s3-table.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export interface S3TableProps extends TableBaseProps {
7878

7979
/**
8080
* A Glue table that targets a S3 dataset.
81+
* @resource AWS::Glue::Table
8182
*/
8283
export class S3Table extends TableBase {
8384
/**

‎packages/@aws-cdk/aws-glue-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
},
102102
"stability": "experimental",
103103
"maturity": "experimental",
104-
"awslint": {
105-
"exclude": [
106-
"*:*"
107-
]
108-
},
109104
"awscdkio": {
110105
"announce": false
111106
},

‎packages/@aws-cdk/aws-iot-actions-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-iot-actions-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@
121121
"tag": "latest"
122122
},
123123
"private": false,
124-
"awslint": {
125-
"exclude": [
126-
"*:*"
127-
]
128-
},
129124
"pkglint": {
130125
"exclude": [
131126
"naming/package-matches-directory",

‎packages/@aws-cdk/aws-iot-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-iot-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@
9999
"engines": {
100100
"node": ">= 14.15.0"
101101
},
102-
"awslint": {
103-
"exclude": [
104-
"*:*"
105-
]
106-
},
107102
"stability": "experimental",
108103
"maturity": "experimental",
109104
"awscdkio": {

‎packages/@aws-cdk/aws-iotevents-actions-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-iotevents-actions-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
"tag": "latest"
104104
},
105105
"private": false,
106-
"awslint": {
107-
"exclude": [
108-
"*:*"
109-
]
110-
},
111106
"pkglint": {
112107
"exclude": [
113108
"naming/package-matches-directory",

‎packages/@aws-cdk/aws-iotevents-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-iotevents-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@
100100
"engines": {
101101
"node": ">= 14.15.0"
102102
},
103-
"awslint": {
104-
"exclude": [
105-
"*:*"
106-
]
107-
},
108103
"stability": "experimental",
109104
"maturity": "experimental",
110105
"awscdkio": {

‎packages/@aws-cdk/aws-ivs-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

‎packages/@aws-cdk/aws-ivs-alpha/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
}
4343
}
4444
},
45-
"awslint": {
46-
"exclude": [
47-
"*:*"
48-
]
49-
},
5045
"repository": {
5146
"type": "git",
5247
"url": "https://github.com/aws/aws-cdk.git",

‎packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/awslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"exclude": [
3+
"*:*"
4+
]
5+
}

0 commit comments

Comments
 (0)