Skip to content

Commit e5d6589

Browse files
authored
Merge branch 'main' into feat(redshift)/support-default-role-for-redshift-clusters
2 parents 8857600 + 39f8a30 commit e5d6589

File tree

68 files changed

+1568
-639
lines changed

Some content is hidden

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

68 files changed

+1568
-639
lines changed

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"devDependencies": {
1919
"@types/prettier": "2.6.0",
2020
"@yarnpkg/lockfile": "^1.1.0",
21-
"cdk-generate-synthetic-examples": "^0.1.119",
21+
"cdk-generate-synthetic-examples": "^0.1.138",
2222
"conventional-changelog-cli": "^2.2.2",
2323
"fs-extra": "^9.1.0",
2424
"graceful-fs": "^4.2.10",
2525
"jest-junit": "^13.2.0",
26-
"jsii-diff": "1.73.0",
27-
"jsii-pacmak": "1.73.0",
28-
"jsii-reflect": "1.73.0",
29-
"jsii-rosetta": "1.73.0",
26+
"jsii-diff": "1.74.0",
27+
"jsii-pacmak": "1.74.0",
28+
"jsii-reflect": "1.74.0",
29+
"jsii-rosetta": "1.74.0",
3030
"lerna": "^4.0.0",
3131
"patch-package": "^6.5.1",
3232
"semver": "^6.3.0",

packages/@aws-cdk-testing/cli-integ/bin/query-github.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ async function main() {
2525
}))
2626
.demandCommand()
2727
.help()
28-
.strictOptions()
2928
.showHelpOnFail(false)
3029
.argv;
3130

@@ -55,4 +54,4 @@ main().catch(e => {
5554
// eslint-disable-next-line no-console
5655
console.error(e);
5756
process.exitCode = 1;
58-
});
57+
});

packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ async function main() {
6262
requiresArg: false,
6363
})
6464
.help()
65-
.strictOptions()
6665
.showHelpOnFail(false)
6766
.argv;
6867

packages/@aws-cdk-testing/cli-integ/bin/stage-distribution.ts

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ async function main() {
143143
})
144144
.demandCommand(1, 'You must supply a command')
145145
.help()
146-
.strictOptions()
147146
.showHelpOnFail(false)
148147
.parse();
149148
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
},
3030
"license": "Apache-2.0",
3131
"devDependencies": {
32-
"@types/node": "^14.18.31",
32+
"@types/node": "^14.18.36",
3333
"@aws-cdk/cdk-build-tools": "0.0.0",
34-
"@types/semver": "^7.3.12",
35-
"@types/yargs": "^17.0.13",
36-
"@types/fs-extra": "^9.0.0",
34+
"@types/semver": "^7.3.13",
35+
"@types/yargs": "^15.0.15",
36+
"@types/fs-extra": "^9.0.13",
3737
"@types/glob": "^7.2.0",
3838
"@types/npm": "^7.19.0",
3939
"@aws-cdk/pkglint": "0.0.0"
@@ -43,14 +43,14 @@
4343
"jest": "^27.5.1",
4444
"aws-sdk": "^2.1211.0",
4545
"axios": "^0.27.2",
46-
"jest-junit": "^14.0.0",
46+
"jest-junit": "^14.0.1",
4747
"semver": "^7.3.8",
4848
"ts-mock-imports": "^1.3.8",
49-
"yargs": "^17.5.0",
49+
"yargs": "^17.6.2",
5050
"glob": "^7.2.3",
5151
"p-queue": "^6.6.2",
5252
"fs-extra": "^9.1.0",
53-
"npm": "^8.11.0"
53+
"npm": "^8.19.3"
5454
},
5555
"repository": {
5656
"url": "https://github.com/aws/aws-cdk.git",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/integ-runner": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/aws-lambda": "^8.10.109",
88+
"@types/aws-lambda": "^8.10.110",
8989
"@aws-cdk/integ-tests": "0.0.0",
9090
"@types/jest": "^27.5.2"
9191
},

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
},
3030
"license": "Apache-2.0",
3131
"devDependencies": {
32-
"@types/aws-lambda": "^8.10.109",
32+
"@types/aws-lambda": "^8.10.110",
3333
"@types/sinon": "^9.0.11",
3434
"@aws-cdk/cdk-build-tools": "0.0.0",
3535
"aws-sdk": "^2.596.0",
3636
"aws-sdk-mock": "5.6.0",
3737
"eslint": "^7.32.0",
3838
"eslint-config-standard": "^14.1.1",
39-
"eslint-plugin-import": "^2.26.0",
39+
"eslint-plugin-import": "^2.27.5",
4040
"eslint-plugin-node": "^11.1.0",
4141
"eslint-plugin-promise": "^4.3.1",
4242
"eslint-plugin-standard": "^4.1.0",

packages/@aws-cdk/aws-cloudformation/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@aws-cdk/integ-tests": "0.0.0",
9090
"@aws-cdk/cfn2ts": "0.0.0",
9191
"@aws-cdk/pkglint": "0.0.0",
92-
"@types/aws-lambda": "^8.10.109",
92+
"@types/aws-lambda": "^8.10.110",
9393
"@types/jest": "^27.5.2",
9494
"jest": "^27.5.1"
9595
},

packages/@aws-cdk/aws-cognito/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"@aws-cdk/core": "0.0.0",
100100
"@aws-cdk/custom-resources": "0.0.0",
101101
"constructs": "^10.0.0",
102-
"punycode": "^2.2.0"
102+
"punycode": "^2.3.0"
103103
},
104104
"homepage": "https://github.com/aws/aws-cdk",
105105
"peerDependencies": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
2+
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
3+
module.exports = baseConfig;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
*.js
2+
*.js.map
3+
*.d.ts
4+
tsconfig.json
5+
node_modules
6+
*.generated.ts
7+
dist
8+
.jsii
9+
10+
.LAST_BUILD
11+
.nyc_output
12+
coverage
13+
.nycrc
14+
.LAST_PACKAGE
15+
*.snk
16+
nyc.config.js
17+
!.eslintrc.js
18+
!jest.config.js
19+
junit.xml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Don't include original .ts files when doing `npm pack`
2+
*.ts
3+
!*.d.ts
4+
coverage
5+
.nyc_output
6+
*.tgz
7+
8+
dist
9+
.LAST_PACKAGE
10+
.LAST_BUILD
11+
!*.js
12+
13+
# Include .jsii
14+
!.jsii
15+
16+
*.snk
17+
18+
*.tsbuildinfo
19+
20+
tsconfig.json
21+
22+
.eslintrc.js
23+
jest.config.js
24+
25+
# exclude cdk artifacts
26+
**/cdk.out
27+
junit.xml
28+
test/
29+
!*.lit.ts
+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AWS Cloud Development Kit (AWS CDK)
2+
Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.

0 commit comments

Comments
 (0)