Skip to content

Commit 8329f57

Browse files
author
Dane Pilcher
authored
chore: bump aws-cdk-lib to 2.187.0 (#3247)
1 parent 64da17f commit 8329f57

32 files changed

Lines changed: 58 additions & 273 deletions

File tree

dependency_licenses.txt

Lines changed: 0 additions & 212 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,218 +1035,6 @@ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
10351035

10361036
-----
10371037

1038-
The following software may be included in this product: @aws-cdk/aws-cognito-identitypool-alpha. A copy of the source code may be downloaded from https://github.com/aws/aws-cdk.git. This software contains the following license and notice below:
1039-
1040-
Apache License
1041-
Version 2.0, January 2004
1042-
http://www.apache.org/licenses/
1043-
1044-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1045-
1046-
1. Definitions.
1047-
1048-
"License" shall mean the terms and conditions for use, reproduction,
1049-
and distribution as defined by Sections 1 through 9 of this document.
1050-
1051-
"Licensor" shall mean the copyright owner or entity authorized by
1052-
the copyright owner that is granting the License.
1053-
1054-
"Legal Entity" shall mean the union of the acting entity and all
1055-
other entities that control, are controlled by, or are under common
1056-
control with that entity. For the purposes of this definition,
1057-
"control" means (i) the power, direct or indirect, to cause the
1058-
direction or management of such entity, whether by contract or
1059-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
1060-
outstanding shares, or (iii) beneficial ownership of such entity.
1061-
1062-
"You" (or "Your") shall mean an individual or Legal Entity
1063-
exercising permissions granted by this License.
1064-
1065-
"Source" form shall mean the preferred form for making modifications,
1066-
including but not limited to software source code, documentation
1067-
source, and configuration files.
1068-
1069-
"Object" form shall mean any form resulting from mechanical
1070-
transformation or translation of a Source form, including but
1071-
not limited to compiled object code, generated documentation,
1072-
and conversions to other media types.
1073-
1074-
"Work" shall mean the work of authorship, whether in Source or
1075-
Object form, made available under the License, as indicated by a
1076-
copyright notice that is included in or attached to the work
1077-
(an example is provided in the Appendix below).
1078-
1079-
"Derivative Works" shall mean any work, whether in Source or Object
1080-
form, that is based on (or derived from) the Work and for which the
1081-
editorial revisions, annotations, elaborations, or other modifications
1082-
represent, as a whole, an original work of authorship. For the purposes
1083-
of this License, Derivative Works shall not include works that remain
1084-
separable from, or merely link (or bind by name) to the interfaces of,
1085-
the Work and Derivative Works thereof.
1086-
1087-
"Contribution" shall mean any work of authorship, including
1088-
the original version of the Work and any modifications or additions
1089-
to that Work or Derivative Works thereof, that is intentionally
1090-
submitted to Licensor for inclusion in the Work by the copyright owner
1091-
or by an individual or Legal Entity authorized to submit on behalf of
1092-
the copyright owner. For the purposes of this definition, "submitted"
1093-
means any form of electronic, verbal, or written communication sent
1094-
to the Licensor or its representatives, including but not limited to
1095-
communication on electronic mailing lists, source code control systems,
1096-
and issue tracking systems that are managed by, or on behalf of, the
1097-
Licensor for the purpose of discussing and improving the Work, but
1098-
excluding communication that is conspicuously marked or otherwise
1099-
designated in writing by the copyright owner as "Not a Contribution."
1100-
1101-
"Contributor" shall mean Licensor and any individual or Legal Entity
1102-
on behalf of whom a Contribution has been received by Licensor and
1103-
subsequently incorporated within the Work.
1104-
1105-
2. Grant of Copyright License. Subject to the terms and conditions of
1106-
this License, each Contributor hereby grants to You a perpetual,
1107-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1108-
copyright license to reproduce, prepare Derivative Works of,
1109-
publicly display, publicly perform, sublicense, and distribute the
1110-
Work and such Derivative Works in Source or Object form.
1111-
1112-
3. Grant of Patent License. Subject to the terms and conditions of
1113-
this License, each Contributor hereby grants to You a perpetual,
1114-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1115-
(except as stated in this section) patent license to make, have made,
1116-
use, offer to sell, sell, import, and otherwise transfer the Work,
1117-
where such license applies only to those patent claims licensable
1118-
by such Contributor that are necessarily infringed by their
1119-
Contribution(s) alone or by combination of their Contribution(s)
1120-
with the Work to which such Contribution(s) was submitted. If You
1121-
institute patent litigation against any entity (including a
1122-
cross-claim or counterclaim in a lawsuit) alleging that the Work
1123-
or a Contribution incorporated within the Work constitutes direct
1124-
or contributory patent infringement, then any patent licenses
1125-
granted to You under this License for that Work shall terminate
1126-
as of the date such litigation is filed.
1127-
1128-
4. Redistribution. You may reproduce and distribute copies of the
1129-
Work or Derivative Works thereof in any medium, with or without
1130-
modifications, and in Source or Object form, provided that You
1131-
meet the following conditions:
1132-
1133-
(a) You must give any other recipients of the Work or
1134-
Derivative Works a copy of this License; and
1135-
1136-
(b) You must cause any modified files to carry prominent notices
1137-
stating that You changed the files; and
1138-
1139-
(c) You must retain, in the Source form of any Derivative Works
1140-
that You distribute, all copyright, patent, trademark, and
1141-
attribution notices from the Source form of the Work,
1142-
excluding those notices that do not pertain to any part of
1143-
the Derivative Works; and
1144-
1145-
(d) If the Work includes a "NOTICE" text file as part of its
1146-
distribution, then any Derivative Works that You distribute must
1147-
include a readable copy of the attribution notices contained
1148-
within such NOTICE file, excluding those notices that do not
1149-
pertain to any part of the Derivative Works, in at least one
1150-
of the following places: within a NOTICE text file distributed
1151-
as part of the Derivative Works; within the Source form or
1152-
documentation, if provided along with the Derivative Works; or,
1153-
within a display generated by the Derivative Works, if and
1154-
wherever such third-party notices normally appear. The contents
1155-
of the NOTICE file are for informational purposes only and
1156-
do not modify the License. You may add Your own attribution
1157-
notices within Derivative Works that You distribute, alongside
1158-
or as an addendum to the NOTICE text from the Work, provided
1159-
that such additional attribution notices cannot be construed
1160-
as modifying the License.
1161-
1162-
You may add Your own copyright statement to Your modifications and
1163-
may provide additional or different license terms and conditions
1164-
for use, reproduction, or distribution of Your modifications, or
1165-
for any such Derivative Works as a whole, provided Your use,
1166-
reproduction, and distribution of the Work otherwise complies with
1167-
the conditions stated in this License.
1168-
1169-
5. Submission of Contributions. Unless You explicitly state otherwise,
1170-
any Contribution intentionally submitted for inclusion in the Work
1171-
by You to the Licensor shall be under the terms and conditions of
1172-
this License, without any additional terms or conditions.
1173-
Notwithstanding the above, nothing herein shall supersede or modify
1174-
the terms of any separate license agreement you may have executed
1175-
with Licensor regarding such Contributions.
1176-
1177-
6. Trademarks. This License does not grant permission to use the trade
1178-
names, trademarks, service marks, or product names of the Licensor,
1179-
except as required for reasonable and customary use in describing the
1180-
origin of the Work and reproducing the content of the NOTICE file.
1181-
1182-
7. Disclaimer of Warranty. Unless required by applicable law or
1183-
agreed to in writing, Licensor provides the Work (and each
1184-
Contributor provides its Contributions) on an "AS IS" BASIS,
1185-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
1186-
implied, including, without limitation, any warranties or conditions
1187-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
1188-
PARTICULAR PURPOSE. You are solely responsible for determining the
1189-
appropriateness of using or redistributing the Work and assume any
1190-
risks associated with Your exercise of permissions under this License.
1191-
1192-
8. Limitation of Liability. In no event and under no legal theory,
1193-
whether in tort (including negligence), contract, or otherwise,
1194-
unless required by applicable law (such as deliberate and grossly
1195-
negligent acts) or agreed to in writing, shall any Contributor be
1196-
liable to You for damages, including any direct, indirect, special,
1197-
incidental, or consequential damages of any character arising as a
1198-
result of this License or out of the use or inability to use the
1199-
Work (including but not limited to damages for loss of goodwill,
1200-
work stoppage, computer failure or malfunction, or any and all
1201-
other commercial damages or losses), even if such Contributor
1202-
has been advised of the possibility of such damages.
1203-
1204-
9. Accepting Warranty or Additional Liability. While redistributing
1205-
the Work or Derivative Works thereof, You may choose to offer,
1206-
and charge a fee for, acceptance of support, warranty, indemnity,
1207-
or other liability obligations and/or rights consistent with this
1208-
License. However, in accepting such obligations, You may act only
1209-
on Your own behalf and on Your sole responsibility, not on behalf
1210-
of any other Contributor, and only if You agree to indemnify,
1211-
defend, and hold each Contributor harmless for any liability
1212-
incurred by, or claims asserted against, such Contributor by reason
1213-
of your accepting any such warranty or additional liability.
1214-
1215-
END OF TERMS AND CONDITIONS
1216-
1217-
APPENDIX: How to apply the Apache License to your work.
1218-
1219-
To apply the Apache License to your work, attach the following
1220-
boilerplate notice, with the fields enclosed by brackets "[]"
1221-
replaced with your own identifying information. (Don't include
1222-
the brackets!) The text should be enclosed in the appropriate
1223-
comment syntax for the file format. We also recommend that a
1224-
file or class name and description of purpose be included on the
1225-
same "printed page" as the copyright notice for easier
1226-
identification within third-party archives.
1227-
1228-
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1229-
1230-
Licensed under the Apache License, Version 2.0 (the "License");
1231-
you may not use this file except in compliance with the License.
1232-
You may obtain a copy of the License at
1233-
1234-
http://www.apache.org/licenses/LICENSE-2.0
1235-
1236-
Unless required by applicable law or agreed to in writing, software
1237-
distributed under the License is distributed on an "AS IS" BASIS,
1238-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1239-
See the License for the specific language governing permissions and
1240-
limitations under the License.
1241-
1242-
1243-
NOTICE
1244-
1245-
AWS Cloud Development Kit (AWS CDK)
1246-
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1247-
1248-
-----
1249-
12501038
The following software may be included in this product: @aws-cdk/cloud-assembly-schema. A copy of the source code may be downloaded from https://github.com/aws/aws-cdk-cli. This software contains the following license and notice below:
12511039

12521040
Apache License

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
"**/istanbul/async": "^2.6.4",
418418
"**/jake/async": "^2.6.4",
419419
"**/nth-check": "^2.0.1",
420-
"aws-cdk-lib": "^2.180.0",
420+
"aws-cdk-lib": "^2.187.0",
421421
"lodash": "^4.17.21",
422422
"node-fetch": "^2.6.7",
423423
"cross-fetch": "^2.2.6",

packages/amplify-data-construct/.jsii

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"@aws-sdk/middleware-logger": "3.609.0",
5151
"@aws-sdk/middleware-recursion-detection": "3.620.0",
5252
"@aws-sdk/middleware-user-agent": "3.637.0",
53+
"@aws-sdk/nested-clients": "^3.777.0",
5354
"@aws-sdk/region-config-resolver": "3.614.0",
5455
"@aws-sdk/token-providers": "3.614.0",
5556
"@aws-sdk/types": "3.609.0",
@@ -101,6 +102,7 @@
101102
"@smithy/util-stream": "^3.1.3",
102103
"@smithy/util-uri-escape": "^3.0.0",
103104
"@smithy/util-utf8": "^3.0.0",
105+
"@types/uuid": "^9.0.8",
104106
"bowser": "^2.11.0",
105107
"charenc": "^0.0.2",
106108
"ci-info": "^3.2.0",
@@ -133,7 +135,7 @@
133135
},
134136
"dependencies": {
135137
"@aws-amplify/graphql-api-construct": "1.19.1",
136-
"aws-cdk-lib": "^2.180.0",
138+
"aws-cdk-lib": "^2.187.0",
137139
"constructs": "^10.3.0"
138140
},
139141
"dependencyClosure": {
@@ -4107,5 +4109,5 @@
41074109
},
41084110
"types": {},
41094111
"version": "1.15.1",
4110-
"fingerprint": "g5Gl1T6L9aWTeIIJDXX9W4nRL9FAU/9CcbfY/Y9HtZQ="
4112+
"fingerprint": "Nq3hZwmGHTMTZzRCbb2aReaqvdPt8BercWL1e2FjoTE="
41114113
}

