From d130bd742a7b016311f56dd217b87bcbbedf6521 Mon Sep 17 00:00:00 2001 From: Cory Hall <43035978+corymhall@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:04:56 -0400 Subject: [PATCH] fix(core): cross region exports fail when parameter doesn't exist (#26434) The JavaScript SDK v3 handles errors differently than v2. This update was missed when we upgraded the code to SDK v3. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../__entrypoint__.js | 0 .../index.js | 13 +- .../__entrypoint__.js | 0 .../index.js | 4 +- .../integ-acm-stack.assets.json | 10 +- .../integ-acm-stack.template.json | 2 +- .../integ-cloudfront-stack.assets.json | 10 +- .../integ-cloudfront-stack.template.json | 2 +- .../integ.json | 2 +- .../manifest.json | 4 +- .../integ.cloudfront-cross-region-cert.ts | 2 +- .../__entrypoint__.js | 0 .../index.js | 4 +- ...b732e39f9a17bfcca0bf8d20ce4f61.assets.json | 10 +- ...32e39f9a17bfcca0bf8d20ce4f61.template.json | 2 +- .../integ-https-redirect.assets.json | 10 +- .../integ-https-redirect.template.json | 14 +- .../integ.json | 1 + .../manifest.json | 4 +- .../tree.json | 152 +++++++++--------- .../cross-region-ssm-reader-handler/index.ts | 12 +- .../cross-region-ssm-reader-handler.test.ts | 34 +++- 22 files changed, 161 insertions(+), 131 deletions(-) rename packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/{asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43 => asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d}/__entrypoint__.js (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/{asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43 => asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d}/index.js (53%) rename packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/{asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1 => asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707}/__entrypoint__.js (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/{asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1 => asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707}/index.js (53%) rename packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/{asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1 => asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707}/__entrypoint__.js (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/{asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1 => asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707}/index.js (53%) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43/__entrypoint__.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d/__entrypoint__.js diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d/index.js similarity index 53% rename from packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43/index.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d/index.js index e76abd7327471..e2c67495acd24 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43/index.js +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d/index.js @@ -77,12 +77,11 @@ async function removeTags(ssm, parameters, keyName) { }); } catch (e) { - switch (e.code) { - // if the parameter doesn't exist then there is nothing to release - case 'InvalidResourceId': - return; - default: - throw new Error(`Error releasing import ${name}: ${e}`); + if (e instanceof client_ssm_1.InvalidResourceId) { + return; + } + else { + throw new Error(`Error releasing import ${name}: ${e}`); } } })); @@ -96,4 +95,4 @@ async function removeTags(ssm, parameters, keyName) { function except(source, filter) { return source.filter(key => !filter.includes(key)); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBNkI7QUFDN0Isc0RBQXNEO0FBQ3RELG9EQUEwQztBQUduQyxLQUFLLFVBQVUsT0FBTyxDQUFDLEtBQWtEO0lBQzlFLE1BQU0sS0FBSyxHQUF3QixLQUFLLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDO0lBQ3hFLE1BQU0sT0FBTyxHQUF1QixLQUFLLENBQUMsT0FBNkIsQ0FBQztJQUN4RSxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sT0FBTyxHQUFXLHNCQUFzQixLQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7SUFFN0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxnQkFBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzlDLElBQUk7UUFDRixRQUFRLEtBQUssQ0FBQyxXQUFXLEVBQUU7WUFDekIsS0FBSyxRQUFRO2dCQUNYLE9BQU8sQ0FBQyxJQUFJLENBQUMsK0JBQStCLENBQUMsQ0FBQztnQkFDOUMsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFDekMsTUFBTTtZQUNSLEtBQUssUUFBUTtnQkFDWCxNQUFNLFFBQVEsR0FBd0IsS0FBSyxDQUFDLHFCQUFxQixDQUFDLFdBQVcsQ0FBQztnQkFDOUUsTUFBTSxVQUFVLEdBQXVCLFFBQVEsQ0FBQyxPQUE2QixDQUFDO2dCQUM5RSxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDaEUsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUM7Z0JBQ3JFLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0NBQXdDLENBQUMsQ0FBQztnQkFDdkQsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7b0JBQzNDLE1BQU0sVUFBVSxDQUFDLEdBQUcsRUFBRSxlQUFlLEVBQUUsT0FBTyxDQUFDLENBQUM7aUJBQ2pEO2dCQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQztnQkFDbEQsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFDeEMsTUFBTTtZQUNSLEtBQUssUUFBUTtnQkFDWCxPQUFPLENBQUMsSUFBSSxDQUFDLHNEQUFzRCxDQUFDLENBQUM7Z0JBQ3JFLE1BQU0sVUFBVSxDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBQzVDLE9BQU87U0FDVjtLQUNGO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDVixPQUFPLENBQUMsS0FBSyxDQUFDLDhDQUE4QyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sQ0FBQyxDQUFDO0tBQ1Q7SUFDRCxPQUFPO1FBQ0wsSUFBSSxFQUFFLE9BQU87S0FDZCxDQUFDO0FBQ0osQ0FBQztBQXJDRCwwQkFxQ0M7QUFBQSxDQUFDO0FBRUY7O0dBRUc7QUFDSCxLQUFLLFVBQVUsT0FBTyxDQUFDLEdBQVEsRUFBRSxVQUFvQixFQUFFLE9BQWU7SUFDcEUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFDLElBQUksRUFBQyxFQUFFO1FBQzVDLElBQUk7WUFDRixPQUFPLE1BQU0sR0FBRyxDQUFDLGlCQUFpQixDQUFDO2dCQUNqQyxVQUFVLEVBQUUsSUFBSTtnQkFDaEIsWUFBWSxFQUFFLFdBQVc7Z0JBQ3pCLElBQUksRUFBRSxDQUFDO3dCQUNMLEdBQUcsRUFBRSxPQUFPO3dCQUNaLEtBQUssRUFBRSxNQUFNO3FCQUNkLENBQUM7YUFDSCxDQUFDLENBQUM7U0FDSjtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDbEQ7SUFDSCxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVEOztHQUVHO0FBQ0gsS0FBSyxVQUFVLFVBQVUsQ0FBQyxHQUFRLEVBQUUsVUFBb0IsRUFBRSxPQUFlO0lBQ3ZFLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxJQUFJLEVBQUMsRUFBRTtRQUM1QyxJQUFJO1lBQ0YsT0FBTyxNQUFNLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQztnQkFDdEMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDO2dCQUNsQixZQUFZLEVBQUUsV0FBVztnQkFDekIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1NBQ0o7UUFBQyxPQUFPLENBQU0sRUFBRTtZQUNmLFFBQVEsQ0FBQyxDQUFDLElBQUksRUFBRTtnQkFDZCxrRUFBa0U7Z0JBQ2xFLEtBQUssbUJBQW1CO29CQUN0QixPQUFPO2dCQUNUO29CQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsMEJBQTBCLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO2FBQzNEO1NBQ0Y7SUFDSCxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxNQUFNLENBQUMsTUFBZ0IsRUFBRSxNQUFnQjtJQUNoRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztBQUNyRCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyplc2xpbnQtZGlzYWJsZSBuby1jb25zb2xlKi9cbi8qIGVzbGludC1kaXNhYmxlIGltcG9ydC9uby1leHRyYW5lb3VzLWRlcGVuZGVuY2llcyAqL1xuaW1wb3J0IHsgU1NNIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LXNzbSc7XG5pbXBvcnQgeyBFeHBvcnRSZWFkZXJDUlByb3BzLCBDcm9zc1JlZ2lvbkV4cG9ydHMgfSBmcm9tICcuLi90eXBlcyc7XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoYW5kbGVyKGV2ZW50OiBBV1NMYW1iZGEuQ2xvdWRGb3JtYXRpb25DdXN0b21SZXNvdXJjZUV2ZW50KSB7XG4gIGNvbnN0IHByb3BzOiBFeHBvcnRSZWFkZXJDUlByb3BzID0gZXZlbnQuUmVzb3VyY2VQcm9wZXJ0aWVzLlJlYWRlclByb3BzO1xuICBjb25zdCBpbXBvcnRzOiBDcm9zc1JlZ2lvbkV4cG9ydHMgPSBwcm9wcy5pbXBvcnRzIGFzIENyb3NzUmVnaW9uRXhwb3J0cztcbiAgY29uc3QgaW1wb3J0TmFtZXMgPSBPYmplY3Qua2V5cyhpbXBvcnRzKTtcbiAgY29uc3Qga2V5TmFtZTogc3RyaW5nID0gYGF3cy1jZGs6c3Ryb25nLXJlZjoke3Byb3BzLnByZWZpeH1gO1xuXG4gIGNvbnN0IHNzbSA9IG5ldyBTU00oeyByZWdpb246IHByb3BzLnJlZ2lvbiB9KTtcbiAgdHJ5IHtcbiAgICBzd2l0Y2ggKGV2ZW50LlJlcXVlc3RUeXBlKSB7XG4gICAgICBjYXNlICdDcmVhdGUnOlxuICAgICAgICBjb25zb2xlLmluZm8oJ1RhZ2dpbmcgU1NNIFBhcmFtZXRlciBpbXBvcnRzJyk7XG4gICAgICAgIGF3YWl0IGFkZFRhZ3Moc3NtLCBpbXBvcnROYW1lcywga2V5TmFtZSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnVXBkYXRlJzpcbiAgICAgICAgY29uc3Qgb2xkUHJvcHM6IEV4cG9ydFJlYWRlckNSUHJvcHMgPSBldmVudC5PbGRSZXNvdXJjZVByb3BlcnRpZXMuUmVhZGVyUHJvcHM7XG4gICAgICAgIGNvbnN0IG9sZEV4cG9ydHM6IENyb3NzUmVnaW9uRXhwb3J0cyA9IG9sZFByb3BzLmltcG9ydHMgYXMgQ3Jvc3NSZWdpb25FeHBvcnRzO1xuICAgICAgICBjb25zdCBuZXdFeHBvcnRzID0gZXhjZXB0KGltcG9ydE5hbWVzLCBPYmplY3Qua2V5cyhvbGRFeHBvcnRzKSk7XG4gICAgICAgIGNvbnN0IHBhcmFtc1RvUmVsZWFzZSA9IGV4Y2VwdChPYmplY3Qua2V5cyhvbGRFeHBvcnRzKSwgaW1wb3J0TmFtZXMpO1xuICAgICAgICBjb25zb2xlLmluZm8oJ1JlbGVhc2luZyB1bnVzZWQgU1NNIFBhcmFtZXRlciBpbXBvcnRzJyk7XG4gICAgICAgIGlmIChPYmplY3Qua2V5cyhwYXJhbXNUb1JlbGVhc2UpLmxlbmd0aCA+IDApIHtcbiAgICAgICAgICBhd2FpdCByZW1vdmVUYWdzKHNzbSwgcGFyYW1zVG9SZWxlYXNlLCBrZXlOYW1lKTtcbiAgICAgICAgfVxuICAgICAgICBjb25zb2xlLmluZm8oJ1RhZ2dpbmcgbmV3IFNTTSBQYXJhbWV0ZXIgaW1wb3J0cycpO1xuICAgICAgICBhd2FpdCBhZGRUYWdzKHNzbSwgbmV3RXhwb3J0cywga2V5TmFtZSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnRGVsZXRlJzpcbiAgICAgICAgY29uc29sZS5pbmZvKCdSZWxlYXNpbmcgYWxsIFNTTSBQYXJhbWV0ZXIgZXhwb3J0cyBieSByZW1vdmluZyB0YWdzJyk7XG4gICAgICAgIGF3YWl0IHJlbW92ZVRhZ3Moc3NtLCBpbXBvcnROYW1lcywga2V5TmFtZSk7XG4gICAgICAgIHJldHVybjtcbiAgICB9XG4gIH0gY2F0Y2ggKGUpIHtcbiAgICBjb25zb2xlLmVycm9yKCdFcnJvciBpbXBvcnRpbmcgY3Jvc3MgcmVnaW9uIHN0YWNrIGV4cG9ydHM6ICcsIGUpO1xuICAgIHRocm93IGU7XG4gIH1cbiAgcmV0dXJuIHtcbiAgICBEYXRhOiBpbXBvcnRzLFxuICB9O1xufTtcblxuLyoqXG4gKiBBZGQgdGFnIHRvIHBhcmFtZXRlcnMgZm9yIGV4aXN0aW5nIGV4cG9ydHNcbiAqL1xuYXN5bmMgZnVuY3Rpb24gYWRkVGFncyhzc206IFNTTSwgcGFyYW1ldGVyczogc3RyaW5nW10sIGtleU5hbWU6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBhd2FpdCBQcm9taXNlLmFsbChwYXJhbWV0ZXJzLm1hcChhc3luYyBuYW1lID0+IHtcbiAgICB0cnkge1xuICAgICAgcmV0dXJuIGF3YWl0IHNzbS5hZGRUYWdzVG9SZXNvdXJjZSh7XG4gICAgICAgIFJlc291cmNlSWQ6IG5hbWUsXG4gICAgICAgIFJlc291cmNlVHlwZTogJ1BhcmFtZXRlcicsXG4gICAgICAgIFRhZ3M6IFt7XG4gICAgICAgICAgS2V5OiBrZXlOYW1lLFxuICAgICAgICAgIFZhbHVlOiAndHJ1ZScsXG4gICAgICAgIH1dLFxuICAgICAgfSk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKGBFcnJvciBpbXBvcnRpbmcgJHtuYW1lfTogJHtlfWApO1xuICAgIH1cbiAgfSkpO1xufVxuXG4vKipcbiAqIFJlbW92ZSB0YWdzIGZyb20gcGFyYW1ldGVyc1xuICovXG5hc3luYyBmdW5jdGlvbiByZW1vdmVUYWdzKHNzbTogU1NNLCBwYXJhbWV0ZXJzOiBzdHJpbmdbXSwga2V5TmFtZTogc3RyaW5nKTogUHJvbWlzZTx2b2lkPiB7XG4gIGF3YWl0IFByb21pc2UuYWxsKHBhcmFtZXRlcnMubWFwKGFzeW5jIG5hbWUgPT4ge1xuICAgIHRyeSB7XG4gICAgICByZXR1cm4gYXdhaXQgc3NtLnJlbW92ZVRhZ3NGcm9tUmVzb3VyY2Uoe1xuICAgICAgICBUYWdLZXlzOiBba2V5TmFtZV0sXG4gICAgICAgIFJlc291cmNlVHlwZTogJ1BhcmFtZXRlcicsXG4gICAgICAgIFJlc291cmNlSWQ6IG5hbWUsXG4gICAgICB9KTtcbiAgICB9IGNhdGNoIChlOiBhbnkpIHtcbiAgICAgIHN3aXRjaCAoZS5jb2RlKSB7XG4gICAgICAgIC8vIGlmIHRoZSBwYXJhbWV0ZXIgZG9lc24ndCBleGlzdCB0aGVuIHRoZXJlIGlzIG5vdGhpbmcgdG8gcmVsZWFzZVxuICAgICAgICBjYXNlICdJbnZhbGlkUmVzb3VyY2VJZCc6XG4gICAgICAgICAgcmV0dXJuO1xuICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgIHRocm93IG5ldyBFcnJvcihgRXJyb3IgcmVsZWFzaW5nIGltcG9ydCAke25hbWV9OiAke2V9YCk7XG4gICAgICB9XG4gICAgfVxuICB9KSk7XG59XG5cbi8qKlxuICogUmV0dXJuIG9ubHkgdGhlIGl0ZW1zIGZyb20gc291cmNlIHRoYXQgZG8gbm90IGV4aXN0IGluIHRoZSBmaWx0ZXJcbiAqXG4gKiBAcGFyYW0gc291cmNlIHRoZSBzb3VyY2Ugb2JqZWN0IHRvIHBlcmZvcm0gdGhlIGZpbHRlciBvblxuICogQHBhcmFtIGZpbHRlciBmaWx0ZXIgb3V0IGl0ZW1zIHRoYXQgZXhpc3QgaW4gdGhpcyBvYmplY3RcbiAqL1xuZnVuY3Rpb24gZXhjZXB0KHNvdXJjZTogc3RyaW5nW10sIGZpbHRlcjogc3RyaW5nW10pOiBzdHJpbmdbXSB7XG4gIHJldHVybiBzb3VyY2UuZmlsdGVyKGtleSA9PiAhZmlsdGVyLmluY2x1ZGVzKGtleSkpO1xufVxuIl19 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBNkI7QUFDN0Isc0RBQXNEO0FBQ3RELG9EQUE2RDtBQUd0RCxLQUFLLFVBQVUsT0FBTyxDQUFDLEtBQWtEO0lBQzlFLE1BQU0sS0FBSyxHQUF3QixLQUFLLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDO0lBQ3hFLE1BQU0sT0FBTyxHQUF1QixLQUFLLENBQUMsT0FBNkIsQ0FBQztJQUN4RSxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sT0FBTyxHQUFXLHNCQUFzQixLQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7SUFFN0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxnQkFBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzlDLElBQUk7UUFDRixRQUFRLEtBQUssQ0FBQyxXQUFXLEVBQUU7WUFDekIsS0FBSyxRQUFRO2dCQUNYLE9BQU8sQ0FBQyxJQUFJLENBQUMsK0JBQStCLENBQUMsQ0FBQztnQkFDOUMsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFDekMsTUFBTTtZQUNSLEtBQUssUUFBUTtnQkFDWCxNQUFNLFFBQVEsR0FBd0IsS0FBSyxDQUFDLHFCQUFxQixDQUFDLFdBQVcsQ0FBQztnQkFDOUUsTUFBTSxVQUFVLEdBQXVCLFFBQVEsQ0FBQyxPQUE2QixDQUFDO2dCQUM5RSxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDaEUsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUM7Z0JBQ3JFLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0NBQXdDLENBQUMsQ0FBQztnQkFDdkQsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7b0JBQzNDLE1BQU0sVUFBVSxDQUFDLEdBQUcsRUFBRSxlQUFlLEVBQUUsT0FBTyxDQUFDLENBQUM7aUJBQ2pEO2dCQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQztnQkFDbEQsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFDeEMsTUFBTTtZQUNSLEtBQUssUUFBUTtnQkFDWCxPQUFPLENBQUMsSUFBSSxDQUFDLHNEQUFzRCxDQUFDLENBQUM7Z0JBQ3JFLE1BQU0sVUFBVSxDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBQzVDLE9BQU87U0FDVjtLQUNGO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDVixPQUFPLENBQUMsS0FBSyxDQUFDLDhDQUE4QyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sQ0FBQyxDQUFDO0tBQ1Q7SUFDRCxPQUFPO1FBQ0wsSUFBSSxFQUFFLE9BQU87S0FDZCxDQUFDO0FBQ0osQ0FBQztBQXJDRCwwQkFxQ0M7QUFBQSxDQUFDO0FBRUY7O0dBRUc7QUFDSCxLQUFLLFVBQVUsT0FBTyxDQUFDLEdBQVEsRUFBRSxVQUFvQixFQUFFLE9BQWU7SUFDcEUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFDLElBQUksRUFBQyxFQUFFO1FBQzVDLElBQUk7WUFDRixPQUFPLE1BQU0sR0FBRyxDQUFDLGlCQUFpQixDQUFDO2dCQUNqQyxVQUFVLEVBQUUsSUFBSTtnQkFDaEIsWUFBWSxFQUFFLFdBQVc7Z0JBQ3pCLElBQUksRUFBRSxDQUFDO3dCQUNMLEdBQUcsRUFBRSxPQUFPO3dCQUNaLEtBQUssRUFBRSxNQUFNO3FCQUNkLENBQUM7YUFDSCxDQUFDLENBQUM7U0FDSjtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDbEQ7SUFDSCxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVEOztHQUVHO0FBQ0gsS0FBSyxVQUFVLFVBQVUsQ0FBQyxHQUFRLEVBQUUsVUFBb0IsRUFBRSxPQUFlO0lBQ3ZFLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxJQUFJLEVBQUMsRUFBRTtRQUM1QyxJQUFJO1lBQ0YsT0FBTyxNQUFNLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQztnQkFDdEMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDO2dCQUNsQixZQUFZLEVBQUUsV0FBVztnQkFDekIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1NBQ0o7UUFBQyxPQUFPLENBQU0sRUFBRTtZQUNmLElBQUksQ0FBQyxZQUFZLDhCQUFpQixFQUFFO2dCQUNsQyxPQUFPO2FBQ1I7aUJBQU07Z0JBQ0wsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDekQ7U0FDRjtJQUNILENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDTixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxTQUFTLE1BQU0sQ0FBQyxNQUFnQixFQUFFLE1BQWdCO0lBQ2hELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQ3JELENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKmVzbGludC1kaXNhYmxlIG5vLWNvbnNvbGUqL1xuLyogZXNsaW50LWRpc2FibGUgaW1wb3J0L25vLWV4dHJhbmVvdXMtZGVwZW5kZW5jaWVzICovXG5pbXBvcnQgeyBJbnZhbGlkUmVzb3VyY2VJZCwgU1NNIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LXNzbSc7XG5pbXBvcnQgeyBFeHBvcnRSZWFkZXJDUlByb3BzLCBDcm9zc1JlZ2lvbkV4cG9ydHMgfSBmcm9tICcuLi90eXBlcyc7XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoYW5kbGVyKGV2ZW50OiBBV1NMYW1iZGEuQ2xvdWRGb3JtYXRpb25DdXN0b21SZXNvdXJjZUV2ZW50KSB7XG4gIGNvbnN0IHByb3BzOiBFeHBvcnRSZWFkZXJDUlByb3BzID0gZXZlbnQuUmVzb3VyY2VQcm9wZXJ0aWVzLlJlYWRlclByb3BzO1xuICBjb25zdCBpbXBvcnRzOiBDcm9zc1JlZ2lvbkV4cG9ydHMgPSBwcm9wcy5pbXBvcnRzIGFzIENyb3NzUmVnaW9uRXhwb3J0cztcbiAgY29uc3QgaW1wb3J0TmFtZXMgPSBPYmplY3Qua2V5cyhpbXBvcnRzKTtcbiAgY29uc3Qga2V5TmFtZTogc3RyaW5nID0gYGF3cy1jZGs6c3Ryb25nLXJlZjoke3Byb3BzLnByZWZpeH1gO1xuXG4gIGNvbnN0IHNzbSA9IG5ldyBTU00oeyByZWdpb246IHByb3BzLnJlZ2lvbiB9KTtcbiAgdHJ5IHtcbiAgICBzd2l0Y2ggKGV2ZW50LlJlcXVlc3RUeXBlKSB7XG4gICAgICBjYXNlICdDcmVhdGUnOlxuICAgICAgICBjb25zb2xlLmluZm8oJ1RhZ2dpbmcgU1NNIFBhcmFtZXRlciBpbXBvcnRzJyk7XG4gICAgICAgIGF3YWl0IGFkZFRhZ3Moc3NtLCBpbXBvcnROYW1lcywga2V5TmFtZSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnVXBkYXRlJzpcbiAgICAgICAgY29uc3Qgb2xkUHJvcHM6IEV4cG9ydFJlYWRlckNSUHJvcHMgPSBldmVudC5PbGRSZXNvdXJjZVByb3BlcnRpZXMuUmVhZGVyUHJvcHM7XG4gICAgICAgIGNvbnN0IG9sZEV4cG9ydHM6IENyb3NzUmVnaW9uRXhwb3J0cyA9IG9sZFByb3BzLmltcG9ydHMgYXMgQ3Jvc3NSZWdpb25FeHBvcnRzO1xuICAgICAgICBjb25zdCBuZXdFeHBvcnRzID0gZXhjZXB0KGltcG9ydE5hbWVzLCBPYmplY3Qua2V5cyhvbGRFeHBvcnRzKSk7XG4gICAgICAgIGNvbnN0IHBhcmFtc1RvUmVsZWFzZSA9IGV4Y2VwdChPYmplY3Qua2V5cyhvbGRFeHBvcnRzKSwgaW1wb3J0TmFtZXMpO1xuICAgICAgICBjb25zb2xlLmluZm8oJ1JlbGVhc2luZyB1bnVzZWQgU1NNIFBhcmFtZXRlciBpbXBvcnRzJyk7XG4gICAgICAgIGlmIChPYmplY3Qua2V5cyhwYXJhbXNUb1JlbGVhc2UpLmxlbmd0aCA+IDApIHtcbiAgICAgICAgICBhd2FpdCByZW1vdmVUYWdzKHNzbSwgcGFyYW1zVG9SZWxlYXNlLCBrZXlOYW1lKTtcbiAgICAgICAgfVxuICAgICAgICBjb25zb2xlLmluZm8oJ1RhZ2dpbmcgbmV3IFNTTSBQYXJhbWV0ZXIgaW1wb3J0cycpO1xuICAgICAgICBhd2FpdCBhZGRUYWdzKHNzbSwgbmV3RXhwb3J0cywga2V5TmFtZSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnRGVsZXRlJzpcbiAgICAgICAgY29uc29sZS5pbmZvKCdSZWxlYXNpbmcgYWxsIFNTTSBQYXJhbWV0ZXIgZXhwb3J0cyBieSByZW1vdmluZyB0YWdzJyk7XG4gICAgICAgIGF3YWl0IHJlbW92ZVRhZ3Moc3NtLCBpbXBvcnROYW1lcywga2V5TmFtZSk7XG4gICAgICAgIHJldHVybjtcbiAgICB9XG4gIH0gY2F0Y2ggKGUpIHtcbiAgICBjb25zb2xlLmVycm9yKCdFcnJvciBpbXBvcnRpbmcgY3Jvc3MgcmVnaW9uIHN0YWNrIGV4cG9ydHM6ICcsIGUpO1xuICAgIHRocm93IGU7XG4gIH1cbiAgcmV0dXJuIHtcbiAgICBEYXRhOiBpbXBvcnRzLFxuICB9O1xufTtcblxuLyoqXG4gKiBBZGQgdGFnIHRvIHBhcmFtZXRlcnMgZm9yIGV4aXN0aW5nIGV4cG9ydHNcbiAqL1xuYXN5bmMgZnVuY3Rpb24gYWRkVGFncyhzc206IFNTTSwgcGFyYW1ldGVyczogc3RyaW5nW10sIGtleU5hbWU6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBhd2FpdCBQcm9taXNlLmFsbChwYXJhbWV0ZXJzLm1hcChhc3luYyBuYW1lID0+IHtcbiAgICB0cnkge1xuICAgICAgcmV0dXJuIGF3YWl0IHNzbS5hZGRUYWdzVG9SZXNvdXJjZSh7XG4gICAgICAgIFJlc291cmNlSWQ6IG5hbWUsXG4gICAgICAgIFJlc291cmNlVHlwZTogJ1BhcmFtZXRlcicsXG4gICAgICAgIFRhZ3M6IFt7XG4gICAgICAgICAgS2V5OiBrZXlOYW1lLFxuICAgICAgICAgIFZhbHVlOiAndHJ1ZScsXG4gICAgICAgIH1dLFxuICAgICAgfSk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKGBFcnJvciBpbXBvcnRpbmcgJHtuYW1lfTogJHtlfWApO1xuICAgIH1cbiAgfSkpO1xufVxuXG4vKipcbiAqIFJlbW92ZSB0YWdzIGZyb20gcGFyYW1ldGVyc1xuICovXG5hc3luYyBmdW5jdGlvbiByZW1vdmVUYWdzKHNzbTogU1NNLCBwYXJhbWV0ZXJzOiBzdHJpbmdbXSwga2V5TmFtZTogc3RyaW5nKTogUHJvbWlzZTx2b2lkPiB7XG4gIGF3YWl0IFByb21pc2UuYWxsKHBhcmFtZXRlcnMubWFwKGFzeW5jIG5hbWUgPT4ge1xuICAgIHRyeSB7XG4gICAgICByZXR1cm4gYXdhaXQgc3NtLnJlbW92ZVRhZ3NGcm9tUmVzb3VyY2Uoe1xuICAgICAgICBUYWdLZXlzOiBba2V5TmFtZV0sXG4gICAgICAgIFJlc291cmNlVHlwZTogJ1BhcmFtZXRlcicsXG4gICAgICAgIFJlc291cmNlSWQ6IG5hbWUsXG4gICAgICB9KTtcbiAgICB9IGNhdGNoIChlOiBhbnkpIHtcbiAgICAgIGlmIChlIGluc3RhbmNlb2YgSW52YWxpZFJlc291cmNlSWQpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBFcnJvciByZWxlYXNpbmcgaW1wb3J0ICR7bmFtZX06ICR7ZX1gKTtcbiAgICAgIH1cbiAgICB9XG4gIH0pKTtcbn1cblxuLyoqXG4gKiBSZXR1cm4gb25seSB0aGUgaXRlbXMgZnJvbSBzb3VyY2UgdGhhdCBkbyBub3QgZXhpc3QgaW4gdGhlIGZpbHRlclxuICpcbiAqIEBwYXJhbSBzb3VyY2UgdGhlIHNvdXJjZSBvYmplY3QgdG8gcGVyZm9ybSB0aGUgZmlsdGVyIG9uXG4gKiBAcGFyYW0gZmlsdGVyIGZpbHRlciBvdXQgaXRlbXMgdGhhdCBleGlzdCBpbiB0aGlzIG9iamVjdFxuICovXG5mdW5jdGlvbiBleGNlcHQoc291cmNlOiBzdHJpbmdbXSwgZmlsdGVyOiBzdHJpbmdbXSk6IHN0cmluZ1tdIHtcbiAgcmV0dXJuIHNvdXJjZS5maWx0ZXIoa2V5ID0+ICFmaWx0ZXIuaW5jbHVkZXMoa2V5KSk7XG59XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/__entrypoint__.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/__entrypoint__.js diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js similarity index 53% rename from packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js index 2afa65bd693b1..e894e25b491e5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js @@ -111,7 +111,7 @@ async function isInUse(ssm, parameterName) { catch (e) { // an InvalidResourceId means that the parameter doesn't exist // which we should ignore since that means it's not in use - if (e.code === 'InvalidResourceId') { + if (e instanceof client_ssm_1.InvalidResourceId) { return new Set(); } throw e; @@ -149,4 +149,4 @@ function changed(oldParams, newParams) { return acc; }, []); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/*eslint-disable no-console*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { SSM } from '@aws-sdk/client-ssm';\nimport { CrossRegionExports, ExportWriterCRProps } from '../types';\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) {\n  const props: ExportWriterCRProps = event.ResourceProperties.WriterProps;\n  const exports = props.exports as CrossRegionExports;\n\n  const ssm = new SSM({ region: props.region });\n  try {\n    switch (event.RequestType) {\n      case 'Create':\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await throwIfAnyInUse(ssm, exports);\n        await putParameters(ssm, exports);\n        return;\n      case 'Update':\n        const oldProps: ExportWriterCRProps = event.OldResourceProperties.WriterProps;\n        const oldExports = oldProps.exports as CrossRegionExports;\n        const newExports = except(exports, oldExports);\n\n        // throw an error to fail the deployment if any export value is changing\n        const changedExports = changed(oldExports, exports);\n        if (changedExports.length > 0) {\n          throw new Error('Some exports have changed!\\n'+ changedExports.join('\\n'));\n        }\n        // if we are removing any exports that are in use, then throw an\n        // error to fail the deployment\n        const removedExports = except(oldExports, exports);\n        await throwIfAnyInUse(ssm, removedExports);\n        // if the ones we are removing are not in use then delete them\n        // skip if no export names are to be deleted\n        const removedExportsNames = Object.keys(removedExports);\n        if (removedExportsNames.length > 0) {\n          await ssm.deleteParameters({\n            Names: removedExportsNames,\n          });\n        }\n\n        // also throw an error if we are creating a new export that already exists for some reason\n        await throwIfAnyInUse(ssm, newExports);\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await putParameters(ssm, newExports);\n        return;\n      case 'Delete':\n        // if any of the exports are currently in use then throw an error to fail\n        // the stack deletion.\n        await throwIfAnyInUse(ssm, exports);\n        // if none are in use then delete all of them\n        await ssm.deleteParameters({\n          Names: Object.keys(exports),\n        });\n        return;\n      default:\n        return;\n    }\n  } catch (e) {\n    console.error('Error processing event: ', e);\n    throw e;\n  }\n};\n\n/**\n * Create parameters for existing exports\n */\nasync function putParameters(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  await Promise.all(Array.from(Object.entries(parameters), ([name, value]) => {\n    return ssm.putParameter({\n      Name: name,\n      Value: value,\n      Type: 'String',\n    });\n  }));\n}\n\n/**\n * Query for existing parameters that are in use\n */\nasync function throwIfAnyInUse(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  const tagResults: Map<string, Set<string>> = new Map();\n  await Promise.all(Object.keys(parameters).map(async (name: string) => {\n    const result = await isInUse(ssm, name);\n    if (result.size > 0) {\n      tagResults.set(name, result);\n    }\n  }));\n\n  if (tagResults.size > 0) {\n    const message: string = Object.entries(tagResults)\n      .map((result: [string, string[]]) => `${result[0]} is in use by stack(s) ${result[1].join(' ')}`)\n      .join('\\n');\n    throw new Error(`Exports cannot be updated: \\n${message}`);\n  }\n}\n\n/**\n * Check if a parameter is in use\n */\nasync function isInUse(ssm: SSM, parameterName: string): Promise<Set<string>> {\n  const tagResults: Set<string> = new Set();\n  try {\n    const result = await ssm.listTagsForResource({\n      ResourceId: parameterName,\n      ResourceType: 'Parameter',\n    });\n    result.TagList?.forEach(tag => {\n      const tagParts = tag.Key?.split(':') ?? [];\n      if (tagParts[0] === 'aws-cdk' && tagParts[1] === 'strong-ref') {\n        tagResults.add(tagParts[2]);\n      }\n    });\n  } catch (e: any) {\n    // an InvalidResourceId means that the parameter doesn't exist\n    // which we should ignore since that means it's not in use\n    if (e.code === 'InvalidResourceId') {\n      return new Set();\n    }\n    throw e;\n  }\n  return tagResults;\n}\n\n/**\n * Return only the items from source that do not exist in the filter\n *\n * @param source the source object to perform the filter on\n * @param filter filter out items that exist in this object\n * @returns any exports that don't exist in the filter\n */\nfunction except(source: CrossRegionExports, filter: CrossRegionExports): CrossRegionExports {\n  return Object.keys(source)\n    .filter(key => (!filter.hasOwnProperty(key)))\n    .reduce((acc: CrossRegionExports, curr: string) => {\n      acc[curr] = source[curr];\n      return acc;\n    }, {});\n}\n\n/**\n * Return items that exist in both the the old parameters and the new parameters,\n * but have different values\n *\n * @param oldParams the exports that existed previous to this execution\n * @param newParams the exports for the current execution\n * @returns any parameters that have different values\n */\nfunction changed(oldParams: CrossRegionExports, newParams: CrossRegionExports): string[] {\n  return Object.keys(oldParams)\n    .filter(key => (newParams.hasOwnProperty(key) && oldParams[key] !== newParams[key]))\n    .reduce((acc: string[], curr: string) => {\n      acc.push(curr);\n      return acc;\n    }, []);\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/*eslint-disable no-console*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { InvalidResourceId, SSM } from '@aws-sdk/client-ssm';\nimport { CrossRegionExports, ExportWriterCRProps } from '../types';\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) {\n  const props: ExportWriterCRProps = event.ResourceProperties.WriterProps;\n  const exports = props.exports as CrossRegionExports;\n\n  const ssm = new SSM({ region: props.region });\n  try {\n    switch (event.RequestType) {\n      case 'Create':\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await throwIfAnyInUse(ssm, exports);\n        await putParameters(ssm, exports);\n        return;\n      case 'Update':\n        const oldProps: ExportWriterCRProps = event.OldResourceProperties.WriterProps;\n        const oldExports = oldProps.exports as CrossRegionExports;\n        const newExports = except(exports, oldExports);\n\n        // throw an error to fail the deployment if any export value is changing\n        const changedExports = changed(oldExports, exports);\n        if (changedExports.length > 0) {\n          throw new Error('Some exports have changed!\\n'+ changedExports.join('\\n'));\n        }\n        // if we are removing any exports that are in use, then throw an\n        // error to fail the deployment\n        const removedExports = except(oldExports, exports);\n        await throwIfAnyInUse(ssm, removedExports);\n        // if the ones we are removing are not in use then delete them\n        // skip if no export names are to be deleted\n        const removedExportsNames = Object.keys(removedExports);\n        if (removedExportsNames.length > 0) {\n          await ssm.deleteParameters({\n            Names: removedExportsNames,\n          });\n        }\n\n        // also throw an error if we are creating a new export that already exists for some reason\n        await throwIfAnyInUse(ssm, newExports);\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await putParameters(ssm, newExports);\n        return;\n      case 'Delete':\n        // if any of the exports are currently in use then throw an error to fail\n        // the stack deletion.\n        await throwIfAnyInUse(ssm, exports);\n        // if none are in use then delete all of them\n        await ssm.deleteParameters({\n          Names: Object.keys(exports),\n        });\n        return;\n      default:\n        return;\n    }\n  } catch (e) {\n    console.error('Error processing event: ', e);\n    throw e;\n  }\n};\n\n/**\n * Create parameters for existing exports\n */\nasync function putParameters(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  await Promise.all(Array.from(Object.entries(parameters), ([name, value]) => {\n    return ssm.putParameter({\n      Name: name,\n      Value: value,\n      Type: 'String',\n    });\n  }));\n}\n\n/**\n * Query for existing parameters that are in use\n */\nasync function throwIfAnyInUse(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  const tagResults: Map<string, Set<string>> = new Map();\n  await Promise.all(Object.keys(parameters).map(async (name: string) => {\n    const result = await isInUse(ssm, name);\n    if (result.size > 0) {\n      tagResults.set(name, result);\n    }\n  }));\n\n  if (tagResults.size > 0) {\n    const message: string = Object.entries(tagResults)\n      .map((result: [string, string[]]) => `${result[0]} is in use by stack(s) ${result[1].join(' ')}`)\n      .join('\\n');\n    throw new Error(`Exports cannot be updated: \\n${message}`);\n  }\n}\n\n/**\n * Check if a parameter is in use\n */\nasync function isInUse(ssm: SSM, parameterName: string): Promise<Set<string>> {\n  const tagResults: Set<string> = new Set();\n  try {\n    const result = await ssm.listTagsForResource({\n      ResourceId: parameterName,\n      ResourceType: 'Parameter',\n    });\n    result.TagList?.forEach(tag => {\n      const tagParts = tag.Key?.split(':') ?? [];\n      if (tagParts[0] === 'aws-cdk' && tagParts[1] === 'strong-ref') {\n        tagResults.add(tagParts[2]);\n      }\n    });\n  } catch (e: any) {\n    // an InvalidResourceId means that the parameter doesn't exist\n    // which we should ignore since that means it's not in use\n    if (e instanceof InvalidResourceId) {\n      return new Set();\n    }\n    throw e;\n  }\n  return tagResults;\n}\n\n/**\n * Return only the items from source that do not exist in the filter\n *\n * @param source the source object to perform the filter on\n * @param filter filter out items that exist in this object\n * @returns any exports that don't exist in the filter\n */\nfunction except(source: CrossRegionExports, filter: CrossRegionExports): CrossRegionExports {\n  return Object.keys(source)\n    .filter(key => (!filter.hasOwnProperty(key)))\n    .reduce((acc: CrossRegionExports, curr: string) => {\n      acc[curr] = source[curr];\n      return acc;\n    }, {});\n}\n\n/**\n * Return items that exist in both the the old parameters and the new parameters,\n * but have different values\n *\n * @param oldParams the exports that existed previous to this execution\n * @param newParams the exports for the current execution\n * @returns any parameters that have different values\n */\nfunction changed(oldParams: CrossRegionExports, newParams: CrossRegionExports): string[] {\n  return Object.keys(oldParams)\n    .filter(key => (newParams.hasOwnProperty(key) && oldParams[key] !== newParams[key]))\n    .reduce((acc: string[], curr: string) => {\n      acc.push(curr);\n      return acc;\n    }, []);\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json index eb89883aab7d3..a655df72cca96 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json @@ -1,21 +1,21 @@ { "version": "32.0.0", "files": { - "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1": { + "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707": { "source": { - "path": "asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1", + "path": "asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707", "packaging": "zip" }, "destinations": { "12345678-us-east-1": { "bucketName": "cdk-hnb659fds-assets-12345678-us-east-1", - "objectKey": "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1.zip", + "objectKey": "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707.zip", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-us-east-1" } } }, - "06ebf41a5e3b2f5b37553cd7bd38b7293f0f3fd1224562144b6ae4da7cd9507f": { + "4b7e1b4f4a5deee38294099c4a003b61c29ecb742f56bf99436b39b72a7bf306": { "source": { "path": "integ-acm-stack.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "12345678-us-east-1": { "bucketName": "cdk-hnb659fds-assets-12345678-us-east-1", - "objectKey": "06ebf41a5e3b2f5b37553cd7bd38b7293f0f3fd1224562144b6ae4da7cd9507f.json", + "objectKey": "4b7e1b4f4a5deee38294099c4a003b61c29ecb742f56bf99436b39b72a7bf306.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-us-east-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json index 5f91b0ea82ffb..b4c89dc230be3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json @@ -89,7 +89,7 @@ "Properties": { "Code": { "S3Bucket": "cdk-hnb659fds-assets-12345678-us-east-1", - "S3Key": "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1.zip" + "S3Key": "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json index 77786cb073c15..97b75603e7bcf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json @@ -1,21 +1,21 @@ { "version": "32.0.0", "files": { - "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43": { + "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d": { "source": { - "path": "asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43", + "path": "asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d", "packaging": "zip" }, "destinations": { "12345678-us-east-2": { "bucketName": "cdk-hnb659fds-assets-12345678-us-east-2", - "objectKey": "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43.zip", + "objectKey": "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d.zip", "region": "us-east-2", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-us-east-2" } } }, - "36037c7546d57106e4e45e3cf67becfa56671ba0b756e3babc4835933ea854ca": { + "8bf7005bb92668630dede945c73a8aaf5d15697928c0ac998f5f62c7b36c0116": { "source": { "path": "integ-cloudfront-stack.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "12345678-us-east-2": { "bucketName": "cdk-hnb659fds-assets-12345678-us-east-2", - "objectKey": "36037c7546d57106e4e45e3cf67becfa56671ba0b756e3babc4835933ea854ca.json", + "objectKey": "8bf7005bb92668630dede945c73a8aaf5d15697928c0ac998f5f62c7b36c0116.json", "region": "us-east-2", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-us-east-2" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json index 67e37c0ab878c..f1302da2f59dc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json @@ -104,7 +104,7 @@ "Properties": { "Code": { "S3Bucket": "cdk-hnb659fds-assets-12345678-us-east-2", - "S3Key": "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43.zip" + "S3Key": "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json index 619ca65757306..6f22a44e86cb1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json @@ -6,7 +6,7 @@ "stacks": [ "integ-cloudfront-stack" ], - "diffAssets": false, + "diffAssets": true, "assertionStack": "integ-cloudfront-cross-region-acm/DefaultTest/DeployAssert", "assertionStackName": "integcloudfrontcrossregionacmDefaultTestDeployAssertD48673AA" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json index 644ee37633120..43a2f37a4ad17 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-us-east-1/06ebf41a5e3b2f5b37553cd7bd38b7293f0f3fd1224562144b6ae4da7cd9507f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-us-east-1/4b7e1b4f4a5deee38294099c4a003b61c29ecb742f56bf99436b39b72a7bf306.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -88,7 +88,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-us-east-2", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-us-east-2", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-us-east-2/36037c7546d57106e4e45e3cf67becfa56671ba0b756e3babc4835933ea854ca.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-us-east-2/8bf7005bb92668630dede945c73a8aaf5d15697928c0ac998f5f62c7b36c0116.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.ts index 83843333d8f35..0ce961ac1b94e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.ts @@ -50,6 +50,6 @@ new cloudfront.Distribution(cloudFrontStack, 'Distro', { new IntegTest(app, 'integ-cloudfront-cross-region-acm', { testCases: [cloudFrontStack], - diffAssets: false, + diffAssets: true, enableLookups: true, }); diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/__entrypoint__.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/__entrypoint__.js diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js similarity index 53% rename from packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js index 2afa65bd693b1..e894e25b491e5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1/index.js +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707/index.js @@ -111,7 +111,7 @@ async function isInUse(ssm, parameterName) { catch (e) { // an InvalidResourceId means that the parameter doesn't exist // which we should ignore since that means it's not in use - if (e.code === 'InvalidResourceId') { + if (e instanceof client_ssm_1.InvalidResourceId) { return new Set(); } throw e; @@ -149,4 +149,4 @@ function changed(oldParams, newParams) { return acc; }, []); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/*eslint-disable no-console*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { SSM } from '@aws-sdk/client-ssm';\nimport { CrossRegionExports, ExportWriterCRProps } from '../types';\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) {\n  const props: ExportWriterCRProps = event.ResourceProperties.WriterProps;\n  const exports = props.exports as CrossRegionExports;\n\n  const ssm = new SSM({ region: props.region });\n  try {\n    switch (event.RequestType) {\n      case 'Create':\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await throwIfAnyInUse(ssm, exports);\n        await putParameters(ssm, exports);\n        return;\n      case 'Update':\n        const oldProps: ExportWriterCRProps = event.OldResourceProperties.WriterProps;\n        const oldExports = oldProps.exports as CrossRegionExports;\n        const newExports = except(exports, oldExports);\n\n        // throw an error to fail the deployment if any export value is changing\n        const changedExports = changed(oldExports, exports);\n        if (changedExports.length > 0) {\n          throw new Error('Some exports have changed!\\n'+ changedExports.join('\\n'));\n        }\n        // if we are removing any exports that are in use, then throw an\n        // error to fail the deployment\n        const removedExports = except(oldExports, exports);\n        await throwIfAnyInUse(ssm, removedExports);\n        // if the ones we are removing are not in use then delete them\n        // skip if no export names are to be deleted\n        const removedExportsNames = Object.keys(removedExports);\n        if (removedExportsNames.length > 0) {\n          await ssm.deleteParameters({\n            Names: removedExportsNames,\n          });\n        }\n\n        // also throw an error if we are creating a new export that already exists for some reason\n        await throwIfAnyInUse(ssm, newExports);\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await putParameters(ssm, newExports);\n        return;\n      case 'Delete':\n        // if any of the exports are currently in use then throw an error to fail\n        // the stack deletion.\n        await throwIfAnyInUse(ssm, exports);\n        // if none are in use then delete all of them\n        await ssm.deleteParameters({\n          Names: Object.keys(exports),\n        });\n        return;\n      default:\n        return;\n    }\n  } catch (e) {\n    console.error('Error processing event: ', e);\n    throw e;\n  }\n};\n\n/**\n * Create parameters for existing exports\n */\nasync function putParameters(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  await Promise.all(Array.from(Object.entries(parameters), ([name, value]) => {\n    return ssm.putParameter({\n      Name: name,\n      Value: value,\n      Type: 'String',\n    });\n  }));\n}\n\n/**\n * Query for existing parameters that are in use\n */\nasync function throwIfAnyInUse(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  const tagResults: Map<string, Set<string>> = new Map();\n  await Promise.all(Object.keys(parameters).map(async (name: string) => {\n    const result = await isInUse(ssm, name);\n    if (result.size > 0) {\n      tagResults.set(name, result);\n    }\n  }));\n\n  if (tagResults.size > 0) {\n    const message: string = Object.entries(tagResults)\n      .map((result: [string, string[]]) => `${result[0]} is in use by stack(s) ${result[1].join(' ')}`)\n      .join('\\n');\n    throw new Error(`Exports cannot be updated: \\n${message}`);\n  }\n}\n\n/**\n * Check if a parameter is in use\n */\nasync function isInUse(ssm: SSM, parameterName: string): Promise<Set<string>> {\n  const tagResults: Set<string> = new Set();\n  try {\n    const result = await ssm.listTagsForResource({\n      ResourceId: parameterName,\n      ResourceType: 'Parameter',\n    });\n    result.TagList?.forEach(tag => {\n      const tagParts = tag.Key?.split(':') ?? [];\n      if (tagParts[0] === 'aws-cdk' && tagParts[1] === 'strong-ref') {\n        tagResults.add(tagParts[2]);\n      }\n    });\n  } catch (e: any) {\n    // an InvalidResourceId means that the parameter doesn't exist\n    // which we should ignore since that means it's not in use\n    if (e.code === 'InvalidResourceId') {\n      return new Set();\n    }\n    throw e;\n  }\n  return tagResults;\n}\n\n/**\n * Return only the items from source that do not exist in the filter\n *\n * @param source the source object to perform the filter on\n * @param filter filter out items that exist in this object\n * @returns any exports that don't exist in the filter\n */\nfunction except(source: CrossRegionExports, filter: CrossRegionExports): CrossRegionExports {\n  return Object.keys(source)\n    .filter(key => (!filter.hasOwnProperty(key)))\n    .reduce((acc: CrossRegionExports, curr: string) => {\n      acc[curr] = source[curr];\n      return acc;\n    }, {});\n}\n\n/**\n * Return items that exist in both the the old parameters and the new parameters,\n * but have different values\n *\n * @param oldParams the exports that existed previous to this execution\n * @param newParams the exports for the current execution\n * @returns any parameters that have different values\n */\nfunction changed(oldParams: CrossRegionExports, newParams: CrossRegionExports): string[] {\n  return Object.keys(oldParams)\n    .filter(key => (newParams.hasOwnProperty(key) && oldParams[key] !== newParams[key]))\n    .reduce((acc: string[], curr: string) => {\n      acc.push(curr);\n      return acc;\n    }, []);\n}\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/*eslint-disable no-console*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { InvalidResourceId, SSM } from '@aws-sdk/client-ssm';\nimport { CrossRegionExports, ExportWriterCRProps } from '../types';\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) {\n  const props: ExportWriterCRProps = event.ResourceProperties.WriterProps;\n  const exports = props.exports as CrossRegionExports;\n\n  const ssm = new SSM({ region: props.region });\n  try {\n    switch (event.RequestType) {\n      case 'Create':\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await throwIfAnyInUse(ssm, exports);\n        await putParameters(ssm, exports);\n        return;\n      case 'Update':\n        const oldProps: ExportWriterCRProps = event.OldResourceProperties.WriterProps;\n        const oldExports = oldProps.exports as CrossRegionExports;\n        const newExports = except(exports, oldExports);\n\n        // throw an error to fail the deployment if any export value is changing\n        const changedExports = changed(oldExports, exports);\n        if (changedExports.length > 0) {\n          throw new Error('Some exports have changed!\\n'+ changedExports.join('\\n'));\n        }\n        // if we are removing any exports that are in use, then throw an\n        // error to fail the deployment\n        const removedExports = except(oldExports, exports);\n        await throwIfAnyInUse(ssm, removedExports);\n        // if the ones we are removing are not in use then delete them\n        // skip if no export names are to be deleted\n        const removedExportsNames = Object.keys(removedExports);\n        if (removedExportsNames.length > 0) {\n          await ssm.deleteParameters({\n            Names: removedExportsNames,\n          });\n        }\n\n        // also throw an error if we are creating a new export that already exists for some reason\n        await throwIfAnyInUse(ssm, newExports);\n        console.info(`Creating new SSM Parameter exports in region ${props.region}`);\n        await putParameters(ssm, newExports);\n        return;\n      case 'Delete':\n        // if any of the exports are currently in use then throw an error to fail\n        // the stack deletion.\n        await throwIfAnyInUse(ssm, exports);\n        // if none are in use then delete all of them\n        await ssm.deleteParameters({\n          Names: Object.keys(exports),\n        });\n        return;\n      default:\n        return;\n    }\n  } catch (e) {\n    console.error('Error processing event: ', e);\n    throw e;\n  }\n};\n\n/**\n * Create parameters for existing exports\n */\nasync function putParameters(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  await Promise.all(Array.from(Object.entries(parameters), ([name, value]) => {\n    return ssm.putParameter({\n      Name: name,\n      Value: value,\n      Type: 'String',\n    });\n  }));\n}\n\n/**\n * Query for existing parameters that are in use\n */\nasync function throwIfAnyInUse(ssm: SSM, parameters: CrossRegionExports): Promise<void> {\n  const tagResults: Map<string, Set<string>> = new Map();\n  await Promise.all(Object.keys(parameters).map(async (name: string) => {\n    const result = await isInUse(ssm, name);\n    if (result.size > 0) {\n      tagResults.set(name, result);\n    }\n  }));\n\n  if (tagResults.size > 0) {\n    const message: string = Object.entries(tagResults)\n      .map((result: [string, string[]]) => `${result[0]} is in use by stack(s) ${result[1].join(' ')}`)\n      .join('\\n');\n    throw new Error(`Exports cannot be updated: \\n${message}`);\n  }\n}\n\n/**\n * Check if a parameter is in use\n */\nasync function isInUse(ssm: SSM, parameterName: string): Promise<Set<string>> {\n  const tagResults: Set<string> = new Set();\n  try {\n    const result = await ssm.listTagsForResource({\n      ResourceId: parameterName,\n      ResourceType: 'Parameter',\n    });\n    result.TagList?.forEach(tag => {\n      const tagParts = tag.Key?.split(':') ?? [];\n      if (tagParts[0] === 'aws-cdk' && tagParts[1] === 'strong-ref') {\n        tagResults.add(tagParts[2]);\n      }\n    });\n  } catch (e: any) {\n    // an InvalidResourceId means that the parameter doesn't exist\n    // which we should ignore since that means it's not in use\n    if (e instanceof InvalidResourceId) {\n      return new Set();\n    }\n    throw e;\n  }\n  return tagResults;\n}\n\n/**\n * Return only the items from source that do not exist in the filter\n *\n * @param source the source object to perform the filter on\n * @param filter filter out items that exist in this object\n * @returns any exports that don't exist in the filter\n */\nfunction except(source: CrossRegionExports, filter: CrossRegionExports): CrossRegionExports {\n  return Object.keys(source)\n    .filter(key => (!filter.hasOwnProperty(key)))\n    .reduce((acc: CrossRegionExports, curr: string) => {\n      acc[curr] = source[curr];\n      return acc;\n    }, {});\n}\n\n/**\n * Return items that exist in both the the old parameters and the new parameters,\n * but have different values\n *\n * @param oldParams the exports that existed previous to this execution\n * @param newParams the exports for the current execution\n * @returns any parameters that have different values\n */\nfunction changed(oldParams: CrossRegionExports, newParams: CrossRegionExports): string[] {\n  return Object.keys(oldParams)\n    .filter(key => (newParams.hasOwnProperty(key) && oldParams[key] !== newParams[key]))\n    .reduce((acc: string[], curr: string) => {\n      acc.push(curr);\n      return acc;\n    }, []);\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.assets.json index d2d558f52e959..5bd34fd7eb9d4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.assets.json @@ -1,21 +1,21 @@ { "version": "32.0.0", "files": { - "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1": { + "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707": { "source": { - "path": "asset.a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1", + "path": "asset.dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707", "packaging": "zip" }, "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1.zip", + "objectKey": "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707.zip", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "e20e7104d895f82937f573dfabacaff07374e349c39f1b7cbdb8cef88c0d305c": { + "791d3baf8332708fce423c49cba397293598f9fde56970e3d3f3381c734654e2": { "source": { "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "e20e7104d895f82937f573dfabacaff07374e349c39f1b7cbdb8cef88c0d305c.json", + "objectKey": "791d3baf8332708fce423c49cba397293598f9fde56970e3d3f3381c734654e2.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.template.json index 6b41f3dfe542d..10876144024fc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61.template.json @@ -109,7 +109,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "a60fdad7a8c0f3b134ee34463d66db2443c77d0adb4d3e603e1267c11b3df6e1.zip" + "S3Key": "dac9e4b5d47d964a6d6c14b583ec7968bd6307d1d73c20e9327c303a18a3a707.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.assets.json index eb21019835974..c7ee35752b894 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.assets.json @@ -1,21 +1,21 @@ { "version": "32.0.0", "files": { - "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43": { + "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d": { "source": { - "path": "asset.214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43", + "path": "asset.09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d", "packaging": "zip" }, "destinations": { "current_account-us-east-2": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-2", - "objectKey": "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43.zip", + "objectKey": "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d.zip", "region": "us-east-2", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-2" } } }, - "628bb48e7bd91d54b6ce92c0e7ca1bd95fc910b8875be69a0ab970a7fa6e596e": { + "6f003cd17557bc08eaa29932e763809c1541933c8845bc7b5342e750c1fd0581": { "source": { "path": "integ-https-redirect.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "current_account-us-east-2": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-2", - "objectKey": "628bb48e7bd91d54b6ce92c0e7ca1bd95fc910b8875be69a0ab970a7fa6e596e.json", + "objectKey": "6f003cd17557bc08eaa29932e763809c1541933c8845bc7b5342e750c1fd0581.json", "region": "us-east-2", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-2" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.template.json index 19308d7b3bd2c..7cceb0d002354 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ-https-redirect.template.json @@ -99,8 +99,6 @@ "redirectRedirectAliasRecord700dc535A8D685": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "integ.example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::GetAtt": [ @@ -118,14 +116,14 @@ ] } }, - "HostedZoneId": "Z23ABC4XYZL05B" + "HostedZoneId": "Z23ABC4XYZL05B", + "Name": "integ.example.com.", + "Type": "A" } }, "redirectRedirectAliasRecordSix700dc5B6BB8C6E": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "integ.example.com.", - "Type": "AAAA", "AliasTarget": { "DNSName": { "Fn::GetAtt": [ @@ -143,7 +141,9 @@ ] } }, - "HostedZoneId": "Z23ABC4XYZL05B" + "HostedZoneId": "Z23ABC4XYZL05B", + "Name": "integ.example.com.", + "Type": "AAAA" } }, "ExportsReader8B249524": { @@ -225,7 +225,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-2" }, - "S3Key": "214c0a1c55832d2c26686c93062b90cfd4031cef0e1b5964eb2117b1dae7bb43.zip" + "S3Key": "09d97dcfcef5cdc7c214c4d1d2176add2c61f9f511990346a8cec8f4b8cb587d.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ.json index 8f701ed13d656..357f78f94e72e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/integ.json @@ -6,6 +6,7 @@ "stacks": [ "integ-https-redirect" ], + "diffAssets": true, "stackUpdateWorkflow": false, "assertionStack": "integ-test/DefaultTest/DeployAssert", "assertionStackName": "integtestDefaultTestDeployAssert24D5C536" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/manifest.json index 10bad00da1850..15b3fe177c419 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-2", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-2", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-2/628bb48e7bd91d54b6ce92c0e7ca1bd95fc910b8875be69a0ab970a7fa6e596e.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-2/6f003cd17557bc08eaa29932e763809c1541933c8845bc7b5342e750c1fd0581.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -113,7 +113,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/e20e7104d895f82937f573dfabacaff07374e349c39f1b7cbdb8cef88c0d305c.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/791d3baf8332708fce423c49cba397293598f9fde56970e3d3f3381c734654e2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/tree.json index 5950e90b3037b..a5db0207d4e04 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53-patterns/test/integ.hosted-redirect.js.snapshot/tree.json @@ -12,8 +12,8 @@ "id": "HostedZone", "path": "integ-https-redirect/HostedZone", "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "redirect": { @@ -45,14 +45,14 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.CfnBucket", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.Bucket", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "RedirectDistribution": { @@ -140,14 +140,14 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_cloudfront.CfnDistribution", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_cloudfront.CloudFrontWebDistribution", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "RedirectAliasRecord700dc5": { @@ -160,8 +160,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Route53::RecordSet", "aws:cdk:cloudformation:props": { - "name": "integ.example.com.", - "type": "A", "aliasTarget": { "hostedZoneId": { "Fn::FindInMap": [ @@ -179,18 +177,20 @@ ] } }, - "hostedZoneId": "Z23ABC4XYZL05B" + "hostedZoneId": "Z23ABC4XYZL05B", + "name": "integ.example.com.", + "type": "A" } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_route53.CfnRecordSet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_route53.ARecord", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "RedirectAliasRecordSix700dc5": { @@ -203,8 +203,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::Route53::RecordSet", "aws:cdk:cloudformation:props": { - "name": "integ.example.com.", - "type": "AAAA", "aliasTarget": { "hostedZoneId": { "Fn::FindInMap": [ @@ -222,32 +220,34 @@ ] } }, - "hostedZoneId": "Z23ABC4XYZL05B" + "hostedZoneId": "Z23ABC4XYZL05B", + "name": "integ.example.com.", + "type": "AAAA" } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_route53.CfnRecordSet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_route53.AaaaRecord", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_route53_patterns.HttpsRedirect", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "AWSCloudFrontPartitionHostedZoneIdMap": { "id": "AWSCloudFrontPartitionHostedZoneIdMap", "path": "integ-https-redirect/AWSCloudFrontPartitionHostedZoneIdMap", "constructInfo": { - "fqn": "aws-cdk-lib.CfnMapping", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "ExportsReader": { @@ -262,14 +262,14 @@ "id": "Default", "path": "integ-https-redirect/ExportsReader/Resource/Default", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, @@ -286,52 +286,52 @@ "id": "Staging", "path": "integ-https-redirect/Custom::CrossRegionExportReaderCustomResourceProvider/Staging", "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "Role": { "id": "Role", "path": "integ-https-redirect/Custom::CrossRegionExportReaderCustomResourceProvider/Role", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "Handler": { "id": "Handler", "path": "integ-https-redirect/Custom::CrossRegionExportReaderCustomResourceProvider/Handler", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.CustomResourceProvider", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "integ-https-redirect/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "integ-https-redirect/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61": { @@ -372,14 +372,14 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_certificatemanager.CfnCertificate", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_certificatemanager.Certificate", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "ExportsWriteruseast2828FA26B": { @@ -394,14 +394,14 @@ "id": "Default", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/ExportsWriteruseast2828FA26B/Resource/Default", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, @@ -418,52 +418,52 @@ "id": "Staging", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/Custom::CrossRegionExportWriterCustomResourceProvider/Staging", "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "Role": { "id": "Role", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/Custom::CrossRegionExportWriterCustomResourceProvider/Role", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "Handler": { "id": "Handler", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/Custom::CrossRegionExportWriterCustomResourceProvider/Handler", "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.CustomResourceProvider", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "certificate-redirect-stack-c8dcaeced090b732e39f9a17bfcca0bf8d20ce4f61/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "integ-test": { @@ -490,22 +490,22 @@ "id": "BootstrapVersion", "path": "integ-test/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "integ-test/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } }, @@ -530,8 +530,8 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.App", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.2.55" } } } \ No newline at end of file diff --git a/packages/aws-cdk-lib/core/lib/custom-resource-provider/cross-region-export-providers/cross-region-ssm-reader-handler/index.ts b/packages/aws-cdk-lib/core/lib/custom-resource-provider/cross-region-export-providers/cross-region-ssm-reader-handler/index.ts index 9c92ed5824332..cfa9c2bf4c1f0 100644 --- a/packages/aws-cdk-lib/core/lib/custom-resource-provider/cross-region-export-providers/cross-region-ssm-reader-handler/index.ts +++ b/packages/aws-cdk-lib/core/lib/custom-resource-provider/cross-region-export-providers/cross-region-ssm-reader-handler/index.ts @@ -1,6 +1,6 @@ /*eslint-disable no-console*/ /* eslint-disable import/no-extraneous-dependencies */ -import { SSM } from '@aws-sdk/client-ssm'; +import { InvalidResourceId, SSM } from '@aws-sdk/client-ssm'; import { ExportReaderCRProps, CrossRegionExports } from '../types'; export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { @@ -74,12 +74,10 @@ async function removeTags(ssm: SSM, parameters: string[], keyName: string): Prom ResourceId: name, }); } catch (e: any) { - switch (e.code) { - // if the parameter doesn't exist then there is nothing to release - case 'InvalidResourceId': - return; - default: - throw new Error(`Error releasing import ${name}: ${e}`); + if (e instanceof InvalidResourceId) { + return; + } else { + throw new Error(`Error releasing import ${name}: ${e}`); } } })); diff --git a/packages/aws-cdk-lib/core/test/custom-resource-provider/cross-region-ssm-reader-handler.test.ts b/packages/aws-cdk-lib/core/test/custom-resource-provider/cross-region-ssm-reader-handler.test.ts index 8b58409ec0356..bda462d28b0f5 100644 --- a/packages/aws-cdk-lib/core/test/custom-resource-provider/cross-region-ssm-reader-handler.test.ts +++ b/packages/aws-cdk-lib/core/test/custom-resource-provider/cross-region-ssm-reader-handler.test.ts @@ -1,13 +1,16 @@ +import { InvalidResourceId } from '@aws-sdk/client-ssm'; import { handler } from '../../lib/custom-resource-provider/cross-region-export-providers/cross-region-ssm-reader-handler'; import { SSM_EXPORT_PATH_PREFIX } from '../../lib/custom-resource-provider/cross-region-export-providers/types'; let mockDeleteParameters: jest.Mock ; let mockAddTagsToResource: jest.Mock; -let mockGetParametersByPath: jest.Mock; +let mockGetParametersByPath: jest.Mock = jest.fn(); let mockRemoveTagsFromResource: jest.Mock; jest.mock('@aws-sdk/client-ssm', () => { + const actual = jest.requireActual('@aws-sdk/client-ssm'); return { + ...actual, SSM: jest.fn().mockImplementation(() => ({ addTagsToResource: mockAddTagsToResource, removeTagsFromResource: mockRemoveTagsFromResource, @@ -190,6 +193,35 @@ describe('cross-region-ssm-reader entrypoint', () => { TagKeys: ['aws-cdk:strong-ref:MyStack'], }); }); + + test('Does not throw when parameters do not exit', async () => { + // GIVEN + const event = makeEvent({ + RequestType: 'Delete', + ResourceProperties: { + ServiceToken: '', + ReaderProps: { + region: 'us-east-1', + prefix: 'MyStack', + imports: { + '/cdk/exports/MyStack/RemovedExport': 'abc', + }, + }, + }, + }); + + // WHEN + mockGetParametersByPath.mockRejectedValue(new InvalidResourceId({ message: 'Error Message', $metadata: {} })); + await handler(event); + + // THEN + expect(mockRemoveTagsFromResource).toHaveBeenCalledTimes(1); + expect(mockRemoveTagsFromResource).toHaveBeenCalledWith({ + ResourceType: 'Parameter', + ResourceId: '/cdk/exports/MyStack/RemovedExport', + TagKeys: ['aws-cdk:strong-ref:MyStack'], + }); + }); }); function makeEvent(req: Partial): AWSLambda.CloudFormationCustomResourceEvent {