Skip to content

Commit 49e5739

Browse files
mrgrainmrgrain
authored
fix(events-targets): AwsApi is still using Node 16 (#27002)
Migrate the `aws-api-handler` code to use SDKv3 and move it into `custom-resource-handlers`. Updates the Construct config to use the new code and Node18. To verify functionality, the existing integration test has been extended to include a new rule and target that can be asserted on. Includes a config change to the `custom-resource-handlers` package to run test from TS. Closes #26998 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 0318676 commit 49e5739

File tree

174 files changed

+43934
-8982
lines changed

Some content is hidden

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

174 files changed

+43934
-8982
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-logs-destinations/test/integ.lambda.js.snapshot/asset.ba11e38264ca2aa7e3526744e71e22c78bd856cbfd0b4d7e089ee2ccf6d4e928.bundle/index.js‎ renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.92519e926ac4ba644c6184363d536269cb0557fe7acc3593ae702e5a8b8e81a2.bundle/index.js‎

Lines changed: 74 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
var __create = Object.create;
23
var __defProp = Object.defineProperty;
34
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -31358,10 +31359,78 @@ var init_find_client_constructor = __esm({
3135831359
}
3135931360
});
3136031361

31362+
// ../sdk-v2-to-v3-adapter/lib/sdk-v3-helpers.ts
31363+
var sdk_v3_helpers_exports = {};
31364+
__export(sdk_v3_helpers_exports, {
31365+
getV3Client: () => getV3Client,
31366+
getV3Command: () => getV3Command,
31367+
loadV3ClientPackage: () => loadV3ClientPackage
31368+
});
31369+
function loadV3ClientPackage(service) {
31370+
const packageName = service.startsWith("@aws-sdk/") ? service : getV3ClientPackageName(service);
31371+
try {
31372+
const pkg = require(packageName);
31373+
const { version: version2 } = require(packageName + "/package.json");
31374+
return {
31375+
service: packageName.replace("@aws-sdk/client-", ""),
31376+
pkg,
31377+
packageName,
31378+
packageVersion: version2
31379+
};
31380+
} catch (e) {
31381+
throw Error(`Service ${service} client package with name '${packageName}' does not exist.`);
31382+
}
31383+
}
31384+
function getV3Client(sdkPkg, clientOptions = {}) {
31385+
try {
31386+
const ServiceClient = findV3ClientConstructor(sdkPkg.pkg);
31387+
return new ServiceClient(clientOptions);
31388+
} catch (e) {
31389+
throw Error(`No client constructor found within package: ${sdkPkg.packageName}`);
31390+
}
31391+
}
31392+
function getV3Command(sdkPkg, action) {
31393+
const commandName = action.endsWith("Command") ? action : `${action}Command`;
31394+
const command = Object.entries(sdkPkg.pkg).find(
31395+
([name]) => name.toLowerCase() === commandName.toLowerCase()
31396+
)?.[1];
31397+
if (!command) {
31398+
throw new Error(`Unable to find command named: ${commandName} for api: ${action} in service package`);
31399+
}
31400+
return command;
31401+
}
31402+
var init_sdk_v3_helpers = __esm({
31403+
"../sdk-v2-to-v3-adapter/lib/sdk-v3-helpers.ts"() {
31404+
"use strict";
31405+
init_find_client_constructor();
31406+
init_get_v3_client_package_name();
31407+
}
31408+
});
31409+
3136131410
// ../sdk-v2-to-v3-adapter/lib/index.js
3136231411
var require_lib5 = __commonJS({
3136331412
"../sdk-v2-to-v3-adapter/lib/index.js"(exports) {
3136431413
"use strict";
31414+
var __createBinding3 = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
31415+
if (k2 === void 0)
31416+
k2 = k;
31417+
var desc = Object.getOwnPropertyDescriptor(m, k);
31418+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
31419+
desc = { enumerable: true, get: function() {
31420+
return m[k];
31421+
} };
31422+
}
31423+
Object.defineProperty(o, k2, desc);
31424+
} : function(o, m, k, k2) {
31425+
if (k2 === void 0)
31426+
k2 = k;
31427+
o[k2] = m[k];
31428+
});
31429+
var __exportStar3 = exports && exports.__exportStar || function(m, exports2) {
31430+
for (var p in m)
31431+
if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
31432+
__createBinding3(exports2, m, p);
31433+
};
3136531434
Object.defineProperty(exports, "__esModule", { value: true });
3136631435
exports.findV3ClientConstructor = exports.getV3ClientPackageName = void 0;
3136731436
var get_v3_client_package_name_1 = (init_get_v3_client_package_name(), __toCommonJS(get_v3_client_package_name_exports));
@@ -31372,6 +31441,7 @@ var require_lib5 = __commonJS({
3137231441
Object.defineProperty(exports, "findV3ClientConstructor", { enumerable: true, get: function() {
3137331442
return find_client_constructor_1.findV3ClientConstructor;
3137431443
} });
31444+
__exportStar3((init_sdk_v3_helpers(), __toCommonJS(sdk_v3_helpers_exports)), exports);
3137531445
}
3137631446
});
3137731447