packages/amplify-data-construct/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
"devDependencies": {
293293
"@types/fs-extra": "^8.0.1",
294294
"@types/node": "^18.0.0",
295-
"aws-cdk-lib": "2.180.0",
295+
"aws-cdk-lib": "2.187.0",
296296
"constructs": "10.3.0",
297297
"jsii": "^5.4.23",
298298
"jsii-pacmak": "^1.84.0",
@@ -301,7 +301,7 @@
301301
"ts-node": "^8.10.1"
302302
},
303303
"peerDependencies": {
304-
"aws-cdk-lib": "^2.180.0",
304+
"aws-cdk-lib": "^2.187.0",
305305
"constructs": "^10.3.0"
306306
},
307307
"stability": "stable",

packages/amplify-graphql-api-construct-tests/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"@aws-amplify/auth-construct": "^1.0.0",
2626
"@aws-amplify/core": "^2.1.0",
2727
"@aws-amplify/graphql-api-construct": "1.19.1",
28-
"@aws-cdk/aws-cognito-identitypool-alpha": "2.152.0-alpha.0",
2928
"@aws-sdk/client-appsync": "3.624.0",
3029
"@aws-sdk/client-cloudformation": "3.624.0",
3130
"@aws-sdk/client-cloudwatch-logs": "3.624.0",
@@ -53,7 +52,7 @@
5352
"@aws-amplify/graphql-transformer-interfaces": "4.2.4",
5453
"@aws-amplify/graphql-validate-transformer": "1.1.1",
5554
"@types/node": "^18.0.0",
56-
"aws-cdk-lib": "2.180.0",
55+
"aws-cdk-lib": "2.187.0",
5756
"constructs": "10.3.0",
5857
"ts-node": "^8.10.2"
5958
},

