aws-cdk 2.1005.0 → 2.1007.0
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/README.md +1 -1
- package/THIRD_PARTY_LICENSES +86 -86
- package/build-info.json +2 -2
- package/db.json.gz +0 -0
- package/lib/api/aws-auth/awscli-compatible.js +9 -10
- package/lib/api/aws-auth/credential-plugins.js +6 -7
- package/lib/api/aws-auth/sdk-logger.js +3 -4
- package/lib/api/aws-auth/sdk-provider.js +11 -13
- package/lib/api/aws-auth/sdk.js +8 -9
- package/lib/api/aws-auth/tracing.js +3 -4
- package/lib/api/aws-auth/user-agent.js +4 -5
- package/lib/api/bootstrap/bootstrap-environment.d.ts +1 -1
- package/lib/api/bootstrap/bootstrap-environment.js +42 -46
- package/lib/api/bootstrap/bootstrap-props.d.ts +1 -1
- package/lib/api/bootstrap/bootstrap-props.js +1 -1
- package/lib/api/bootstrap/deploy-bootstrap.d.ts +1 -1
- package/lib/api/bootstrap/deploy-bootstrap.js +11 -14
- package/lib/api/{evaluate-cloudformation-template.d.ts → cloudformation/evaluate-cloudformation-template.d.ts} +4 -8
- package/lib/api/{evaluate-cloudformation-template.js → cloudformation/evaluate-cloudformation-template.js} +16 -25
- package/lib/api/cloudformation/index.d.ts +4 -0
- package/lib/api/cloudformation/index.js +21 -0
- package/lib/api/{deployments → cloudformation}/nested-stack-helpers.d.ts +3 -9
- package/lib/api/cloudformation/nested-stack-helpers.js +86 -0
- package/lib/api/cloudformation/stack-helpers.d.ts +88 -0
- package/lib/api/cloudformation/stack-helpers.js +158 -0
- package/lib/api/{util → cloudformation}/template-body-parameter.d.ts +3 -2
- package/lib/api/cloudformation/template-body-parameter.js +104 -0
- package/lib/api/context.js +3 -3
- package/lib/api/cxapp/cloud-assembly.d.ts +6 -4
- package/lib/api/cxapp/cloud-assembly.js +25 -26
- package/lib/api/cxapp/cloud-executable.d.ts +5 -0
- package/lib/api/cxapp/cloud-executable.js +9 -10
- package/lib/api/cxapp/environments.js +4 -4
- package/lib/api/cxapp/exec.d.ts +5 -4
- package/lib/api/cxapp/exec.js +76 -72
- package/lib/api/deployments/asset-publishing.d.ts +0 -2
- package/lib/api/deployments/asset-publishing.js +24 -31
- package/lib/api/deployments/assets.d.ts +1 -1
- package/lib/api/deployments/assets.js +12 -13
- package/lib/api/deployments/{cloudformation.d.ts → cfn-api.d.ts} +5 -102
- package/lib/api/deployments/cfn-api.js +438 -0
- package/lib/api/deployments/checks.d.ts +1 -1
- package/lib/api/deployments/checks.js +12 -13
- package/lib/api/deployments/deploy-stack.d.ts +2 -3
- package/lib/api/deployments/deploy-stack.js +34 -45
- package/lib/api/deployments/deployment-result.js +3 -3
- package/lib/api/deployments/deployments.d.ts +3 -3
- package/lib/api/deployments/deployments.js +35 -42
- package/lib/api/deployments/hotswap-deployments.d.ts +2 -2
- package/lib/api/deployments/hotswap-deployments.js +122 -69
- package/lib/api/deployments/index.d.ts +1 -2
- package/lib/api/deployments/index.js +2 -3
- package/lib/api/environment/environment-access.d.ts +2 -2
- package/lib/api/environment/environment-access.js +18 -20
- package/lib/api/environment/environment-resources.d.ts +1 -1
- package/lib/api/environment/environment-resources.js +17 -19
- package/lib/api/environment/index.d.ts +1 -0
- package/lib/api/environment/index.js +2 -1
- package/lib/api/environment/placeholders.js +23 -0
- package/lib/api/garbage-collection/garbage-collector.d.ts +1 -1
- package/lib/api/garbage-collection/garbage-collector.js +56 -66
- package/lib/api/garbage-collection/progress-printer.d.ts +1 -1
- package/lib/api/garbage-collection/progress-printer.js +7 -7
- package/lib/api/garbage-collection/stack-refresh.d.ts +1 -1
- package/lib/api/garbage-collection/stack-refresh.js +12 -15
- package/lib/api/hotswap/appsync-mapping-templates.d.ts +3 -3
- package/lib/api/hotswap/appsync-mapping-templates.js +25 -22
- package/lib/api/hotswap/code-build-projects.d.ts +3 -3
- package/lib/api/hotswap/code-build-projects.js +12 -7
- package/lib/api/hotswap/common.d.ts +13 -61
- package/lib/api/hotswap/common.js +40 -70
- package/lib/api/hotswap/ecs-services.d.ts +4 -4
- package/lib/api/hotswap/ecs-services.js +38 -21
- package/lib/api/hotswap/lambda-functions.d.ts +3 -3
- package/lib/api/hotswap/lambda-functions.js +23 -19
- package/lib/api/hotswap/s3-bucket-deployments.d.ts +3 -3
- package/lib/api/hotswap/s3-bucket-deployments.js +11 -7
- package/lib/api/hotswap/stepfunctions-state-machines.d.ts +3 -3
- package/lib/api/hotswap/stepfunctions-state-machines.js +8 -4
- package/lib/api/logs/find-cloudwatch-logs.js +6 -7
- package/lib/api/logs/logs-monitor.js +5 -8
- package/lib/api/plugin/plugin.js +6 -10
- package/lib/api/resource-import/importer.d.ts +8 -8
- package/lib/api/resource-import/importer.js +27 -42
- package/lib/api/resource-import/migrator.d.ts +3 -3
- package/lib/api/resource-import/migrator.js +6 -6
- package/lib/api/settings.d.ts +0 -3
- package/lib/api/settings.js +4 -40
- package/lib/api/stack-events/stack-activity-monitor.d.ts +1 -1
- package/lib/api/stack-events/stack-activity-monitor.js +12 -15
- package/lib/api/stack-events/stack-event-poller.js +9 -10
- package/lib/api/toolkit-info.d.ts +2 -2
- package/lib/api/toolkit-info.js +20 -24
- package/lib/{tree.d.ts → api/tree.d.ts} +2 -2
- package/lib/api/tree.js +37 -0
- package/lib/api/util/rwlock.js +4 -4
- package/lib/api/work-graph/work-graph-builder.js +4 -4
- package/lib/api/work-graph/work-graph.d.ts +1 -1
- package/lib/api/work-graph/work-graph.js +13 -15
- package/lib/cli/activity-printer/base.d.ts +2 -2
- package/lib/cli/activity-printer/base.js +6 -8
- package/lib/cli/activity-printer/current.js +7 -11
- package/lib/cli/activity-printer/history.js +2 -3
- package/lib/cli/cdk-toolkit.d.ts +16 -19
- package/lib/cli/cdk-toolkit.js +118 -74
- package/lib/cli/ci-systems.js +2 -3
- package/lib/cli/cli-config.js +4 -4
- package/lib/cli/cli.js +49 -50
- package/lib/cli/convert-to-user-input.js +110 -111
- package/lib/{toolkit → cli/io-host}/cli-io-host.d.ts +6 -2
- package/lib/cli/io-host/cli-io-host.js +356 -0
- package/lib/cli/io-host/index.d.ts +1 -0
- package/lib/{toolkit/error.js → cli/io-host/index.js} +2 -2
- package/lib/cli/messages.d.ts +1 -1
- package/lib/cli/messages.js +2 -3
- package/lib/cli/pretty-print-error.d.ts +1 -0
- package/lib/cli/pretty-print-error.js +35 -0
- package/lib/cli/root-dir.js +4 -4
- package/lib/cli/user-configuration.js +57 -14
- package/lib/cli/util/npm.js +3 -3
- package/lib/cli/util/yargs-helpers.d.ts +1 -1
- package/lib/cli/util/yargs-helpers.js +3 -3
- package/lib/cli/version.js +4 -4
- package/lib/commands/context.js +7 -8
- package/lib/commands/diff.d.ts +1 -0
- package/lib/commands/diff.js +7 -0
- package/lib/commands/init/index.d.ts +1 -0
- package/lib/commands/init/index.js +18 -0
- package/lib/commands/init/init-hooks.js +63 -0
- package/lib/commands/init/init.js +435 -0
- package/lib/{os.js → commands/init/os.js} +4 -4
- package/lib/{list-stacks.d.ts → commands/list-stacks.d.ts} +1 -1
- package/lib/{list-stacks.js → commands/list-stacks.js} +2 -2
- package/lib/commands/migrate.js +29 -32
- package/lib/context-providers/ami.d.ts +3 -1
- package/lib/context-providers/ami.js +8 -8
- package/lib/context-providers/availability-zones.d.ts +3 -1
- package/lib/context-providers/availability-zones.js +4 -4
- package/lib/context-providers/cc-api-provider.d.ts +8 -12
- package/lib/context-providers/cc-api-provider.js +94 -66
- package/lib/context-providers/endpoint-service-availability-zones.d.ts +3 -1
- package/lib/context-providers/endpoint-service-availability-zones.js +6 -6
- package/lib/context-providers/hosted-zones.d.ts +3 -1
- package/lib/context-providers/hosted-zones.js +11 -11
- package/lib/context-providers/index.d.ts +19 -5
- package/lib/context-providers/index.js +35 -17
- package/lib/context-providers/keys.d.ts +3 -1
- package/lib/context-providers/keys.js +8 -8
- package/lib/context-providers/load-balancers.js +15 -18
- package/lib/context-providers/security-groups.js +10 -12
- package/lib/context-providers/ssm-parameters.d.ts +3 -1
- package/lib/context-providers/ssm-parameters.js +7 -7
- package/lib/context-providers/vpcs.d.ts +3 -1
- package/lib/context-providers/vpcs.js +14 -15
- package/lib/index.js +124098 -123198
- package/lib/init-templates/.init-version.json +1 -1
- package/lib/init-templates/.recommended-feature-flags.json +3 -1
- package/lib/legacy-exports-source.d.ts +4 -5
- package/lib/legacy-exports-source.js +6 -7
- package/lib/logging.js +2 -2
- package/lib/notices.d.ts +1 -1
- package/lib/notices.js +26 -32
- package/package.json +29 -29
- package/lib/api/deployments/cloudformation.js +0 -597
- package/lib/api/deployments/nested-stack-helpers.js +0 -88
- package/lib/api/util/placeholders.js +0 -24
- package/lib/api/util/template-body-parameter.js +0 -103
- package/lib/diff.d.ts +0 -28
- package/lib/diff.js +0 -165
- package/lib/init-hooks.js +0 -63
- package/lib/init.js +0 -437
- package/lib/toolkit/cli-io-host.js +0 -353
- package/lib/toolkit/error.d.ts +0 -1
- package/lib/tree.js +0 -40
- /package/lib/api/{util → environment}/placeholders.d.ts +0 -0
- /package/lib/{init-hooks.d.ts → commands/init/init-hooks.d.ts} +0 -0
- /package/lib/{init.d.ts → commands/init/init.d.ts} +0 -0
- /package/lib/{os.d.ts → commands/init/os.d.ts} +0 -0
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AmiContextProviderPlugin = void 0;
|
|
4
|
+
const api_1 = require("../../../@aws-cdk/tmp-toolkit-helpers/src/api");
|
|
4
5
|
const sdk_provider_1 = require("../api/aws-auth/sdk-provider");
|
|
5
|
-
const logging_1 = require("../logging");
|
|
6
|
-
const error_1 = require("../toolkit/error");
|
|
7
6
|
/**
|
|
8
7
|
* Plugin to search AMIs for the current account
|
|
9
8
|
*/
|
|
10
9
|
class AmiContextProviderPlugin {
|
|
11
|
-
constructor(aws) {
|
|
10
|
+
constructor(aws, io) {
|
|
12
11
|
this.aws = aws;
|
|
12
|
+
this.io = io;
|
|
13
13
|
}
|
|
14
14
|
async getValue(args) {
|
|
15
15
|
const region = args.region;
|
|
16
16
|
const account = args.account;
|
|
17
17
|
// Normally we'd do this only as 'debug', but searching AMIs typically takes dozens
|
|
18
18
|
// of seconds, so be little more verbose about it so users know what is going on.
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
await this.io.info(`Searching for AMI in ${account}:${region}`);
|
|
20
|
+
await this.io.debug(`AMI search parameters: ${JSON.stringify(args)}`);
|
|
21
21
|
const ec2 = (await (0, sdk_provider_1.initContextProviderSdk)(this.aws, args)).ec2();
|
|
22
22
|
const response = await ec2.describeImages({
|
|
23
23
|
Owners: args.owners,
|
|
@@ -28,13 +28,13 @@ class AmiContextProviderPlugin {
|
|
|
28
28
|
});
|
|
29
29
|
const images = [...(response.Images || [])].filter((i) => i.ImageId !== undefined);
|
|
30
30
|
if (images.length === 0) {
|
|
31
|
-
throw new
|
|
31
|
+
throw new api_1.ContextProviderError('No AMI found that matched the search criteria');
|
|
32
32
|
}
|
|
33
33
|
// Return the most recent one
|
|
34
34
|
// Note: Date.parse() is not going to respect the timezone of the string,
|
|
35
35
|
// but since we only care about the relative values that is okay.
|
|
36
36
|
images.sort(descending((i) => Date.parse(i.CreationDate || '1970')));
|
|
37
|
-
|
|
37
|
+
await this.io.debug(`Selected image '${images[0].ImageId}' created at '${images[0].CreationDate}'`);
|
|
38
38
|
return images[0].ImageId;
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -47,4 +47,4 @@ function descending(valueOf) {
|
|
|
47
47
|
return valueOf(b) - valueOf(a);
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW1pLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYW1pLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHVFQUFxRjtBQUNyRiwrREFBd0Y7QUFHeEY7O0dBRUc7QUFDSCxNQUFhLHdCQUF3QjtJQUNuQyxZQUE2QixHQUFnQixFQUFtQixFQUE0QjtRQUEvRCxRQUFHLEdBQUgsR0FBRyxDQUFhO1FBQW1CLE9BQUUsR0FBRixFQUFFLENBQTBCO0lBQzVGLENBQUM7SUFFTSxLQUFLLENBQUMsUUFBUSxDQUFDLElBQXFCO1FBQ3pDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDM0IsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUU3QixtRkFBbUY7UUFDbkYsaUZBQWlGO1FBQ2pGLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLE9BQU8sSUFBSSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsMEJBQTBCLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRXRFLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxJQUFBLHFDQUFzQixFQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNqRSxNQUFNLFFBQVEsR0FBRyxNQUFNLEdBQUcsQ0FBQyxjQUFjLENBQUM7WUFDeEMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDNUQsSUFBSSxFQUFFLEdBQUc7Z0JBQ1QsTUFBTSxFQUFFLE1BQU07YUFDZixDQUFDLENBQUM7U0FDSixDQUFDLENBQUM7UUFFSCxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDO1FBRW5GLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksMEJBQW9CLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNsRixDQUFDO1FBRUQsNkJBQTZCO1FBQzdCLHlFQUF5RTtRQUN6RSxpRUFBaUU7UUFDakUsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFlBQVksSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFckUsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8saUJBQWlCLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDO1FBQ3BHLE9BQU8sTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQVEsQ0FBQztJQUM1QixDQUFDO0NBQ0Y7QUFwQ0QsNERBb0NDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLFVBQVUsQ0FBSSxPQUF5QjtJQUM5QyxPQUFPLENBQUMsQ0FBSSxFQUFFLENBQUksRUFBRSxFQUFFO1FBQ3BCLE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQyxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBBbWlDb250ZXh0UXVlcnkgfSBmcm9tICdAYXdzLWNkay9jbG91ZC1hc3NlbWJseS1zY2hlbWEnO1xuaW1wb3J0IHR5cGUgeyBJQ29udGV4dFByb3ZpZGVyTWVzc2FnZXMgfSBmcm9tICcuJztcbmltcG9ydCB7IENvbnRleHRQcm92aWRlckVycm9yIH0gZnJvbSAnLi4vLi4vLi4vQGF3cy1jZGsvdG1wLXRvb2xraXQtaGVscGVycy9zcmMvYXBpJztcbmltcG9ydCB7IHR5cGUgU2RrUHJvdmlkZXIsIGluaXRDb250ZXh0UHJvdmlkZXJTZGsgfSBmcm9tICcuLi9hcGkvYXdzLWF1dGgvc2RrLXByb3ZpZGVyJztcbmltcG9ydCB0eXBlIHsgQ29udGV4dFByb3ZpZGVyUGx1Z2luIH0gZnJvbSAnLi4vYXBpL3BsdWdpbic7XG5cbi8qKlxuICogUGx1Z2luIHRvIHNlYXJjaCBBTUlzIGZvciB0aGUgY3VycmVudCBhY2NvdW50XG4gKi9cbmV4cG9ydCBjbGFzcyBBbWlDb250ZXh0UHJvdmlkZXJQbHVnaW4gaW1wbGVtZW50cyBDb250ZXh0UHJvdmlkZXJQbHVnaW4ge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IGF3czogU2RrUHJvdmlkZXIsIHByaXZhdGUgcmVhZG9ubHkgaW86IElDb250ZXh0UHJvdmlkZXJNZXNzYWdlcykge1xuICB9XG5cbiAgcHVibGljIGFzeW5jIGdldFZhbHVlKGFyZ3M6IEFtaUNvbnRleHRRdWVyeSkge1xuICAgIGNvbnN0IHJlZ2lvbiA9IGFyZ3MucmVnaW9uO1xuICAgIGNvbnN0IGFjY291bnQgPSBhcmdzLmFjY291bnQ7XG5cbiAgICAvLyBOb3JtYWxseSB3ZSdkIGRvIHRoaXMgb25seSBhcyAnZGVidWcnLCBidXQgc2VhcmNoaW5nIEFNSXMgdHlwaWNhbGx5IHRha2VzIGRvemVuc1xuICAgIC8vIG9mIHNlY29uZHMsIHNvIGJlIGxpdHRsZSBtb3JlIHZlcmJvc2UgYWJvdXQgaXQgc28gdXNlcnMga25vdyB3aGF0IGlzIGdvaW5nIG9uLlxuICAgIGF3YWl0IHRoaXMuaW8uaW5mbyhgU2VhcmNoaW5nIGZvciBBTUkgaW4gJHthY2NvdW50fToke3JlZ2lvbn1gKTtcbiAgICBhd2FpdCB0aGlzLmlvLmRlYnVnKGBBTUkgc2VhcmNoIHBhcmFtZXRlcnM6ICR7SlNPTi5zdHJpbmdpZnkoYXJncyl9YCk7XG5cbiAgICBjb25zdCBlYzIgPSAoYXdhaXQgaW5pdENvbnRleHRQcm92aWRlclNkayh0aGlzLmF3cywgYXJncykpLmVjMigpO1xuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZWMyLmRlc2NyaWJlSW1hZ2VzKHtcbiAgICAgIE93bmVyczogYXJncy5vd25lcnMsXG4gICAgICBGaWx0ZXJzOiBPYmplY3QuZW50cmllcyhhcmdzLmZpbHRlcnMpLm1hcCgoW2tleSwgdmFsdWVzXSkgPT4gKHtcbiAgICAgICAgTmFtZToga2V5LFxuICAgICAgICBWYWx1ZXM6IHZhbHVlcyxcbiAgICAgIH0pKSxcbiAgICB9KTtcblxuICAgIGNvbnN0IGltYWdlcyA9IFsuLi4ocmVzcG9uc2UuSW1hZ2VzIHx8IFtdKV0uZmlsdGVyKChpKSA9PiBpLkltYWdlSWQgIT09IHVuZGVmaW5lZCk7XG5cbiAgICBpZiAoaW1hZ2VzLmxlbmd0aCA9PT0gMCkge1xuICAgICAgdGhyb3cgbmV3IENvbnRleHRQcm92aWRlckVycm9yKCdObyBBTUkgZm91bmQgdGhhdCBtYXRjaGVkIHRoZSBzZWFyY2ggY3JpdGVyaWEnKTtcbiAgICB9XG5cbiAgICAvLyBSZXR1cm4gdGhlIG1vc3QgcmVjZW50IG9uZVxuICAgIC8vIE5vdGU6IERhdGUucGFyc2UoKSBpcyBub3QgZ29pbmcgdG8gcmVzcGVjdCB0aGUgdGltZXpvbmUgb2YgdGhlIHN0cmluZyxcbiAgICAvLyBidXQgc2luY2Ugd2Ugb25seSBjYXJlIGFib3V0IHRoZSByZWxhdGl2ZSB2YWx1ZXMgdGhhdCBpcyBva2F5LlxuICAgIGltYWdlcy5zb3J0KGRlc2NlbmRpbmcoKGkpID0+IERhdGUucGFyc2UoaS5DcmVhdGlvbkRhdGUgfHwgJzE5NzAnKSkpO1xuXG4gICAgYXdhaXQgdGhpcy5pby5kZWJ1ZyhgU2VsZWN0ZWQgaW1hZ2UgJyR7aW1hZ2VzWzBdLkltYWdlSWR9JyBjcmVhdGVkIGF0ICcke2ltYWdlc1swXS5DcmVhdGlvbkRhdGV9J2ApO1xuICAgIHJldHVybiBpbWFnZXNbMF0uSW1hZ2VJZCE7XG4gIH1cbn1cblxuLyoqXG4gKiBNYWtlIGEgY29tcGFyYXRvciB0aGF0IHNvcnRzIGluIGRlc2NlbmRpbmcgb3JkZXIgZ2l2ZW4gYSBzb3J0IGtleSBleHRyYWN0b3JcbiAqL1xuZnVuY3Rpb24gZGVzY2VuZGluZzxBPih2YWx1ZU9mOiAoeDogQSkgPT4gbnVtYmVyKSB7XG4gIHJldHVybiAoYTogQSwgYjogQSkgPT4ge1xuICAgIHJldHVybiB2YWx1ZU9mKGIpIC0gdmFsdWVPZihhKTtcbiAgfTtcbn1cbiJdfQ==
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AvailabilityZonesContextQuery } from '@aws-cdk/cloud-assembly-schema';
|
|
2
|
+
import type { IContextProviderMessages } from '.';
|
|
2
3
|
import { type SdkProvider } from '../api/aws-auth/sdk-provider';
|
|
3
4
|
import type { ContextProviderPlugin } from '../api/plugin';
|
|
4
5
|
/**
|
|
@@ -6,6 +7,7 @@ import type { ContextProviderPlugin } from '../api/plugin';
|
|
|
6
7
|
*/
|
|
7
8
|
export declare class AZContextProviderPlugin implements ContextProviderPlugin {
|
|
8
9
|
private readonly aws;
|
|
9
|
-
|
|
10
|
+
private readonly io;
|
|
11
|
+
constructor(aws: SdkProvider, io: IContextProviderMessages);
|
|
10
12
|
getValue(args: AvailabilityZonesContextQuery): Promise<(string | undefined)[]>;
|
|
11
13
|
}
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AZContextProviderPlugin = void 0;
|
|
4
4
|
const sdk_provider_1 = require("../api/aws-auth/sdk-provider");
|
|
5
|
-
const logging_1 = require("../logging");
|
|
6
5
|
/**
|
|
7
6
|
* Plugin to retrieve the Availability Zones for the current account
|
|
8
7
|
*/
|
|
9
8
|
class AZContextProviderPlugin {
|
|
10
|
-
constructor(aws) {
|
|
9
|
+
constructor(aws, io) {
|
|
11
10
|
this.aws = aws;
|
|
11
|
+
this.io = io;
|
|
12
12
|
}
|
|
13
13
|
async getValue(args) {
|
|
14
14
|
const region = args.region;
|
|
15
15
|
const account = args.account;
|
|
16
|
-
|
|
16
|
+
await this.io.debug(`Reading AZs for ${account}:${region}`);
|
|
17
17
|
const ec2 = (await (0, sdk_provider_1.initContextProviderSdk)(this.aws, args)).ec2();
|
|
18
18
|
const response = await ec2.describeAvailabilityZones({});
|
|
19
19
|
if (!response.AvailabilityZones) {
|
|
@@ -24,4 +24,4 @@ class AZContextProviderPlugin {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
exports.AZContextProviderPlugin = AZContextProviderPlugin;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZhaWxhYmlsaXR5LXpvbmVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXZhaWxhYmlsaXR5LXpvbmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLCtEQUF3RjtBQUd4Rjs7R0FFRztBQUNILE1BQWEsdUJBQXVCO0lBQ2xDLFlBQTZCLEdBQWdCLEVBQW1CLEVBQTRCO1FBQS9ELFFBQUcsR0FBSCxHQUFHLENBQWE7UUFBbUIsT0FBRSxHQUFGLEVBQUUsQ0FBMEI7SUFDNUYsQ0FBQztJQUVNLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBbUM7UUFDdkQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMzQixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzdCLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsbUJBQW1CLE9BQU8sSUFBSSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVELE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxJQUFBLHFDQUFzQixFQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNqRSxNQUFNLFFBQVEsR0FBRyxNQUFNLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsUUFBUSxDQUFDLGlCQUFpQixFQUFFLENBQUM7WUFDaEMsT0FBTyxFQUFFLENBQUM7UUFDWixDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQXNCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLEtBQUssV0FBVyxDQUFDLENBQUMsR0FBRyxDQUN2RyxDQUFDLElBQXNCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQzFDLENBQUM7UUFDRixPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7Q0FDRjtBQWxCRCwwREFrQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IEF2YWlsYWJpbGl0eVpvbmVzQ29udGV4dFF1ZXJ5IH0gZnJvbSAnQGF3cy1jZGsvY2xvdWQtYXNzZW1ibHktc2NoZW1hJztcbmltcG9ydCB0eXBlIHsgQXZhaWxhYmlsaXR5Wm9uZSB9IGZyb20gJ0Bhd3Mtc2RrL2NsaWVudC1lYzInO1xuaW1wb3J0IHR5cGUgeyBJQ29udGV4dFByb3ZpZGVyTWVzc2FnZXMgfSBmcm9tICcuJztcbmltcG9ydCB7IHR5cGUgU2RrUHJvdmlkZXIsIGluaXRDb250ZXh0UHJvdmlkZXJTZGsgfSBmcm9tICcuLi9hcGkvYXdzLWF1dGgvc2RrLXByb3ZpZGVyJztcbmltcG9ydCB0eXBlIHsgQ29udGV4dFByb3ZpZGVyUGx1Z2luIH0gZnJvbSAnLi4vYXBpL3BsdWdpbic7XG5cbi8qKlxuICogUGx1Z2luIHRvIHJldHJpZXZlIHRoZSBBdmFpbGFiaWxpdHkgWm9uZXMgZm9yIHRoZSBjdXJyZW50IGFjY291bnRcbiAqL1xuZXhwb3J0IGNsYXNzIEFaQ29udGV4dFByb3ZpZGVyUGx1Z2luIGltcGxlbWVudHMgQ29udGV4dFByb3ZpZGVyUGx1Z2luIHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZWFkb25seSBhd3M6IFNka1Byb3ZpZGVyLCBwcml2YXRlIHJlYWRvbmx5IGlvOiBJQ29udGV4dFByb3ZpZGVyTWVzc2FnZXMpIHtcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBnZXRWYWx1ZShhcmdzOiBBdmFpbGFiaWxpdHlab25lc0NvbnRleHRRdWVyeSkge1xuICAgIGNvbnN0IHJlZ2lvbiA9IGFyZ3MucmVnaW9uO1xuICAgIGNvbnN0IGFjY291bnQgPSBhcmdzLmFjY291bnQ7XG4gICAgYXdhaXQgdGhpcy5pby5kZWJ1ZyhgUmVhZGluZyBBWnMgZm9yICR7YWNjb3VudH06JHtyZWdpb259YCk7XG4gICAgY29uc3QgZWMyID0gKGF3YWl0IGluaXRDb250ZXh0UHJvdmlkZXJTZGsodGhpcy5hd3MsIGFyZ3MpKS5lYzIoKTtcbiAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGVjMi5kZXNjcmliZUF2YWlsYWJpbGl0eVpvbmVzKHt9KTtcbiAgICBpZiAoIXJlc3BvbnNlLkF2YWlsYWJpbGl0eVpvbmVzKSB7XG4gICAgICByZXR1cm4gW107XG4gICAgfVxuICAgIGNvbnN0IGF6cyA9IHJlc3BvbnNlLkF2YWlsYWJpbGl0eVpvbmVzLmZpbHRlcigoem9uZTogQXZhaWxhYmlsaXR5Wm9uZSkgPT4gem9uZS5TdGF0ZSA9PT0gJ2F2YWlsYWJsZScpLm1hcChcbiAgICAgICh6b25lOiBBdmFpbGFiaWxpdHlab25lKSA9PiB6b25lLlpvbmVOYW1lLFxuICAgICk7XG4gICAgcmV0dXJuIGF6cztcbiAgfVxufVxuIl19
|
|
@@ -6,29 +6,25 @@ export declare class CcApiContextProviderPlugin implements ContextProviderPlugin
|
|
|
6
6
|
constructor(aws: SdkProvider);
|
|
7
7
|
/**
|
|
8
8
|
* This returns a data object with the value from CloudControl API result.
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* args.propertiesToReturn - Properties from CC API to return.
|
|
9
|
+
*
|
|
10
|
+
* See the documentation in the Cloud Assembly Schema for the semantics of
|
|
11
|
+
* each query parameter.
|
|
13
12
|
*/
|
|
14
|
-
getValue(args: CcApiContextQuery): Promise<
|
|
15
|
-
[key: string]: any;
|
|
16
|
-
}[]>;
|
|
17
|
-
private findResources;
|
|
13
|
+
getValue(args: CcApiContextQuery): Promise<any>;
|
|
18
14
|
/**
|
|
19
15
|
* Calls getResource from CC API to get the resource.
|
|
20
16
|
* See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/get-resource.html
|
|
21
17
|
*
|
|
22
|
-
*
|
|
23
|
-
* If the resource is found, then a map of the identifier to a map of property values is returned.
|
|
18
|
+
* Will always return exactly one resource, or fail.
|
|
24
19
|
*/
|
|
25
20
|
private getResource;
|
|
26
21
|
/**
|
|
27
22
|
* Calls listResources from CC API to get the resources and apply args.propertyMatch to find the resources.
|
|
28
23
|
* See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/list-resources.html
|
|
29
24
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
25
|
+
* Will return 0 or more resources.
|
|
26
|
+
*
|
|
27
|
+
* Does not currently paginate through more than one result page.
|
|
32
28
|
*/
|
|
33
29
|
private listResources;
|
|
34
30
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CcApiContextProviderPlugin = void 0;
|
|
4
|
+
const client_cloudcontrol_1 = require("@aws-sdk/client-cloudcontrol");
|
|
5
|
+
const api_1 = require("../../../@aws-cdk/tmp-toolkit-helpers/src/api");
|
|
4
6
|
const sdk_provider_1 = require("../api/aws-auth/sdk-provider");
|
|
5
|
-
const error_1 = require("../toolkit/error");
|
|
6
7
|
const util_1 = require("../util");
|
|
7
8
|
class CcApiContextProviderPlugin {
|
|
8
9
|
constructor(aws) {
|
|
@@ -10,107 +11,134 @@ class CcApiContextProviderPlugin {
|
|
|
10
11
|
}
|
|
11
12
|
/**
|
|
12
13
|
* This returns a data object with the value from CloudControl API result.
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* args.propertiesToReturn - Properties from CC API to return.
|
|
14
|
+
*
|
|
15
|
+
* See the documentation in the Cloud Assembly Schema for the semantics of
|
|
16
|
+
* each query parameter.
|
|
17
17
|
*/
|
|
18
18
|
async getValue(args) {
|
|
19
|
-
|
|
20
|
-
const result = await this.findResources(cloudControl, args);
|
|
21
|
-
return result;
|
|
22
|
-
}
|
|
23
|
-
async findResources(cc, args) {
|
|
19
|
+
// Validate input
|
|
24
20
|
if (args.exactIdentifier && args.propertyMatch) {
|
|
25
|
-
throw new
|
|
21
|
+
throw new api_1.ContextProviderError(`Provider protocol error: specify either exactIdentifier or propertyMatch, but not both (got ${JSON.stringify(args)})`);
|
|
26
22
|
}
|
|
27
|
-
if (
|
|
28
|
-
throw new
|
|
23
|
+
if (args.ignoreErrorOnMissingContext && args.dummyValue === undefined) {
|
|
24
|
+
throw new api_1.ContextProviderError(`Provider protocol error: if ignoreErrorOnMissingContext is set, a dummyValue must be supplied (got ${JSON.stringify(args)})`);
|
|
29
25
|
}
|
|
30
|
-
if (args.
|
|
31
|
-
|
|
32
|
-
|
|
26
|
+
if (args.dummyValue !== undefined && (!Array.isArray(args.dummyValue) || !args.dummyValue.every(isObject))) {
|
|
27
|
+
throw new api_1.ContextProviderError(`Provider protocol error: dummyValue must be an array of objects (got ${JSON.stringify(args.dummyValue)})`);
|
|
28
|
+
}
|
|
29
|
+
// Do the lookup
|
|
30
|
+
const cloudControl = (await (0, sdk_provider_1.initContextProviderSdk)(this.aws, args)).cloudControl();
|
|
31
|
+
try {
|
|
32
|
+
let resources;
|
|
33
|
+
if (args.exactIdentifier) {
|
|
34
|
+
// use getResource to get the exact indentifier
|
|
35
|
+
resources = await this.getResource(cloudControl, args.typeName, args.exactIdentifier);
|
|
36
|
+
}
|
|
37
|
+
else if (args.propertyMatch) {
|
|
38
|
+
// use listResource
|
|
39
|
+
resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch, args.expectedMatchCount);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
throw new api_1.ContextProviderError(`Provider protocol error: neither exactIdentifier nor propertyMatch is specified in ${JSON.stringify(args)}.`);
|
|
43
|
+
}
|
|
44
|
+
return resources.map((r) => (0, util_1.getResultObj)(r.properties, r.identifier, args.propertiesToReturn));
|
|
33
45
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
46
|
+
catch (err) {
|
|
47
|
+
if (err instanceof ZeroResourcesFoundError && args.ignoreErrorOnMissingContext) {
|
|
48
|
+
// We've already type-checked dummyValue.
|
|
49
|
+
return args.dummyValue;
|
|
50
|
+
}
|
|
51
|
+
throw err;
|
|
37
52
|
}
|
|
38
53
|
}
|
|
39
54
|
/**
|
|
40
55
|
* Calls getResource from CC API to get the resource.
|
|
41
56
|
* See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/get-resource.html
|
|
42
57
|
*
|
|
43
|
-
*
|
|
44
|
-
* If the resource is found, then a map of the identifier to a map of property values is returned.
|
|
58
|
+
* Will always return exactly one resource, or fail.
|
|
45
59
|
*/
|
|
46
|
-
async getResource(cc, typeName, exactIdentifier
|
|
47
|
-
var _a, _b, _c, _d, _e;
|
|
48
|
-
const resultObjs = [];
|
|
60
|
+
async getResource(cc, typeName, exactIdentifier) {
|
|
49
61
|
try {
|
|
50
62
|
const result = await cc.getResource({
|
|
51
63
|
TypeName: typeName,
|
|
52
64
|
Identifier: exactIdentifier,
|
|
53
65
|
});
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const propsObject = JSON.parse((_d = (_c = result.ResourceDescription) === null || _c === void 0 ? void 0 : _c.Properties) !== null && _d !== void 0 ? _d : '');
|
|
57
|
-
const propsObj = (0, util_1.getResultObj)(propsObject, (_e = result.ResourceDescription) === null || _e === void 0 ? void 0 : _e.Identifier, propertiesToReturn);
|
|
58
|
-
resultObjs.push(propsObj);
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
throw new error_1.ContextProviderError(`Could not get resource ${exactIdentifier}.`);
|
|
66
|
+
if (!result.ResourceDescription) {
|
|
67
|
+
throw new api_1.ContextProviderError('Unexpected CloudControl API behavior: returned empty response');
|
|
62
68
|
}
|
|
69
|
+
return [foundResourceFromCcApi(result.ResourceDescription)];
|
|
63
70
|
}
|
|
64
71
|
catch (err) {
|
|
65
|
-
|
|
72
|
+
if (err instanceof client_cloudcontrol_1.ResourceNotFoundException || err.name === 'ResourceNotFoundException') {
|
|
73
|
+
throw new ZeroResourcesFoundError(`No resource of type ${typeName} with identifier: ${exactIdentifier}`);
|
|
74
|
+
}
|
|
75
|
+
if (!(err instanceof api_1.ContextProviderError)) {
|
|
76
|
+
throw new api_1.ContextProviderError(`Encountered CC API error while getting ${typeName} resource ${exactIdentifier}: ${err.message}`);
|
|
77
|
+
}
|
|
78
|
+
throw err;
|
|
66
79
|
}
|
|
67
|
-
return resultObjs;
|
|
68
80
|
}
|
|
69
81
|
/**
|
|
70
82
|
* Calls listResources from CC API to get the resources and apply args.propertyMatch to find the resources.
|
|
71
83
|
* See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/list-resources.html
|
|
72
84
|
*
|
|
73
|
-
*
|
|
74
|
-
*
|
|
85
|
+
* Will return 0 or more resources.
|
|
86
|
+
*
|
|
87
|
+
* Does not currently paginate through more than one result page.
|
|
75
88
|
*/
|
|
76
|
-
async listResources(cc, typeName, propertyMatch,
|
|
77
|
-
var _a;
|
|
78
|
-
const resultObjs = [];
|
|
89
|
+
async listResources(cc, typeName, propertyMatch, expectedMatchCount) {
|
|
79
90
|
try {
|
|
80
91
|
const result = await cc.listResources({
|
|
81
92
|
TypeName: typeName,
|
|
82
93
|
});
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
if (filters) {
|
|
91
|
-
match = filters.every((record, _index, _arr) => {
|
|
92
|
-
const key = record[0];
|
|
93
|
-
const expected = record[1];
|
|
94
|
-
const actual = (0, util_1.findJsonValue)(propsObject, key);
|
|
95
|
-
return propertyMatchesFilter(actual, expected);
|
|
96
|
-
});
|
|
97
|
-
function propertyMatchesFilter(actual, expected) {
|
|
98
|
-
// For now we just check for strict equality, but we can implement pattern matching and fuzzy matching here later
|
|
99
|
-
return expected === actual;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
if (match) {
|
|
103
|
-
const propsObj = (0, util_1.getResultObj)(propsObject, resource.Identifier, propertiesToReturn);
|
|
104
|
-
resultObjs.push(propsObj);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
94
|
+
const found = (result.ResourceDescriptions ?? [])
|
|
95
|
+
.map(foundResourceFromCcApi)
|
|
96
|
+
.filter((r) => {
|
|
97
|
+
return Object.entries(propertyMatch).every(([propPath, expected]) => {
|
|
98
|
+
const actual = (0, util_1.findJsonValue)(r.properties, propPath);
|
|
99
|
+
return propertyMatchesFilter(actual, expected);
|
|
100
|
+
});
|
|
107
101
|
});
|
|
102
|
+
if ((expectedMatchCount === 'at-least-one' || expectedMatchCount === 'exactly-one') && found.length === 0) {
|
|
103
|
+
throw new ZeroResourcesFoundError(`Could not find any resources matching ${JSON.stringify(propertyMatch)}`);
|
|
104
|
+
}
|
|
105
|
+
if ((expectedMatchCount === 'at-most-one' || expectedMatchCount === 'exactly-one') && found.length > 1) {
|
|
106
|
+
throw new api_1.ContextProviderError(`Found ${found.length} resources matching ${JSON.stringify(propertyMatch)}; please narrow the search criteria`);
|
|
107
|
+
}
|
|
108
|
+
return found;
|
|
108
109
|
}
|
|
109
110
|
catch (err) {
|
|
110
|
-
|
|
111
|
+
if (!(err instanceof api_1.ContextProviderError) && !(err instanceof ZeroResourcesFoundError)) {
|
|
112
|
+
throw new api_1.ContextProviderError(`Encountered CC API error while listing ${typeName} resources matching ${JSON.stringify(propertyMatch)}: ${err.message}`);
|
|
113
|
+
}
|
|
114
|
+
throw err;
|
|
111
115
|
}
|
|
112
|
-
return resultObjs;
|
|
113
116
|
}
|
|
114
117
|
}
|
|
115
118
|
exports.CcApiContextProviderPlugin = CcApiContextProviderPlugin;
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cc-api-provider.js","sourceRoot":"","sources":["cc-api-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CcApiContextQuery } from '@aws-cdk/cloud-assembly-schema';\nimport type { ICloudControlClient } from '../api';\nimport { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider';\nimport type { ContextProviderPlugin } from '../api/plugin';\nimport { ContextProviderError } from '../toolkit/error';\nimport { findJsonValue, getResultObj } from '../util';\n\nexport class CcApiContextProviderPlugin implements ContextProviderPlugin {\n  constructor(private readonly aws: SdkProvider) {\n  }\n\n  /**\n   * This returns a data object with the value from CloudControl API result.\n   * args.typeName - see https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/supported-resources.html\n   * args.exactIdentifier -  use CC API getResource.\n   * args.propertyMatch - use CCP API listResources to get resources and propertyMatch to search through the list.\n   * args.propertiesToReturn - Properties from CC API to return.\n   */\n  public async getValue(args: CcApiContextQuery) {\n    const cloudControl = (await initContextProviderSdk(this.aws, args)).cloudControl();\n\n    const result = await this.findResources(cloudControl, args);\n    return result;\n  }\n\n  private async findResources(cc: ICloudControlClient, args: CcApiContextQuery): Promise<{[key: string]: any} []> {\n    if (args.exactIdentifier && args.propertyMatch) {\n      throw new ContextProviderError(`Specify either exactIdentifier or propertyMatch, but not both. Failed to find resources using CC API for type ${args.typeName}.`);\n    }\n    if (!args.exactIdentifier && !args.propertyMatch) {\n      throw new ContextProviderError(`Neither exactIdentifier nor propertyMatch is specified. Failed to find resources using CC API for type ${args.typeName}.`);\n    }\n\n    if (args.exactIdentifier) {\n      // use getResource to get the exact indentifier\n      return this.getResource(cc, args.typeName, args.exactIdentifier, args.propertiesToReturn);\n    } else {\n      // use listResource\n      return this.listResources(cc, args.typeName, args.propertyMatch!, args.propertiesToReturn);\n    }\n  }\n\n  /**\n   * Calls getResource from CC API to get the resource.\n   * See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/get-resource.html\n   *\n   * If the exactIdentifier is not found, then an empty map is returned.\n   * If the resource is found, then a map of the identifier to a map of property values is returned.\n   */\n  private async getResource(\n    cc: ICloudControlClient,\n    typeName: string,\n    exactIdentifier: string,\n    propertiesToReturn: string[],\n  ): Promise<{[key: string]: any}[]> {\n    const resultObjs: {[key: string]: any}[] = [];\n    try {\n      const result = await cc.getResource({\n        TypeName: typeName,\n        Identifier: exactIdentifier,\n      });\n      const id = result.ResourceDescription?.Identifier ?? '';\n      if (id !== '') {\n        const propsObject = JSON.parse(result.ResourceDescription?.Properties ?? '');\n        const propsObj = getResultObj(propsObject, result.ResourceDescription?.Identifier!, propertiesToReturn);\n        resultObjs.push(propsObj);\n      } else {\n        throw new ContextProviderError(`Could not get resource ${exactIdentifier}.`);\n      }\n    } catch (err) {\n      throw new ContextProviderError(`Encountered CC API error while getting resource ${exactIdentifier}. Error: ${err}`);\n    }\n    return resultObjs;\n  }\n\n  /**\n   * Calls listResources from CC API to get the resources and apply args.propertyMatch to find the resources.\n   * See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/list-resources.html\n   *\n   * Since exactIdentifier is not specified, propertyMatch must be specified.\n   * This returns an object where the ids are object keys and values are objects with keys of args.propertiesToReturn.\n   */\n  private async listResources(\n    cc: ICloudControlClient,\n    typeName: string,\n    propertyMatch: Record<string, unknown>,\n    propertiesToReturn: string[],\n  ): Promise<{[key: string]: any}[]> {\n    const resultObjs: {[key: string]: any}[] = [];\n\n    try {\n      const result = await cc.listResources({\n        TypeName: typeName,\n      });\n      result.ResourceDescriptions?.forEach((resource) => {\n        const id = resource.Identifier ?? '';\n        if (id !== '') {\n          const propsObject = JSON.parse(resource.Properties ?? '');\n\n          const filters = Object.entries(propertyMatch);\n          let match = false;\n          if (filters) {\n            match = filters.every((record, _index, _arr) => {\n              const key = record[0];\n              const expected = record[1];\n              const actual = findJsonValue(propsObject, key);\n              return propertyMatchesFilter(actual, expected);\n            });\n\n            function propertyMatchesFilter(actual: any, expected: unknown) {\n              // For now we just check for strict equality, but we can implement pattern matching and fuzzy matching here later\n              return expected === actual;\n            }\n          }\n\n          if (match) {\n            const propsObj = getResultObj(propsObject, resource.Identifier!, propertiesToReturn);\n            resultObjs.push(propsObj);\n          }\n        }\n      });\n    } catch (err) {\n      throw new ContextProviderError(`Could not get resources ${JSON.stringify(propertyMatch)}. Error: ${err}`);\n    }\n    return resultObjs;\n  }\n}\n"]}
|
|
119
|
+
/**
|
|
120
|
+
* Convert a CC API response object into a nicer object (parse the JSON)
|
|
121
|
+
*/
|
|
122
|
+
function foundResourceFromCcApi(desc) {
|
|
123
|
+
return {
|
|
124
|
+
identifier: desc.Identifier ?? '*MISSING*',
|
|
125
|
+
properties: JSON.parse(desc.Properties ?? '{}'),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Whether the given property value matches the given filter
|
|
130
|
+
*
|
|
131
|
+
* For now we just check for strict equality, but we can implement pattern matching and fuzzy matching here later
|
|
132
|
+
*/
|
|
133
|
+
function propertyMatchesFilter(actual, expected) {
|
|
134
|
+
return expected === actual;
|
|
135
|
+
}
|
|
136
|
+
function isObject(x) {
|
|
137
|
+
return typeof x === 'object' && x !== null && !Array.isArray(x);
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* A specific lookup failure indicating 0 resources found that can be recovered
|
|
141
|
+
*/
|
|
142
|
+
class ZeroResourcesFoundError extends Error {
|
|
143
|
+
}
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cc-api-provider.js","sourceRoot":"","sources":["cc-api-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CcApiContextQuery } from '@aws-cdk/cloud-assembly-schema';\nimport type { ResourceDescription } from '@aws-sdk/client-cloudcontrol';\nimport { ResourceNotFoundException } from '@aws-sdk/client-cloudcontrol';\nimport { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';\nimport type { ICloudControlClient } from '../api';\nimport { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider';\nimport type { ContextProviderPlugin } from '../api/plugin';\nimport { findJsonValue, getResultObj } from '../util';\n\nexport class CcApiContextProviderPlugin implements ContextProviderPlugin {\n  constructor(private readonly aws: SdkProvider) {\n  }\n\n  /**\n   * This returns a data object with the value from CloudControl API result.\n   *\n   * See the documentation in the Cloud Assembly Schema for the semantics of\n   * each query parameter.\n   */\n  public async getValue(args: CcApiContextQuery) {\n    // Validate input\n    if (args.exactIdentifier && args.propertyMatch) {\n      throw new ContextProviderError(`Provider protocol error: specify either exactIdentifier or propertyMatch, but not both (got ${JSON.stringify(args)})`);\n    }\n    if (args.ignoreErrorOnMissingContext && args.dummyValue === undefined) {\n      throw new ContextProviderError(`Provider protocol error: if ignoreErrorOnMissingContext is set, a dummyValue must be supplied (got ${JSON.stringify(args)})`);\n    }\n    if (args.dummyValue !== undefined && (!Array.isArray(args.dummyValue) || !args.dummyValue.every(isObject))) {\n      throw new ContextProviderError(`Provider protocol error: dummyValue must be an array of objects (got ${JSON.stringify(args.dummyValue)})`);\n    }\n\n    // Do the lookup\n    const cloudControl = (await initContextProviderSdk(this.aws, args)).cloudControl();\n\n    try {\n      let resources: FoundResource[];\n      if (args.exactIdentifier) {\n        // use getResource to get the exact indentifier\n        resources = await this.getResource(cloudControl, args.typeName, args.exactIdentifier);\n      } else if (args.propertyMatch) {\n        // use listResource\n        resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch, args.expectedMatchCount);\n      } else {\n        throw new ContextProviderError(`Provider protocol error: neither exactIdentifier nor propertyMatch is specified in ${JSON.stringify(args)}.`);\n      }\n\n      return resources.map((r) => getResultObj(r.properties, r.identifier, args.propertiesToReturn));\n    } catch (err) {\n      if (err instanceof ZeroResourcesFoundError && args.ignoreErrorOnMissingContext) {\n        // We've already type-checked dummyValue.\n        return args.dummyValue;\n      }\n      throw err;\n    }\n  }\n\n  /**\n   * Calls getResource from CC API to get the resource.\n   * See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/get-resource.html\n   *\n   * Will always return exactly one resource, or fail.\n   */\n  private async getResource(\n    cc: ICloudControlClient,\n    typeName: string,\n    exactIdentifier: string,\n  ): Promise<FoundResource[]> {\n    try {\n      const result = await cc.getResource({\n        TypeName: typeName,\n        Identifier: exactIdentifier,\n      });\n      if (!result.ResourceDescription) {\n        throw new ContextProviderError('Unexpected CloudControl API behavior: returned empty response');\n      }\n\n      return [foundResourceFromCcApi(result.ResourceDescription)];\n    } catch (err: any) {\n      if (err instanceof ResourceNotFoundException || (err as any).name === 'ResourceNotFoundException') {\n        throw new ZeroResourcesFoundError(`No resource of type ${typeName} with identifier: ${exactIdentifier}`);\n      }\n      if (!(err instanceof ContextProviderError)) {\n        throw new ContextProviderError(`Encountered CC API error while getting ${typeName} resource ${exactIdentifier}: ${err.message}`);\n      }\n      throw err;\n    }\n  }\n\n  /**\n   * Calls listResources from CC API to get the resources and apply args.propertyMatch to find the resources.\n   * See https://docs.aws.amazon.com/cli/latest/reference/cloudcontrol/list-resources.html\n   *\n   * Will return 0 or more resources.\n   *\n   * Does not currently paginate through more than one result page.\n   */\n  private async listResources(\n    cc: ICloudControlClient,\n    typeName: string,\n    propertyMatch: Record<string, unknown>,\n    expectedMatchCount?: CcApiContextQuery['expectedMatchCount'],\n  ): Promise<FoundResource[]> {\n    try {\n      const result = await cc.listResources({\n        TypeName: typeName,\n\n      });\n      const found = (result.ResourceDescriptions ?? [])\n        .map(foundResourceFromCcApi)\n        .filter((r) => {\n          return Object.entries(propertyMatch).every(([propPath, expected]) => {\n            const actual = findJsonValue(r.properties, propPath);\n            return propertyMatchesFilter(actual, expected);\n          });\n        });\n\n      if ((expectedMatchCount === 'at-least-one' || expectedMatchCount === 'exactly-one') && found.length === 0) {\n        throw new ZeroResourcesFoundError(`Could not find any resources matching ${JSON.stringify(propertyMatch)}`);\n      }\n      if ((expectedMatchCount === 'at-most-one' || expectedMatchCount === 'exactly-one') && found.length > 1) {\n        throw new ContextProviderError(`Found ${found.length} resources matching ${JSON.stringify(propertyMatch)}; please narrow the search criteria`);\n      }\n\n      return found;\n    } catch (err: any) {\n      if (!(err instanceof ContextProviderError) && !(err instanceof ZeroResourcesFoundError)) {\n        throw new ContextProviderError(`Encountered CC API error while listing ${typeName} resources matching ${JSON.stringify(propertyMatch)}: ${err.message}`);\n      }\n      throw err;\n    }\n  }\n}\n\n/**\n * Convert a CC API response object into a nicer object (parse the JSON)\n */\nfunction foundResourceFromCcApi(desc: ResourceDescription): FoundResource {\n  return {\n    identifier: desc.Identifier ?? '*MISSING*',\n    properties: JSON.parse(desc.Properties ?? '{}'),\n  };\n}\n\n/**\n * Whether the given property value matches the given filter\n *\n * For now we just check for strict equality, but we can implement pattern matching and fuzzy matching here later\n */\nfunction propertyMatchesFilter(actual: unknown, expected: unknown) {\n  return expected === actual;\n}\n\nfunction isObject(x: unknown): x is {[key: string]: unknown} {\n  return typeof x === 'object' && x !== null && !Array.isArray(x);\n}\n\n/**\n * A parsed version of the return value from CCAPI\n */\ninterface FoundResource {\n  readonly identifier: string;\n  readonly properties: Record<string, unknown>;\n}\n\n/**\n * A specific lookup failure indicating 0 resources found that can be recovered\n */\nclass ZeroResourcesFoundError extends Error {\n}\n"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { EndpointServiceAvailabilityZonesContextQuery } from '@aws-cdk/cloud-assembly-schema';
|
|
2
|
+
import type { IContextProviderMessages } from '.';
|
|
2
3
|
import { type SdkProvider } from '../api/aws-auth/sdk-provider';
|
|
3
4
|
import type { ContextProviderPlugin } from '../api/plugin';
|
|
4
5
|
/**
|
|
@@ -6,6 +7,7 @@ import type { ContextProviderPlugin } from '../api/plugin';
|
|
|
6
7
|
*/
|
|
7
8
|
export declare class EndpointServiceAZContextProviderPlugin implements ContextProviderPlugin {
|
|
8
9
|
private readonly aws;
|
|
9
|
-
|
|
10
|
+
private readonly io;
|
|
11
|
+
constructor(aws: SdkProvider, io: IContextProviderMessages);
|
|
10
12
|
getValue(args: EndpointServiceAvailabilityZonesContextQuery): Promise<string[] | undefined>;
|
|
11
13
|
}
|
|
@@ -2,32 +2,32 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EndpointServiceAZContextProviderPlugin = void 0;
|
|
4
4
|
const sdk_provider_1 = require("../api/aws-auth/sdk-provider");
|
|
5
|
-
const logging_1 = require("../logging");
|
|
6
5
|
/**
|
|
7
6
|
* Plugin to retrieve the Availability Zones for an endpoint service
|
|
8
7
|
*/
|
|
9
8
|
class EndpointServiceAZContextProviderPlugin {
|
|
10
|
-
constructor(aws) {
|
|
9
|
+
constructor(aws, io) {
|
|
11
10
|
this.aws = aws;
|
|
11
|
+
this.io = io;
|
|
12
12
|
}
|
|
13
13
|
async getValue(args) {
|
|
14
14
|
const region = args.region;
|
|
15
15
|
const account = args.account;
|
|
16
16
|
const serviceName = args.serviceName;
|
|
17
|
-
|
|
17
|
+
await this.io.debug(`Reading AZs for ${account}:${region}:${serviceName}`);
|
|
18
18
|
const ec2 = (await (0, sdk_provider_1.initContextProviderSdk)(this.aws, args)).ec2();
|
|
19
19
|
const response = await ec2.describeVpcEndpointServices({
|
|
20
20
|
ServiceNames: [serviceName],
|
|
21
21
|
});
|
|
22
22
|
// expect a service in the response
|
|
23
23
|
if (!response.ServiceDetails || response.ServiceDetails.length === 0) {
|
|
24
|
-
|
|
24
|
+
await this.io.debug(`Could not retrieve service details for ${account}:${region}:${serviceName}`);
|
|
25
25
|
return [];
|
|
26
26
|
}
|
|
27
27
|
const azs = response.ServiceDetails[0].AvailabilityZones;
|
|
28
|
-
|
|
28
|
+
await this.io.debug(`Endpoint service ${account}:${region}:${serviceName} is available in availability zones ${azs}`);
|
|
29
29
|
return azs;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
exports.EndpointServiceAZContextProviderPlugin = EndpointServiceAZContextProviderPlugin;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5kcG9pbnQtc2VydmljZS1hdmFpbGFiaWxpdHktem9uZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJlbmRwb2ludC1zZXJ2aWNlLWF2YWlsYWJpbGl0eS16b25lcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSwrREFBd0Y7QUFHeEY7O0dBRUc7QUFDSCxNQUFhLHNDQUFzQztJQUNqRCxZQUE2QixHQUFnQixFQUFtQixFQUE0QjtRQUEvRCxRQUFHLEdBQUgsR0FBRyxDQUFhO1FBQW1CLE9BQUUsR0FBRixFQUFFLENBQTBCO0lBQzVGLENBQUM7SUFFTSxLQUFLLENBQUMsUUFBUSxDQUFDLElBQWtEO1FBQ3RFLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDM0IsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO1FBQ3JDLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsbUJBQW1CLE9BQU8sSUFBSSxNQUFNLElBQUksV0FBVyxFQUFFLENBQUMsQ0FBQztRQUMzRSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sSUFBQSxxQ0FBc0IsRUFBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDakUsTUFBTSxRQUFRLEdBQUcsTUFBTSxHQUFHLENBQUMsMkJBQTJCLENBQUM7WUFDckQsWUFBWSxFQUFFLENBQUMsV0FBVyxDQUFDO1NBQzVCLENBQUMsQ0FBQztRQUVILG1DQUFtQztRQUNuQyxJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsSUFBSSxRQUFRLENBQUMsY0FBYyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNyRSxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLDBDQUEwQyxPQUFPLElBQUksTUFBTSxJQUFJLFdBQVcsRUFBRSxDQUFDLENBQUM7WUFDbEcsT0FBTyxFQUFFLENBQUM7UUFDWixDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQztRQUN6RCxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLG9CQUFvQixPQUFPLElBQUksTUFBTSxJQUFJLFdBQVcsdUNBQXVDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDdEgsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDO0NBQ0Y7QUF2QkQsd0ZBdUJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBFbmRwb2ludFNlcnZpY2VBdmFpbGFiaWxpdHlab25lc0NvbnRleHRRdWVyeSB9IGZyb20gJ0Bhd3MtY2RrL2Nsb3VkLWFzc2VtYmx5LXNjaGVtYSc7XG5pbXBvcnQgdHlwZSB7IElDb250ZXh0UHJvdmlkZXJNZXNzYWdlcyB9IGZyb20gJy4nO1xuaW1wb3J0IHsgdHlwZSBTZGtQcm92aWRlciwgaW5pdENvbnRleHRQcm92aWRlclNkayB9IGZyb20gJy4uL2FwaS9hd3MtYXV0aC9zZGstcHJvdmlkZXInO1xuaW1wb3J0IHR5cGUgeyBDb250ZXh0UHJvdmlkZXJQbHVnaW4gfSBmcm9tICcuLi9hcGkvcGx1Z2luJztcblxuLyoqXG4gKiBQbHVnaW4gdG8gcmV0cmlldmUgdGhlIEF2YWlsYWJpbGl0eSBab25lcyBmb3IgYW4gZW5kcG9pbnQgc2VydmljZVxuICovXG5leHBvcnQgY2xhc3MgRW5kcG9pbnRTZXJ2aWNlQVpDb250ZXh0UHJvdmlkZXJQbHVnaW4gaW1wbGVtZW50cyBDb250ZXh0UHJvdmlkZXJQbHVnaW4ge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IGF3czogU2RrUHJvdmlkZXIsIHByaXZhdGUgcmVhZG9ubHkgaW86IElDb250ZXh0UHJvdmlkZXJNZXNzYWdlcykge1xuICB9XG5cbiAgcHVibGljIGFzeW5jIGdldFZhbHVlKGFyZ3M6IEVuZHBvaW50U2VydmljZUF2YWlsYWJpbGl0eVpvbmVzQ29udGV4dFF1ZXJ5KSB7XG4gICAgY29uc3QgcmVnaW9uID0gYXJncy5yZWdpb247XG4gICAgY29uc3QgYWNjb3VudCA9IGFyZ3MuYWNjb3VudDtcbiAgICBjb25zdCBzZXJ2aWNlTmFtZSA9IGFyZ3Muc2VydmljZU5hbWU7XG4gICAgYXdhaXQgdGhpcy5pby5kZWJ1ZyhgUmVhZGluZyBBWnMgZm9yICR7YWNjb3VudH06JHtyZWdpb259OiR7c2VydmljZU5hbWV9YCk7XG4gICAgY29uc3QgZWMyID0gKGF3YWl0IGluaXRDb250ZXh0UHJvdmlkZXJTZGsodGhpcy5hd3MsIGFyZ3MpKS5lYzIoKTtcbiAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGVjMi5kZXNjcmliZVZwY0VuZHBvaW50U2VydmljZXMoe1xuICAgICAgU2VydmljZU5hbWVzOiBbc2VydmljZU5hbWVdLFxuICAgIH0pO1xuXG4gICAgLy8gZXhwZWN0IGEgc2VydmljZSBpbiB0aGUgcmVzcG9uc2VcbiAgICBpZiAoIXJlc3BvbnNlLlNlcnZpY2VEZXRhaWxzIHx8IHJlc3BvbnNlLlNlcnZpY2VEZXRhaWxzLmxlbmd0aCA9PT0gMCkge1xuICAgICAgYXdhaXQgdGhpcy5pby5kZWJ1ZyhgQ291bGQgbm90IHJldHJpZXZlIHNlcnZpY2UgZGV0YWlscyBmb3IgJHthY2NvdW50fToke3JlZ2lvbn06JHtzZXJ2aWNlTmFtZX1gKTtcbiAgICAgIHJldHVybiBbXTtcbiAgICB9XG4gICAgY29uc3QgYXpzID0gcmVzcG9uc2UuU2VydmljZURldGFpbHNbMF0uQXZhaWxhYmlsaXR5Wm9uZXM7XG4gICAgYXdhaXQgdGhpcy5pby5kZWJ1ZyhgRW5kcG9pbnQgc2VydmljZSAke2FjY291bnR9OiR7cmVnaW9ufToke3NlcnZpY2VOYW1lfSBpcyBhdmFpbGFibGUgaW4gYXZhaWxhYmlsaXR5IHpvbmVzICR7YXpzfWApO1xuICAgIHJldHVybiBhenM7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { HostedZoneContextQuery } from '@aws-cdk/cloud-assembly-schema';
|
|
2
|
+
import type { IContextProviderMessages } from '.';
|
|
2
3
|
import { type SdkProvider } from '../api/aws-auth/sdk-provider';
|
|
3
4
|
import type { ContextProviderPlugin } from '../api/plugin';
|
|
4
5
|
export declare class HostedZoneContextProviderPlugin implements ContextProviderPlugin {
|
|
5
6
|
private readonly aws;
|
|
6
|
-
|
|
7
|
+
private readonly io;
|
|
8
|
+
constructor(aws: SdkProvider, io: IContextProviderMessages);
|
|
7
9
|
getValue(args: HostedZoneContextQuery): Promise<object>;
|
|
8
10
|
private filterZones;
|
|
9
11
|
private isHostedZoneQuery;
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HostedZoneContextProviderPlugin = void 0;
|
|
4
|
+
const api_1 = require("../../../@aws-cdk/tmp-toolkit-helpers/src/api");
|
|
4
5
|
const sdk_provider_1 = require("../api/aws-auth/sdk-provider");
|
|
5
|
-
const logging_1 = require("../logging");
|
|
6
|
-
const error_1 = require("../toolkit/error");
|
|
7
6
|
class HostedZoneContextProviderPlugin {
|
|
8
|
-
constructor(aws) {
|
|
7
|
+
constructor(aws, io) {
|
|
9
8
|
this.aws = aws;
|
|
9
|
+
this.io = io;
|
|
10
10
|
}
|
|
11
11
|
async getValue(args) {
|
|
12
12
|
const account = args.account;
|
|
13
13
|
const region = args.region;
|
|
14
14
|
if (!this.isHostedZoneQuery(args)) {
|
|
15
|
-
throw new
|
|
15
|
+
throw new api_1.ContextProviderError(`HostedZoneProvider requires domainName property to be set in ${args}`);
|
|
16
16
|
}
|
|
17
17
|
const domainName = args.domainName;
|
|
18
|
-
|
|
18
|
+
await this.io.debug(`Reading hosted zone ${account}:${region}:${domainName}`);
|
|
19
19
|
const r53 = (await (0, sdk_provider_1.initContextProviderSdk)(this.aws, args)).route53();
|
|
20
20
|
const response = await r53.listHostedZonesByName({ DNSName: domainName });
|
|
21
21
|
if (!response.HostedZones) {
|
|
22
|
-
throw new
|
|
22
|
+
throw new api_1.ContextProviderError(`Hosted Zone not found in account ${account}, region ${region}: ${domainName}`);
|
|
23
23
|
}
|
|
24
24
|
const candidateZones = await this.filterZones(r53, response.HostedZones, args);
|
|
25
25
|
if (candidateZones.length !== 1) {
|
|
26
26
|
const filteProps = `dns:${domainName}, privateZone:${args.privateZone}, vpcId:${args.vpcId}`;
|
|
27
|
-
throw new
|
|
27
|
+
throw new api_1.ContextProviderError(`Found zones: ${JSON.stringify(candidateZones)} for ${filteProps}, but wanted exactly 1 zone`);
|
|
28
28
|
}
|
|
29
29
|
return {
|
|
30
30
|
Id: candidateZones[0].Id,
|
|
@@ -34,9 +34,9 @@ class HostedZoneContextProviderPlugin {
|
|
|
34
34
|
async filterZones(r53, zones, props) {
|
|
35
35
|
let candidates = [];
|
|
36
36
|
const domainName = props.domainName.endsWith('.') ? props.domainName : `${props.domainName}.`;
|
|
37
|
-
|
|
37
|
+
await this.io.debug(`Found the following zones ${JSON.stringify(zones)}`);
|
|
38
38
|
candidates = zones.filter((zone) => zone.Name === domainName);
|
|
39
|
-
|
|
39
|
+
await this.io.debug(`Found the following matched name zones ${JSON.stringify(candidates)}`);
|
|
40
40
|
if (props.privateZone) {
|
|
41
41
|
candidates = candidates.filter((zone) => zone.Config && zone.Config.PrivateZone);
|
|
42
42
|
}
|
|
@@ -48,7 +48,7 @@ class HostedZoneContextProviderPlugin {
|
|
|
48
48
|
for (const zone of candidates) {
|
|
49
49
|
const data = await r53.getHostedZone({ Id: zone.Id });
|
|
50
50
|
if (!data.VPCs) {
|
|
51
|
-
|
|
51
|
+
await this.io.debug(`Expected VPC for private zone but no VPC found ${zone.Id}`);
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
54
|
if (data.VPCs.map((vpc) => vpc.VPCId).includes(props.vpcId)) {
|
|
@@ -64,4 +64,4 @@ class HostedZoneContextProviderPlugin {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
exports.HostedZoneContextProviderPlugin = HostedZoneContextProviderPlugin;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hosted-zones.js","sourceRoot":"","sources":["hosted-zones.ts"],"names":[],"mappings":"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","sourcesContent":["import type { HostedZoneContextQuery } from '@aws-cdk/cloud-assembly-schema';\nimport type { HostedZone } from '@aws-sdk/client-route-53';\nimport type { IContextProviderMessages } from '.';\nimport { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';\nimport type { IRoute53Client } from '../api';\nimport { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider';\nimport type { ContextProviderPlugin } from '../api/plugin';\n\nexport class HostedZoneContextProviderPlugin implements ContextProviderPlugin {\n  constructor(private readonly aws: SdkProvider, private readonly io: IContextProviderMessages) {\n  }\n\n  public async getValue(args: HostedZoneContextQuery): Promise<object> {\n    const account = args.account;\n    const region = args.region;\n    if (!this.isHostedZoneQuery(args)) {\n      throw new ContextProviderError(`HostedZoneProvider requires domainName property to be set in ${args}`);\n    }\n    const domainName = args.domainName;\n    await this.io.debug(`Reading hosted zone ${account}:${region}:${domainName}`);\n    const r53 = (await initContextProviderSdk(this.aws, args)).route53();\n    const response = await r53.listHostedZonesByName({ DNSName: domainName });\n    if (!response.HostedZones) {\n      throw new ContextProviderError(`Hosted Zone not found in account ${account}, region ${region}: ${domainName}`);\n    }\n    const candidateZones = await this.filterZones(r53, response.HostedZones, args);\n    if (candidateZones.length !== 1) {\n      const filteProps = `dns:${domainName}, privateZone:${args.privateZone}, vpcId:${args.vpcId}`;\n      throw new ContextProviderError(`Found zones: ${JSON.stringify(candidateZones)} for ${filteProps}, but wanted exactly 1 zone`);\n    }\n\n    return {\n      Id: candidateZones[0].Id,\n      Name: candidateZones[0].Name,\n    };\n  }\n\n  private async filterZones(\n    r53: IRoute53Client,\n    zones: HostedZone[],\n    props: HostedZoneContextQuery,\n  ): Promise<HostedZone[]> {\n    let candidates: HostedZone[] = [];\n    const domainName = props.domainName.endsWith('.') ? props.domainName : `${props.domainName}.`;\n    await this.io.debug(`Found the following zones ${JSON.stringify(zones)}`);\n    candidates = zones.filter((zone) => zone.Name === domainName);\n    await this.io.debug(`Found the following matched name zones ${JSON.stringify(candidates)}`);\n    if (props.privateZone) {\n      candidates = candidates.filter((zone) => zone.Config && zone.Config.PrivateZone);\n    } else {\n      candidates = candidates.filter((zone) => !zone.Config || !zone.Config.PrivateZone);\n    }\n    if (props.vpcId) {\n      const vpcZones: HostedZone[] = [];\n      for (const zone of candidates) {\n        const data = await r53.getHostedZone({ Id: zone.Id });\n        if (!data.VPCs) {\n          await this.io.debug(`Expected VPC for private zone but no VPC found ${zone.Id}`);\n          continue;\n        }\n        if (data.VPCs.map((vpc) => vpc.VPCId).includes(props.vpcId)) {\n          vpcZones.push(zone);\n        }\n      }\n      return vpcZones;\n    }\n    return candidates;\n  }\n\n  private isHostedZoneQuery(props: HostedZoneContextQuery | any): props is HostedZoneContextQuery {\n    return (props as HostedZoneContextQuery).domainName !== undefined;\n  }\n}\n"]}
|