aws-delivlib 13.7.10 → 14.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cdk.out/asset.1f7e277bd526ebce1983fa1e7a84a5281ec533d9187caaebb773681bbf7bf4c1/__entrypoint__.js +119 -0
- package/cdk.out/{asset.15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538 → asset.1f7e277bd526ebce1983fa1e7a84a5281ec533d9187caaebb773681bbf7bf4c1}/index.d.ts +0 -0
- package/cdk.out/{asset.15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538 → asset.1f7e277bd526ebce1983fa1e7a84a5281ec533d9187caaebb773681bbf7bf4c1}/index.js +0 -0
- package/cdk.out/{asset.ca50c9b7760151d8e8ce6e39851032d4eff4836ea1ee806eaa944aaef110a353 → asset.7ada94e893d605ebbcf2f5b3bedc83bad3c704ab7892c1f2af45bfd79fb751e7}/index.js +20 -4
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/create-release.js +0 -0
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/package-lock.json +0 -0
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/package.json +0 -0
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/publish.sh +0 -0
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/sign-files.sh +0 -0
- package/cdk.out/{asset.1c4d00e8f9125a52b4db3e74494c950959ffa433738adcf5c9f7251e4d255451 → asset.7bfdb1075bf8728fe236bcef49fbf08ac3ead6c9947f5d65f25b5a7c09758bb1}/with-signing-key.sh +1 -7
- package/cdk.out/cdk.out +1 -1
- package/cdk.out/delivlib-test.assets.json +12 -12
- package/cdk.out/delivlib-test.template.json +7135 -7704
- package/cdk.out/manifest.json +152 -2498
- package/cdk.out/tree.json +1059 -1427
- package/lib/auto-build.d.ts +2 -1
- package/lib/auto-build.js +8 -7
- package/lib/auto-build.ts +3 -2
- package/lib/build-env.d.ts +1 -1
- package/lib/build-env.js +4 -4
- package/lib/build-env.ts +1 -1
- package/lib/canary.d.ts +2 -1
- package/lib/canary.js +7 -6
- package/lib/canary.ts +2 -2
- package/lib/change-controller.d.ts +2 -1
- package/lib/change-controller.js +20 -18
- package/lib/change-controller.ts +6 -5
- package/lib/chime-notifier/chime-notifier.d.ts +2 -1
- package/lib/chime-notifier/chime-notifier.js +12 -11
- package/lib/chime-notifier/chime-notifier.ts +3 -2
- package/lib/code-signing/certificate-signing-request.d.ts +1 -1
- package/lib/code-signing/certificate-signing-request.js +16 -14
- package/lib/code-signing/certificate-signing-request.ts +7 -5
- package/lib/code-signing/code-signing-certificate.d.ts +2 -1
- package/lib/code-signing/code-signing-certificate.js +12 -11
- package/lib/code-signing/code-signing-certificate.ts +5 -4
- package/lib/code-signing/private-key.d.ts +2 -1
- package/lib/code-signing/private-key.js +28 -26
- package/lib/code-signing/private-key.ts +10 -8
- package/lib/credential-pair.d.ts +1 -1
- package/lib/credential-pair.js +1 -1
- package/lib/credential-pair.ts +1 -1
- package/lib/custom-resource-handlers/src/certificate-signing-request.tsbuildinfo +1 -1
- package/lib/custom-resource-handlers/src/pgp-secret.tsbuildinfo +1 -1
- package/lib/custom-resource-handlers/src/private-key.tsbuildinfo +1 -1
- package/lib/open-pgp-key-pair.d.ts +2 -1
- package/lib/open-pgp-key-pair.js +28 -27
- package/lib/open-pgp-key-pair.ts +12 -10
- package/lib/package-integrity/handler/validate.bundle.js +814 -457
- package/lib/package-integrity/integrity.d.ts +2 -1
- package/lib/package-integrity/integrity.js +7 -6
- package/lib/package-integrity/integrity.ts +2 -2
- package/lib/permissions.d.ts +1 -1
- package/lib/permissions.js +5 -5
- package/lib/permissions.ts +4 -4
- package/lib/pipeline-notifications/slack.d.ts +1 -1
- package/lib/pipeline-notifications/slack.js +4 -4
- package/lib/pipeline-notifications/slack.ts +1 -1
- package/lib/pipeline-watcher/watcher.d.ts +2 -1
- package/lib/pipeline-watcher/watcher.js +16 -15
- package/lib/pipeline-watcher/watcher.ts +3 -3
- package/lib/pipeline.d.ts +2 -1
- package/lib/pipeline.js +19 -18
- package/lib/pipeline.ts +5 -4
- package/lib/publishing/github/with-signing-key.sh +1 -7
- package/lib/publishing.d.ts +2 -1
- package/lib/publishing.js +36 -35
- package/lib/publishing.ts +9 -8
- package/lib/pull-request/bump.d.ts +3 -3
- package/lib/pull-request/bump.js +3 -26
- package/lib/pull-request/bump.ts +3 -3
- package/lib/pull-request/merge-back.d.ts +3 -3
- package/lib/pull-request/merge-back.js +3 -3
- package/lib/pull-request/merge-back.ts +3 -3
- package/lib/pull-request/pr.d.ts +2 -1
- package/lib/pull-request/pr.js +11 -10
- package/lib/pull-request/pr.ts +3 -2
- package/lib/registry-sync/ecr-mirror.d.ts +2 -1
- package/lib/registry-sync/ecr-mirror.js +22 -21
- package/lib/registry-sync/ecr-mirror.ts +4 -3
- package/lib/registry-sync/mirror-source.d.ts +2 -1
- package/lib/registry-sync/mirror-source.js +3 -3
- package/lib/registry-sync/mirror-source.ts +2 -2
- package/lib/repo.d.ts +2 -1
- package/lib/repo.js +12 -12
- package/lib/repo.ts +3 -2
- package/lib/shellable.d.ts +2 -1
- package/lib/shellable.js +23 -22
- package/lib/shellable.ts +5 -4
- package/lib/signing-key.d.ts +2 -1
- package/lib/signing-key.js +6 -5
- package/lib/signing-key.ts +3 -2
- package/lib/util.d.ts +1 -1
- package/lib/util.js +1 -1
- package/lib/util.ts +1 -1
- package/package.json +12 -10
- package/cdk.out/asset.15684a15d07860e99d2a8079150ad33dd2cb743677fcd7016dd07345e1b69538/__entrypoint__.js +0 -119
package/lib/signing-key.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OpenPgpKey = void 0;
|
|
4
|
-
const
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
const constructs_1 = require("constructs");
|
|
5
6
|
const open_pgp_key_pair_1 = require("./open-pgp-key-pair");
|
|
6
7
|
/**
|
|
7
8
|
* A combination of a Secrets Manager secret and a unique KMS key per secret
|
|
@@ -11,12 +12,12 @@ const open_pgp_key_pair_1 = require("./open-pgp-key-pair");
|
|
|
11
12
|
*
|
|
12
13
|
* @deprecated Use the OpenPGPKeyPair class instead.
|
|
13
14
|
*/
|
|
14
|
-
class OpenPgpKey extends
|
|
15
|
+
class OpenPgpKey extends constructs_1.Construct {
|
|
15
16
|
constructor(parent, name, props) {
|
|
16
17
|
super(parent, name);
|
|
17
|
-
this.scope = props.secretName || this.node.
|
|
18
|
+
this.scope = props.secretName || this.node.addr;
|
|
18
19
|
const secretName = `${this.scope}/SigningKey`;
|
|
19
|
-
this.key = new
|
|
20
|
+
this.key = new aws_cdk_lib_1.aws_kms.Key(this, 'Key', {
|
|
20
21
|
description: `Encryption key for PGP secret ${secretName}`,
|
|
21
22
|
});
|
|
22
23
|
// The key has an alias for descriptive purposes, but the alias is not used
|
|
@@ -37,4 +38,4 @@ class OpenPgpKey extends monocdk_1.Construct {
|
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
40
|
exports.OpenPgpKey = OpenPgpKey;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmluZy1rZXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzaWduaW5nLWtleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBNkQ7QUFDN0QsMkNBQXVDO0FBQ3ZDLDJEQUFxRDtBQTJCckQ7Ozs7Ozs7R0FPRztBQUNILE1BQWEsVUFBVyxTQUFRLHNCQUFTO0lBTXZDLFlBQVksTUFBaUIsRUFBRSxJQUFZLEVBQUUsS0FBc0I7UUFDakUsS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVwQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDaEQsTUFBTSxVQUFVLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxhQUFhLENBQUM7UUFFOUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLHFCQUFHLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUU7WUFDbEMsV0FBVyxFQUFFLGlDQUFpQyxVQUFVLEVBQUU7U0FDM0QsQ0FBQyxDQUFDO1FBRUgsMkVBQTJFO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLFNBQVMsVUFBVSxLQUFLLENBQUMsQ0FBQztRQUU1QyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksa0NBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQy9DLFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUTtZQUN4QixLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUs7WUFDbEIsV0FBVyxFQUFFLElBQUk7WUFDakIsTUFBTSxFQUFFLElBQUk7WUFDWixVQUFVO1lBQ1YsbUJBQW1CLEVBQUUsSUFBSSxVQUFVLE1BQU07WUFDekMsYUFBYSxFQUFFLElBQUksQ0FBQyxHQUFHO1lBQ3ZCLE9BQU8sRUFBRSxDQUFDO1NBQ1gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLFNBQVMsQ0FBQyxRQUF3QjtRQUN2QyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7Q0FDRjtBQWxDRCxnQ0FrQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBhd3NfaWFtIGFzIGlhbSwgYXdzX2ttcyBhcyBrbXMgfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcbmltcG9ydCB7IE9wZW5QR1BLZXlQYWlyIH0gZnJvbSAnLi9vcGVuLXBncC1rZXktcGFpcic7XG5cblxuLyoqXG4gKiBDb25zdHJ1Y3Rpb24gcHJvcGVydGllcyBmb3IgYSBTaWduaW5nS2V5XG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgU2lnbmluZ0tleVByb3BzIHtcbiAgLyoqXG4gICAqIFRoZSBBV1MgU2VjcmV0cyBNYW5hZ2VyIHNlY3JldCBuYW1lIHRvIHVzZSBmb3IgdGhpcyBrZXkuXG4gICAqXG4gICAqIFRoZSBzZWNyZXQgd2lsbCBiZSBuYW1lZCBcIjxzY29wZT4vU2lnbmluZ0tleVwiLlxuICAgKlxuICAgKiBAZGVmYXVsdCBBIHVuaXF1ZSBzZWNyZXQgbmFtZSB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkXG4gICAqL1xuICBzZWNyZXROYW1lPzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBOYW1lIHRvIHB1dCBvbiBrZXlcbiAgICovXG4gIGlkZW50aXR5OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIEVtYWlsIGFkZHJlc3MgdG8gcHV0IG9uIGtleVxuICAgKi9cbiAgZW1haWw6IHN0cmluZztcbn1cblxuLyoqXG4gKiBBIGNvbWJpbmF0aW9uIG9mIGEgU2VjcmV0cyBNYW5hZ2VyIHNlY3JldCBhbmQgYSB1bmlxdWUgS01TIGtleSBwZXIgc2VjcmV0XG4gKlxuICogVGhlIEtNUyBrZXkgaXMgdGhlcmUgdG8gY29udHJvbCBhY2Nlc3MgdG8gdGhlIHNlY3JldCwgYXMgdGhlIHNlY3JldFxuICogaXRzZWxmIGRvZXNuJ3Qgc3VwcG9ydCByZXNvdXJjZSBwb2xpY2llcyB5ZXQuXG4gKlxuICogQGRlcHJlY2F0ZWQgVXNlIHRoZSBPcGVuUEdQS2V5UGFpciBjbGFzcyBpbnN0ZWFkLlxuICovXG5leHBvcnQgY2xhc3MgT3BlblBncEtleSBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSBzY29wZTogc3RyaW5nO1xuXG4gIHByaXZhdGUgcmVhZG9ubHkga2V5OiBrbXMuSUtleTtcbiAgcHJpdmF0ZSByZWFkb25seSBzZWNyZXQ6IE9wZW5QR1BLZXlQYWlyO1xuXG4gIGNvbnN0cnVjdG9yKHBhcmVudDogQ29uc3RydWN0LCBuYW1lOiBzdHJpbmcsIHByb3BzOiBTaWduaW5nS2V5UHJvcHMpIHtcbiAgICBzdXBlcihwYXJlbnQsIG5hbWUpO1xuXG4gICAgdGhpcy5zY29wZSA9IHByb3BzLnNlY3JldE5hbWUgfHwgdGhpcy5ub2RlLmFkZHI7XG4gICAgY29uc3Qgc2VjcmV0TmFtZSA9IGAke3RoaXMuc2NvcGV9L1NpZ25pbmdLZXlgO1xuXG4gICAgdGhpcy5rZXkgPSBuZXcga21zLktleSh0aGlzLCAnS2V5Jywge1xuICAgICAgZGVzY3JpcHRpb246IGBFbmNyeXB0aW9uIGtleSBmb3IgUEdQIHNlY3JldCAke3NlY3JldE5hbWV9YCxcbiAgICB9KTtcblxuICAgIC8vIFRoZSBrZXkgaGFzIGFuIGFsaWFzIGZvciBkZXNjcmlwdGl2ZSBwdXJwb3NlcywgYnV0IHRoZSBhbGlhcyBpcyBub3QgdXNlZFxuICAgIHRoaXMua2V5LmFkZEFsaWFzKGBhbGlhcy8ke3NlY3JldE5hbWV9S2V5YCk7XG5cbiAgICB0aGlzLnNlY3JldCA9IG5ldyBPcGVuUEdQS2V5UGFpcih0aGlzLCAnU2VjcmV0Jywge1xuICAgICAgaWRlbnRpdHk6IHByb3BzLmlkZW50aXR5LFxuICAgICAgZW1haWw6IHByb3BzLmVtYWlsLFxuICAgICAga2V5U2l6ZUJpdHM6IDQwOTYsXG4gICAgICBleHBpcnk6ICc0eScsXG4gICAgICBzZWNyZXROYW1lLFxuICAgICAgcHViS2V5UGFyYW1ldGVyTmFtZTogYC8ke3NlY3JldE5hbWV9LnB1YmAsXG4gICAgICBlbmNyeXB0aW9uS2V5OiB0aGlzLmtleSxcbiAgICAgIHZlcnNpb246IDEsXG4gICAgfSk7XG4gIH1cblxuICBwdWJsaWMgZ3JhbnRSZWFkKGlkZW50aXR5OiBpYW0uSVByaW5jaXBhbCkge1xuICAgIHJldHVybiB0aGlzLnNlY3JldC5ncmFudFJlYWQoaWRlbnRpdHkpO1xuICB9XG59XG4iXX0=
|
package/lib/signing-key.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { aws_iam as iam, aws_kms as kms } from 'aws-cdk-lib';
|
|
2
|
+
import { Construct } from 'constructs';
|
|
2
3
|
import { OpenPGPKeyPair } from './open-pgp-key-pair';
|
|
3
4
|
|
|
4
5
|
|
|
@@ -43,7 +44,7 @@ export class OpenPgpKey extends Construct {
|
|
|
43
44
|
constructor(parent: Construct, name: string, props: SigningKeyProps) {
|
|
44
45
|
super(parent, name);
|
|
45
46
|
|
|
46
|
-
this.scope = props.secretName || this.node.
|
|
47
|
+
this.scope = props.secretName || this.node.addr;
|
|
47
48
|
const secretName = `${this.scope}/SigningKey`;
|
|
48
49
|
|
|
49
50
|
this.key = new kms.Key(this, 'Key', {
|
package/lib/util.d.ts
CHANGED
package/lib/util.js
CHANGED
|
@@ -102,4 +102,4 @@ function flatMap(xs, fn) {
|
|
|
102
102
|
return ret;
|
|
103
103
|
}
|
|
104
104
|
exports.flatMap = flatMap;
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrQ0FBaUM7QUFDakMsdUNBQXlCO0FBQ3pCLDJDQUE2QjtBQUk3Qjs7OztHQUlHO0FBQ0gsU0FBZ0IsaUJBQWlCLENBQUMsS0FBYSxFQUFFLFdBQW9CO0lBQ25FLGlEQUFpRDtJQUNqRCxJQUFJLFdBQVcsS0FBSyxTQUFTLEVBQUU7UUFDN0IsT0FBTyxTQUFTLENBQUM7S0FDbEI7SUFFRCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUM3QyxDQUFDO0FBUEQsOENBT0M7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsU0FBZ0IsbUJBQW1CLENBQUMsU0FBaUI7SUFDbkQsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN6QyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkQsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwQyxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRTtRQUN0QixLQUFLLE1BQU0sSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDbkQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDOUQ7S0FDRjtTQUFNO1FBQ0wsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7S0FDekM7SUFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDL0IsQ0FBQztBQVpELGtEQVlDO0FBRUQsU0FBZ0IsMEJBQTBCLENBQUMsR0FBMkMsRUFBRSxJQUEwQztJQUNoSSxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ1IsT0FBTyxTQUFTLENBQUM7S0FDbEI7SUFFRCxNQUFNLEdBQUcsR0FBdUQsRUFBRyxDQUFDO0lBQ3BFLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQzlDLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRTtZQUN2QixHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDNUI7S0FDRjtJQUNELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQVpELGdFQVlDO0FBRUQsU0FBZ0IsV0FBVyxDQUFJLEVBQWM7SUFDM0MsTUFBTSxHQUFHLEdBQVEsRUFBRSxDQUFDO0lBQ3BCLEtBQUssTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFFO1FBQ3ZDLElBQUksQ0FBQyxLQUFLLFNBQVMsRUFBRTtZQUNuQixHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ1o7S0FDRjtJQUNELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQVJELGtDQVFDO0FBRUQsU0FBZ0IsU0FBUyxDQUFPLEVBQXNCLEVBQUUsRUFBZTtJQUNyRSxNQUFNLEdBQUcsR0FBdUIsRUFBRSxDQUFDO0lBQ25DLEtBQUssTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFFO1FBQ3ZDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDaEI7SUFDRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUM7QUFORCw4QkFNQztBQUVELFNBQWdCLE9BQU8sQ0FBTyxFQUFPLEVBQUUsRUFBaUI7SUFDdEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxLQUFLLEVBQUssQ0FBQztJQUMzQixLQUFLLE1BQU0sQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNsQixHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDcEI7SUFDRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUM7QUFORCwwQkFNQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGNyeXB0byBmcm9tICdjcnlwdG8nO1xuaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB7IGF3c19jb2RlYnVpbGQgYXMgY2J1aWxkIH0gZnJvbSAnYXdzLWNkay1saWInO1xuXG5cbi8qKlxuICogRGV0ZXJtaW5lcyB0aGUgXCJSdW5PcmRlclwiIHByb3BlcnR5IGZvciB0aGUgbmV4dCBhY3Rpb24gdG8gYmUgYWRkZWQgdG8gYSBzdGFnZS5cbiAqIEBwYXJhbSBpbmRleCBJbmRleCBvZiBuZXcgYWN0aW9uXG4gKiBAcGFyYW0gY29uY3VycmVuY3kgVGhlIGNvbmN1cnJlbmN5IGxpbWl0XG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBkZXRlcm1pbmVSdW5PcmRlcihpbmRleDogbnVtYmVyLCBjb25jdXJyZW5jeT86IG51bWJlcik6IG51bWJlciB8IHVuZGVmaW5lZCB7XG4gIC8vIG5vIHJ1bk9yZGVyIGlmIHdlIGFyZSBhdCB1bmxpbWl0ZWQgY29uY3VycmVuY3lcbiAgaWYgKGNvbmN1cnJlbmN5ID09PSB1bmRlZmluZWQpIHtcbiAgICByZXR1cm4gdW5kZWZpbmVkO1xuICB9XG5cbiAgcmV0dXJuIE1hdGguZmxvb3IoaW5kZXggLyBjb25jdXJyZW5jeSkgKyAxO1xufVxuXG4vKipcbiAqIEhhc2hlcyB0aGUgY29udGVudHMgb2YgYSBmaWxlIG9yIGRpcmVjdG9yeS4gSWYgdGhlIGFyZ3VtZW50IGlzIGEgZGlyZWN0b3J5LFxuICogaXQgaXMgYXNzdW1lZCBub3QgdG8gY29udGFpbiBzeW1saW5rcyB0aGF0IHdvdWxkIHJlc3VsdCBpbiBhIGN5Y2xpYyB0cmVlLlxuICpcbiAqIEBwYXJhbSBmaWxlT3JEaXIgdGhlIHBhdGggdG8gdGhlIGZpbGUgb3IgZGlyZWN0b3J5IHRoYXQgc2hvdWxkIGJlIGhhc2hlZC5cbiAqXG4gKiBAcmV0dXJucyBhIFNIQTI1NiBoYXNoLCBiYXNlLTY0IGVuY29kZWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBoYXNoRmlsZU9yRGlyZWN0b3J5KGZpbGVPckRpcjogc3RyaW5nKTogc3RyaW5nIHtcbiAgY29uc3QgaGFzaCA9IGNyeXB0by5jcmVhdGVIYXNoKCdTSEEyNTYnKTtcbiAgaGFzaC51cGRhdGUocGF0aC5iYXNlbmFtZShmaWxlT3JEaXIpKS51cGRhdGUoJ1xcMCcpO1xuICBjb25zdCBzdGF0ID0gZnMuc3RhdFN5bmMoZmlsZU9yRGlyKTtcbiAgaWYgKHN0YXQuaXNEaXJlY3RvcnkoKSkge1xuICAgIGZvciAoY29uc3QgaXRlbSBvZiBmcy5yZWFkZGlyU3luYyhmaWxlT3JEaXIpLnNvcnQoKSkge1xuICAgICAgaGFzaC51cGRhdGUoaGFzaEZpbGVPckRpcmVjdG9yeShwYXRoLmpvaW4oZmlsZU9yRGlyLCBpdGVtKSkpO1xuICAgIH1cbiAgfSBlbHNlIHtcbiAgICBoYXNoLnVwZGF0ZShmcy5yZWFkRmlsZVN5bmMoZmlsZU9yRGlyKSk7XG4gIH1cbiAgcmV0dXJuIGhhc2guZGlnZXN0KCdiYXNlNjQnKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbmRlckVudmlyb25tZW50VmFyaWFibGVzKGVudj86IHsgW2tleTogc3RyaW5nXTogc3RyaW5nIHwgdW5kZWZpbmVkIH0sIHR5cGU/OiBjYnVpbGQuQnVpbGRFbnZpcm9ubWVudFZhcmlhYmxlVHlwZSkge1xuICBpZiAoIWVudikge1xuICAgIHJldHVybiB1bmRlZmluZWQ7XG4gIH1cblxuICBjb25zdCBvdXQ6IHsgW2tleTogc3RyaW5nXTogY2J1aWxkLkJ1aWxkRW52aXJvbm1lbnRWYXJpYWJsZSB9ID0geyB9O1xuICBmb3IgKGNvbnN0IFtrZXksIHZhbHVlXSBvZiBPYmplY3QuZW50cmllcyhlbnYpKSB7XG4gICAgaWYgKHZhbHVlICE9PSB1bmRlZmluZWQpIHtcbiAgICAgIG91dFtrZXldID0geyB2YWx1ZSwgdHlwZSB9O1xuICAgIH1cbiAgfVxuICByZXR1cm4gb3V0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbm9VbmRlZmluZWQ8VD4oeHM6IFBhcnRpYWw8VD4pOiB7W2sgaW4ga2V5b2YgVF06IFRba119IHtcbiAgY29uc3QgcmV0OiBhbnkgPSB7fTtcbiAgZm9yIChjb25zdCBbaywgdl0gb2YgT2JqZWN0LmVudHJpZXMoeHMpKSB7XG4gICAgaWYgKHYgIT09IHVuZGVmaW5lZCkge1xuICAgICAgcmV0W2tdID0gdjtcbiAgICB9XG4gIH1cbiAgcmV0dXJuIHJldDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1hcFZhbHVlczxULCBVPih4czoge1trZXk6IHN0cmluZ106IFR9LCBmbjogKHg6IFQpID0+IFUpOiB7W2tleTogc3RyaW5nXTogVX0ge1xuICBjb25zdCByZXQ6IHtba2V5OiBzdHJpbmddOiBVfSA9IHt9O1xuICBmb3IgKGNvbnN0IFtrLCB2XSBvZiBPYmplY3QuZW50cmllcyh4cykpIHtcbiAgICByZXRba10gPSBmbih2KTtcbiAgfVxuICByZXR1cm4gcmV0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZmxhdE1hcDxULCBVPih4czogVFtdLCBmbjogKHg6IFQpID0+IFVbXSk6IFVbXSB7XG4gIGNvbnN0IHJldCA9IG5ldyBBcnJheTxVPigpO1xuICBmb3IgKGNvbnN0IHggb2YgeHMpIHtcbiAgICByZXQucHVzaCguLi5mbih4KSk7XG4gIH1cbiAgcmV0dXJuIHJldDtcbn1cbiJdfQ==
|
package/lib/util.ts
CHANGED
package/package.json
CHANGED
|
@@ -37,9 +37,8 @@
|
|
|
37
37
|
"organization": false
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@monocdk-experiment/assert": "^1.154.0",
|
|
41
40
|
"@types/adm-zip": "^0.5.0",
|
|
42
|
-
"@types/aws-lambda": "^8.10.
|
|
41
|
+
"@types/aws-lambda": "^8.10.97",
|
|
43
42
|
"@types/fs-extra": "^9.0.13",
|
|
44
43
|
"@types/jest": "^27.5.0",
|
|
45
44
|
"@types/node": "^14",
|
|
@@ -47,10 +46,11 @@
|
|
|
47
46
|
"@typescript-eslint/eslint-plugin": "^5",
|
|
48
47
|
"@typescript-eslint/parser": "^5",
|
|
49
48
|
"adm-zip": "^0.5.9",
|
|
50
|
-
"aws-cdk": "^
|
|
51
|
-
"aws-
|
|
49
|
+
"aws-cdk": "^2.23.0",
|
|
50
|
+
"aws-cdk-lib": "^2.3.0",
|
|
51
|
+
"aws-sdk": "^2.1131.0",
|
|
52
52
|
"aws-sdk-mock": "^5.7.0",
|
|
53
|
-
"constructs": "^
|
|
53
|
+
"constructs": "^10.1.4",
|
|
54
54
|
"esbuild": "^0.14.38",
|
|
55
55
|
"eslint": "^8",
|
|
56
56
|
"eslint-import-resolver-node": "^0.3.6",
|
|
@@ -62,10 +62,9 @@
|
|
|
62
62
|
"jest-junit": "^13",
|
|
63
63
|
"json-schema": "^0.4.0",
|
|
64
64
|
"JSONStream": "^1.3.5",
|
|
65
|
-
"monocdk": "^1.154.0",
|
|
66
65
|
"node-ical": "^0.15.1",
|
|
67
66
|
"npm-check-updates": "^12",
|
|
68
|
-
"projen": "^0.
|
|
67
|
+
"projen": "^0.56.2",
|
|
69
68
|
"rrule": "^2.6.9",
|
|
70
69
|
"standard-version": "^9",
|
|
71
70
|
"tar": "^6.1.11",
|
|
@@ -73,8 +72,8 @@
|
|
|
73
72
|
"typescript": "~4.6.4"
|
|
74
73
|
},
|
|
75
74
|
"peerDependencies": {
|
|
76
|
-
"
|
|
77
|
-
"
|
|
75
|
+
"aws-cdk-lib": "^2.3.0",
|
|
76
|
+
"constructs": "^10.1.4"
|
|
78
77
|
},
|
|
79
78
|
"dependencies": {
|
|
80
79
|
"changelog-parser": "^2.8.1"
|
|
@@ -85,9 +84,12 @@
|
|
|
85
84
|
"continuous-delivery",
|
|
86
85
|
"continuous-integration"
|
|
87
86
|
],
|
|
87
|
+
"engines": {
|
|
88
|
+
"node": ">= 14.17.0"
|
|
89
|
+
},
|
|
88
90
|
"main": "lib/index.js",
|
|
89
91
|
"license": "Apache-2.0",
|
|
90
|
-
"version": "
|
|
92
|
+
"version": "14.0.2",
|
|
91
93
|
"jest": {
|
|
92
94
|
"testMatch": [
|
|
93
95
|
"**/lib/__tests__/**/?(*.)+(spec|test).js?(x)"
|
|
@@ -1,119 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.handler = exports.external = void 0;
|
|
4
|
-
const https = require("https");
|
|
5
|
-
const url = require("url");
|
|
6
|
-
// for unit tests
|
|
7
|
-
exports.external = {
|
|
8
|
-
sendHttpRequest: defaultSendHttpRequest,
|
|
9
|
-
log: defaultLog,
|
|
10
|
-
includeStackTraces: true,
|
|
11
|
-
userHandlerIndex: './index',
|
|
12
|
-
};
|
|
13
|
-
const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';
|
|
14
|
-
const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';
|
|
15
|
-
async function handler(event, context) {
|
|
16
|
-
exports.external.log(JSON.stringify(event, undefined, 2));
|
|
17
|
-
// ignore DELETE event when the physical resource ID is the marker that
|
|
18
|
-
// indicates that this DELETE is a subsequent DELETE to a failed CREATE
|
|
19
|
-
// operation.
|
|
20
|
-
if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {
|
|
21
|
-
exports.external.log('ignoring DELETE event caused by a failed CREATE event');
|
|
22
|
-
await submitResponse('SUCCESS', event);
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
try {
|
|
26
|
-
// invoke the user handler. this is intentionally inside the try-catch to
|
|
27
|
-
// ensure that if there is an error it's reported as a failure to
|
|
28
|
-
// cloudformation (otherwise cfn waits).
|
|
29
|
-
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
30
|
-
const userHandler = require(exports.external.userHandlerIndex).handler;
|
|
31
|
-
const result = await userHandler(event, context);
|
|
32
|
-
// validate user response and create the combined event
|
|
33
|
-
const responseEvent = renderResponse(event, result);
|
|
34
|
-
// submit to cfn as success
|
|
35
|
-
await submitResponse('SUCCESS', responseEvent);
|
|
36
|
-
}
|
|
37
|
-
catch (e) {
|
|
38
|
-
const resp = {
|
|
39
|
-
...event,
|
|
40
|
-
Reason: exports.external.includeStackTraces ? e.stack : e.message,
|
|
41
|
-
};
|
|
42
|
-
if (!resp.PhysicalResourceId) {
|
|
43
|
-
// special case: if CREATE fails, which usually implies, we usually don't
|
|
44
|
-
// have a physical resource id. in this case, the subsequent DELETE
|
|
45
|
-
// operation does not have any meaning, and will likely fail as well. to
|
|
46
|
-
// address this, we use a marker so the provider framework can simply
|
|
47
|
-
// ignore the subsequent DELETE.
|
|
48
|
-
if (event.RequestType === 'Create') {
|
|
49
|
-
exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');
|
|
50
|
-
resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
// otherwise, if PhysicalResourceId is not specified, something is
|
|
54
|
-
// terribly wrong because all other events should have an ID.
|
|
55
|
-
exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
// this is an actual error, fail the activity altogether and exist.
|
|
59
|
-
await submitResponse('FAILED', resp);
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
exports.handler = handler;
|
|
63
|
-
function renderResponse(cfnRequest, handlerResponse = {}) {
|
|
64
|
-
var _a, _b;
|
|
65
|
-
// if physical ID is not returned, we have some defaults for you based
|
|
66
|
-
// on the request type.
|
|
67
|
-
const physicalResourceId = (_b = (_a = handlerResponse.PhysicalResourceId) !== null && _a !== void 0 ? _a : cfnRequest.PhysicalResourceId) !== null && _b !== void 0 ? _b : cfnRequest.RequestId;
|
|
68
|
-
// if we are in DELETE and physical ID was changed, it's an error.
|
|
69
|
-
if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {
|
|
70
|
-
throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`);
|
|
71
|
-
}
|
|
72
|
-
// merge request event and result event (result prevails).
|
|
73
|
-
return {
|
|
74
|
-
...cfnRequest,
|
|
75
|
-
...handlerResponse,
|
|
76
|
-
PhysicalResourceId: physicalResourceId,
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
|
-
async function submitResponse(status, event) {
|
|
80
|
-
var _a;
|
|
81
|
-
const json = {
|
|
82
|
-
Status: status,
|
|
83
|
-
Reason: (_a = event.Reason) !== null && _a !== void 0 ? _a : status,
|
|
84
|
-
StackId: event.StackId,
|
|
85
|
-
RequestId: event.RequestId,
|
|
86
|
-
PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,
|
|
87
|
-
LogicalResourceId: event.LogicalResourceId,
|
|
88
|
-
NoEcho: event.NoEcho,
|
|
89
|
-
Data: event.Data,
|
|
90
|
-
};
|
|
91
|
-
exports.external.log('submit response to cloudformation', json);
|
|
92
|
-
const responseBody = JSON.stringify(json);
|
|
93
|
-
const parsedUrl = url.parse(event.ResponseURL);
|
|
94
|
-
const req = {
|
|
95
|
-
hostname: parsedUrl.hostname,
|
|
96
|
-
path: parsedUrl.path,
|
|
97
|
-
method: 'PUT',
|
|
98
|
-
headers: { 'content-type': '', 'content-length': responseBody.length },
|
|
99
|
-
};
|
|
100
|
-
await exports.external.sendHttpRequest(req, responseBody);
|
|
101
|
-
}
|
|
102
|
-
async function defaultSendHttpRequest(options, responseBody) {
|
|
103
|
-
return new Promise((resolve, reject) => {
|
|
104
|
-
try {
|
|
105
|
-
const request = https.request(options, _ => resolve());
|
|
106
|
-
request.on('error', reject);
|
|
107
|
-
request.write(responseBody);
|
|
108
|
-
request.end();
|
|
109
|
-
}
|
|
110
|
-
catch (e) {
|
|
111
|
-
reject(e);
|
|
112
|
-
}
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
function defaultLog(fmt, ...params) {
|
|
116
|
-
// eslint-disable-next-line no-console
|
|
117
|
-
console.log(fmt, ...params);
|
|
118
|
-
}
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodejs-entrypoint.js","sourceRoot":"","sources":["nodejs-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  external.log(JSON.stringify(event, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(event, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: { 'content-type': '', 'content-length': responseBody.length },\n  };\n\n  await external.sendHttpRequest(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n"]}
|