@@ -31395,6 +31465,7 @@ var CustomResourceHandler = class {
3139531465
constructor(event, context) {
3139631466
this.event = event;
3139731467
this.context = context;
31468+
this.timedOut = false;
3139831469
this.timeout = setTimeout(async () => {
3139931470
await this.respond({
3140031471
status: "FAILED",
@@ -31406,9 +31477,6 @@ var CustomResourceHandler = class {
3140631477
this.event = event;
3140731478
this.physicalResourceId = extractPhysicalResourceId(event);
3140831479
}
31409-
physicalResourceId;
31410-
timeout;
31411-
timedOut = false;
3141231480
/**
3141331481
* Handles executing the custom resource event. If `stateMachineArn` is present
3141431482
* in the props then trigger the waiter statemachine
@@ -31542,7 +31610,6 @@ var AssertionHandler = class extends CustomResourceHandler {
3154231610
}
3154331611
};
3154431612
var MatchCreator = class {
31545-
parsedObj;
3154631613
constructor(obj) {
3154731614
this.parsedObj = {
3154831615
matcher: obj
@@ -31674,14 +31741,11 @@ var import_sdk_v2_to_v3_adapter = __toESM(require_lib5());
3167431741

3167531742
// lib/assertions/providers/lambda-handler/utils.ts
3167631743
function parseJsonPayload(payload) {
31677-
const text = new TextDecoder().decode(Buffer.from(payload ?? ""));
31678-
if (!text) {
31679-
return {};
31680-
}
3168131744
try {
31682-
return JSON.parse(text);
31745+
const buffer = Buffer.from(payload);
31746+
return JSON.parse(new TextDecoder().decode(buffer));
3168331747
} catch {
31684-
throw new Error(`return values from user-handlers must be JSON objects. got: "${text}"`);
31748+
return payload;
3168531749
}
3168631750
}
3168731751
function decodeParameters(obj) {

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d/aws-sdk-v2-handler.js‎ renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf/aws-sdk-v2-handler.js‎

File renamed without changes.

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d/aws-sdk-v3-handler.bundled.js‎ renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf/aws-sdk-v3-handler.bundled.js‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,78 @@ var init_find_client_constructor = __esm({
532532
}
533533
});
534534

535+
// ../@aws-cdk/sdk-v2-to-v3-adapter/lib/sdk-v3-helpers.ts
536+
var sdk_v3_helpers_exports = {};
537+
__export(sdk_v3_helpers_exports, {
538+
getV3Client: () => getV3Client,
539+
getV3Command: () => getV3Command,
540+
loadV3ClientPackage: () => loadV3ClientPackage
541+
});
542+
function loadV3ClientPackage(service) {
543+
const packageName = service.startsWith("@aws-sdk/") ? service : getV3ClientPackageName(service);
544+
try {
545+
const pkg = require(packageName);
546+
const { version } = require(packageName + "/package.json");
547+
return {
548+
service: packageName.replace("@aws-sdk/client-", ""),
549+
pkg,
550+
packageName,
551+
packageVersion: version
552+
};
553+
} catch (e) {
554+
throw Error(`Service ${service} client package with name '${packageName}' does not exist.`);
555+
}
556+
}
557+
function getV3Client(sdkPkg, clientOptions = {}) {
558+
try {
559+
const ServiceClient = findV3ClientConstructor(sdkPkg.pkg);
560+
return new ServiceClient(clientOptions);
561+
} catch (e) {
562+
throw Error(`No client constructor found within package: ${sdkPkg.packageName}`);
563+
}
564+
}
565+
function getV3Command(sdkPkg, action) {
566+
const commandName = action.endsWith("Command") ? action : `${action}Command`;
567+
const command = Object.entries(sdkPkg.pkg).find(
568+
([name]) => name.toLowerCase() === commandName.toLowerCase()
569+
)?.[1];
570+
if (!command) {
571+
throw new Error(`Unable to find command named: ${commandName} for api: ${action} in service package`);
572+
}
573+
return command;
574+
}
575+
var init_sdk_v3_helpers = __esm({
576+
"../@aws-cdk/sdk-v2-to-v3-adapter/lib/sdk-v3-helpers.ts"() {
577+
"use strict";
578+
init_find_client_constructor();
579+
init_get_v3_client_package_name();
580+
}
581+
});
582+
535583
// ../@aws-cdk/sdk-v2-to-v3-adapter/lib/index.js
536584
var require_lib = __commonJS({
537585
"../@aws-cdk/sdk-v2-to-v3-adapter/lib/index.js"(exports) {
538586
"use strict";
587+
var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
588+
if (k2 === void 0)
589+
k2 = k;
590+
var desc = Object.getOwnPropertyDescriptor(m, k);
591+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
592+
desc = { enumerable: true, get: function() {
593+
return m[k];
594+
} };
595+
}
596+
Object.defineProperty(o, k2, desc);
597+
} : function(o, m, k, k2) {
598+
if (k2 === void 0)
599+
k2 = k;
600+
o[k2] = m[k];
601+
});
602+
var __exportStar = exports && exports.__exportStar || function(m, exports2) {
603+
for (var p in m)
604+
if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
605+
__createBinding(exports2, m, p);
606+
};
539607
Object.defineProperty(exports, "__esModule", { value: true });
540608
exports.findV3ClientConstructor = exports.getV3ClientPackageName = void 0;
541609
var get_v3_client_package_name_1 = (init_get_v3_client_package_name(), __toCommonJS(get_v3_client_package_name_exports));
@@ -546,6 +614,7 @@ var require_lib = __commonJS({
546614
Object.defineProperty(exports, "findV3ClientConstructor", { enumerable: true, get: function() {
547615
return find_client_constructor_1.findV3ClientConstructor;
548616
} });
617+
__exportStar((init_sdk_v3_helpers(), __toCommonJS(sdk_v3_helpers_exports)), exports);
549618
}
550619
});
551620

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d/index.js‎ renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf/index.js‎

File renamed without changes.

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d/shared.js‎ renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/asset.d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf/shared.js‎

File renamed without changes.

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/integ-cognito.assets.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "34.0.0",
33
"files": {
4-
"5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d": {
4+
"d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf": {
55
"source": {
6-
"path": "asset.5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d",
6+
"path": "asset.d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d.zip",
12+
"objectKey": "d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
@@ -27,15 +27,15 @@
2727
}
2828
}
2929
},
30-
"7d2e082c72721d0c18fe04449320a9c2714679815c66afa2326da57244b8f2a2": {
30+
"f9d7a609d78100aca72b5fe61c968d55e9fc580b4a61d89e622350fabdcb4da6": {
3131
"source": {
3232
"path": "integ-cognito.template.json",
3333
"packaging": "file"
3434
},
3535
"destinations": {
3636
"current_account-current_region": {
3737
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
38-
"objectKey": "7d2e082c72721d0c18fe04449320a9c2714679815c66afa2326da57244b8f2a2.json",
38+
"objectKey": "f9d7a609d78100aca72b5fe61c968d55e9fc580b4a61d89e622350fabdcb4da6.json",
3939
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
4040
}
4141
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/integ-cognito.template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@
827827
"S3Bucket": {
828828
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
829829
},
830-
"S3Key": "5f29389ceebe277aadade8a9e7583fdd274a2a2f2d6adf410243bea23c244b9d.zip"
830+
"S3Key": "d64690b87ee4eb4d8bbabafe26f88d8cc557bb629a158ed5fb182b8e48da1bbf.zip"
831831
},
832832
"Handler": "index.handler",
833833
"Role": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/integtestcognitoDefaultTestDeployAssert6F2623C9.assets.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
22
"version": "34.0.0",
33
"files": {
4-
"ba11e38264ca2aa7e3526744e71e22c78bd856cbfd0b4d7e089ee2ccf6d4e928": {
4+
"92519e926ac4ba644c6184363d536269cb0557fe7acc3593ae702e5a8b8e81a2": {
55
"source": {
6-
"path": "asset.ba11e38264ca2aa7e3526744e71e22c78bd856cbfd0b4d7e089ee2ccf6d4e928.bundle",
6+
"path": "asset.92519e926ac4ba644c6184363d536269cb0557fe7acc3593ae702e5a8b8e81a2.bundle",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "ba11e38264ca2aa7e3526744e71e22c78bd856cbfd0b4d7e089ee2ccf6d4e928.zip",
12+
"objectKey": "92519e926ac4ba644c6184363d536269cb0557fe7acc3593ae702e5a8b8e81a2.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
1616
},
17-
"6d7b07a6b2af8996027b6eaddd9800cefa75bec62058cfe12c0ee5e2f11953a4": {
17+
"c42eb6e89441b92158b8079ee0a6323db61c7c6e1c4cee046b8899317ed64983": {
1818
"source": {
1919
"path": "integtestcognitoDefaultTestDeployAssert6F2623C9.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "6d7b07a6b2af8996027b6eaddd9800cefa75bec62058cfe12c0ee5e2f11953a4.json",
25+
"objectKey": "c42eb6e89441b92158b8079ee0a6323db61c7c6e1c4cee046b8899317ed64983.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/integtestcognitoDefaultTestDeployAssert6F2623C9.template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
"flattenResponse": "false",
30-
"salt": "1693922024206"
30+
"salt": "1694000253228"
3131
},
3232
"UpdateReplacePolicy": "Delete",
3333
"DeletionPolicy": "Delete"
@@ -127,7 +127,7 @@
127127
"S3Bucket": {
128128
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
129129
},
130-
"S3Key": "ba11e38264ca2aa7e3526744e71e22c78bd856cbfd0b4d7e089ee2ccf6d4e928.zip"
130+
"S3Key": "92519e926ac4ba644c6184363d536269cb0557fe7acc3593ae702e5a8b8e81a2.zip"
131131
},
132132
"Timeout": 120,
133133
"Handler": "index.handler",

‎packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2-actions/test/integ.cognito.js.snapshot/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7d2e082c72721d0c18fe04449320a9c2714679815c66afa2326da57244b8f2a2.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f9d7a609d78100aca72b5fe61c968d55e9fc580b4a61d89e622350fabdcb4da6.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [
@@ -316,7 +316,7 @@
316316
"validateOnSynth": false,
317317
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
318318
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
319-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6d7b07a6b2af8996027b6eaddd9800cefa75bec62058cfe12c0ee5e2f11953a4.json",
319+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c42eb6e89441b92158b8079ee0a6323db61c7c6e1c4cee046b8899317ed64983.json",
320320
"requiresBootstrapStackVersion": 6,
321321
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
322322
"additionalDependencies": [

0 commit comments

Comments
 (0)