packages/amplify-graphql-api-construct-tests/src/__tests__/__snapshots__/base-cdk.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.180.0 1`] = `
3+
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.187.0 1`] = `
44
Object {
55
"body": Object {
66
"data": Object {
@@ -14,7 +14,7 @@ Object {
1414
}
1515
`;
1616
17-
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.180.0 2`] = `
17+
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.187.0 2`] = `
1818
Object {
1919
"body": Object {
2020
"data": Object {

packages/amplify-graphql-api-construct-tests/src/__tests__/admin-role.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ describe('CDK Auth Modes', () => {
2929
test('Can be invoked with Admin Roles defined', async () => {
3030
const templatePath = path.resolve(path.join(__dirname, 'backends', 'admin-role'));
3131
const name = await initCDKProject(projRoot, templatePath, {
32-
cdkVersion: '2.180.0', // Explicitly declaring this, since this version needs to match cognito idp
32+
cdkVersion: '2.187.0', // Explicitly declaring this, since this version needs to match cognito idp
3333
additionalDependencies: [
3434
'esbuild', // required to bundle the lambda function
35-
'@aws-cdk/aws-cognito-identitypool-alpha@2.180.0-alpha.0', // using alpha cognito idp resource for auth config
3635
'@aws-crypto/sha256-js', // All remaining deps are required for the lambda to sign the request to appsync
3736
'@aws-sdk/credential-provider-node',
3837
'@aws-sdk/protocol-http',

packages/amplify-graphql-api-construct-tests/src/__tests__/backends/admin-role/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { App, Stack, Duration, RemovalPolicy, CfnOutput } from 'aws-cdk-lib';
44
import { Role, PolicyDocument, PolicyStatement, ServicePrincipal, Effect } from 'aws-cdk-lib/aws-iam';
55
import { UserPool, UserPoolClient } from 'aws-cdk-lib/aws-cognito';
66
import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
7-
import { IdentityPool, UserPoolAuthenticationProvider } from '@aws-cdk/aws-cognito-identitypool-alpha';
7+
import { IdentityPool, UserPoolAuthenticationProvider } from 'aws-cdk-lib/aws-cognito-identitypool';
88
// @ts-ignore
99
import { AmplifyGraphqlApi, AmplifyGraphqlDefinition } from '@aws-amplify/graphql-api-construct';
1010
import * as path from 'path';

packages/amplify-graphql-api-construct-tests/src/__tests__/base-cdk.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('CDK GraphQL Transformer', () => {
3030
deleteProjectDir(projRoot);
3131
});
3232

33-
['2.180.0', 'latest'].forEach((cdkVersion) => {
33+
['2.187.0', 'latest'].forEach((cdkVersion) => {
3434
test(`CDK base case - aws-cdk-lib@${cdkVersion}`, async () => {
3535
const templatePath = path.resolve(path.join(__dirname, 'backends', 'base-cdk'));
3636
const name = await initCDKProject(projRoot, templatePath, { cdkVersion });

packages/amplify-graphql-api-construct-tests/src/__tests__/data-construct.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('Data Construct', () => {
2525
deleteProjectDir(projRoot);
2626
});
2727

28-
['2.180.0', 'latest'].forEach((cdkVersion) => {
28+
['2.187.0', 'latest'].forEach((cdkVersion) => {
2929
test(`Data Construct - aws-cdk-lib@${cdkVersion}`, async () => {
3030
const templatePath = path.resolve(path.join(__dirname, 'backends', 'data-construct'));
3131
const name = await initCDKProject(projRoot, templatePath, { cdkVersion, construct: 'Data' });

0 commit comments

Comments
 (0)