aws-cdk 2.9.0 → 2.13.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/CONTRIBUTING.md +1 -1
- package/README.md +3 -2
- package/bin/cdk.d.ts +1 -3
- package/bin/cdk.js +3 -511
- package/build-info.json +2 -2
- package/lib/api/aws-auth/sdk.d.ts +2 -0
- package/lib/api/aws-auth/sdk.js +4 -1
- package/lib/api/cloudformation-deployments.d.ts +8 -5
- package/lib/api/cloudformation-deployments.js +90 -38
- package/lib/api/cxapp/cloud-executable.js +12 -8
- package/lib/api/evaluate-cloudformation-template.js +34 -2
- package/lib/api/hotswap/appsync-mapping-templates.d.ts +3 -0
- package/lib/api/hotswap/appsync-mapping-templates.js +69 -0
- package/lib/api/hotswap/lambda-functions.js +48 -13
- package/lib/api/hotswap-deployments.js +3 -1
- package/lib/api/toolkit-info.js +5 -5
- package/lib/api/util/placeholders.d.ts +6 -0
- package/lib/api/util/placeholders.js +25 -0
- package/lib/assets.js +2 -1
- package/lib/cdk-toolkit.js +3 -3
- package/lib/cli.d.ts +3 -0
- package/lib/cli.js +545 -0
- package/lib/commands/context.d.ts +0 -16
- package/lib/commands/context.js +2 -20
- package/lib/commands/docs.d.ts +0 -13
- package/lib/commands/docs.js +2 -19
- package/lib/commands/doctor.d.ts +0 -5
- package/lib/commands/doctor.js +2 -9
- package/lib/context-providers/ami.d.ts +1 -1
- package/lib/context-providers/ami.js +3 -3
- package/lib/context-providers/availability-zones.d.ts +1 -1
- package/lib/context-providers/availability-zones.js +3 -3
- package/lib/context-providers/endpoint-service-availability-zones.d.ts +1 -1
- package/lib/context-providers/endpoint-service-availability-zones.js +3 -3
- package/lib/context-providers/hosted-zones.d.ts +1 -1
- package/lib/context-providers/hosted-zones.js +3 -3
- package/lib/context-providers/index.d.ts +6 -0
- package/lib/context-providers/index.js +18 -5
- package/lib/context-providers/keys.d.ts +1 -1
- package/lib/context-providers/keys.js +3 -3
- package/lib/context-providers/load-balancers.d.ts +1 -1
- package/lib/context-providers/load-balancers.js +4 -4
- package/lib/context-providers/security-groups.d.ts +1 -1
- package/lib/context-providers/security-groups.js +3 -3
- package/lib/context-providers/ssm-parameters.d.ts +1 -1
- package/lib/context-providers/ssm-parameters.js +3 -3
- package/lib/context-providers/vpcs.d.ts +1 -1
- package/lib/context-providers/vpcs.js +6 -3
- package/lib/index.d.ts +3 -0
- package/lib/index.js +17 -0
- package/lib/init-templates/v1/app/csharp/cdk.template.json +1 -1
- package/lib/init-templates/v1/app/fsharp/cdk.template.json +1 -1
- package/lib/init-templates/v1/app/javascript/README.md +5 -5
- package/lib/init-templates/v1/app/typescript/README.md +7 -7
- package/lib/init-templates/v1/lib/typescript/README.template.md +4 -4
- package/lib/init-templates/v1/sample-app/csharp/cdk.template.json +1 -1
- package/lib/init-templates/v1/sample-app/fsharp/cdk.template.json +1 -1
- package/lib/init-templates/v1/sample-app/javascript/README.template.md +7 -6
- package/lib/init-templates/v1/sample-app/typescript/README.template.md +9 -9
- package/lib/init-templates/v2/app/csharp/cdk.template.json +1 -1
- package/lib/init-templates/v2/app/fsharp/cdk.template.json +1 -1
- package/lib/init-templates/v2/app/javascript/README.md +5 -5
- package/lib/init-templates/v2/app/typescript/README.md +7 -7
- package/lib/init-templates/v2/lib/typescript/README.template.md +4 -4
- package/lib/init-templates/v2/sample-app/csharp/cdk.template.json +1 -1
- package/lib/init-templates/v2/sample-app/fsharp/cdk.template.json +1 -1
- package/lib/init-templates/v2/sample-app/javascript/README.template.md +5 -5
- package/lib/init-templates/v2/sample-app/typescript/README.template.md +7 -7
- package/lib/plugin.d.ts +15 -1
- package/lib/plugin.js +17 -3
- package/lib/util/asset-publishing.d.ts +1 -1
- package/lib/util/asset-publishing.js +4 -4
- package/npm-shrinkwrap.json +96 -52
- package/package.json +16 -15
- package/test/api/cloud-executable.test.js +57 -32
- package/test/api/cloudformation-deployments.test.js +643 -1
- package/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.d.ts +1 -0
- package/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.js +336 -0
- package/test/api/hotswap/hotswap-deployments.test.js +2 -2
- package/test/api/hotswap/hotswap-test-setup.d.ts +7 -1
- package/test/api/hotswap/hotswap-test-setup.js +22 -3
- package/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.js +59 -2
- package/test/api/hotswap/lambda-functions-hotswap-deployments.test.js +175 -2
- package/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.js +2 -2
- package/test/api/hotswap/lambda-versions-aliases-hotswap-deployments.test.js +2 -2
- package/test/api/hotswap/state-machine-hotswap-deployments.test.js +72 -1
- package/test/api/logs/logs-monitor.test.js +9 -13
- package/test/cdk-docs.test.js +4 -7
- package/test/cdk-doctor.test.js +3 -4
- package/test/context-providers/generic.test.js +7 -6
- package/test/context-providers/vpcs.test.js +132 -1
- package/test/diff-nested-stacks-templates/one-output-one-param-stack.nested.template.json +20 -0
- package/test/diff-nested-stacks-templates/one-resource-one-stack-stack.nested.template.json +19 -0
- package/test/diff-nested-stacks-templates/one-resource-stack.nested.template.json +10 -0
- package/test/diff-nested-stacks-templates/one-resource-two-stacks-stack.nested.template.json +28 -0
- package/test/diff.test.js +215 -96
- package/test/util/mock-sdk.d.ts +9 -1
- package/test/util/mock-sdk.js +13 -3
- package/test/util.js +18 -1
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
# Welcome to your CDK JavaScript project
|
|
1
|
+
# Welcome to your CDK JavaScript project
|
|
2
2
|
|
|
3
3
|
You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`)
|
|
4
4
|
which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
|
|
5
5
|
|
|
6
6
|
The `cdk.json` file tells the CDK Toolkit how to execute your app. The build step is not required when using JavaScript.
|
|
7
7
|
|
|
8
|
-
## Tutorial
|
|
8
|
+
## Tutorial
|
|
9
|
+
|
|
9
10
|
See [this useful workshop](https://cdkworkshop.com/20-typescript.html) on working with the AWS CDK for Typescript projects.
|
|
10
11
|
|
|
11
12
|
## Useful commands
|
|
12
13
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
* `npm run test` perform the jest unit tests
|
|
15
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
16
|
+
* `cdk diff` compare deployed stack with current state
|
|
17
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
# Welcome to your CDK TypeScript project
|
|
1
|
+
# Welcome to your CDK TypeScript project
|
|
2
2
|
|
|
3
3
|
You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`)
|
|
4
4
|
which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
|
|
5
5
|
|
|
6
6
|
The `cdk.json` file tells the CDK Toolkit how to execute your app.
|
|
7
7
|
|
|
8
|
-
## Tutorial
|
|
9
|
-
See [this useful workshop](https://cdkworkshop.com/20-typescript.html) on working with the AWS CDK for Typescript projects.
|
|
8
|
+
## Tutorial
|
|
10
9
|
|
|
10
|
+
See [this useful workshop](https://cdkworkshop.com/20-typescript.html) on working with the AWS CDK for Typescript projects.
|
|
11
11
|
|
|
12
12
|
## Useful commands
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
* `npm run build` compile typescript to js
|
|
15
|
+
* `npm run watch` watch for changes and compile
|
|
16
|
+
* `npm run test` perform the jest unit tests
|
|
17
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
18
|
+
* `cdk diff` compare deployed stack with current state
|
|
19
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Welcome to your CDK JavaScript project
|
|
1
|
+
# Welcome to your CDK JavaScript project
|
|
2
2
|
|
|
3
3
|
This is a blank project for JavaScript development with CDK.
|
|
4
4
|
|
|
@@ -6,7 +6,7 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app. The build ste
|
|
|
6
6
|
|
|
7
7
|
## Useful commands
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
* `npm run test` perform the jest unit tests
|
|
10
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
11
|
+
* `cdk diff` compare deployed stack with current state
|
|
12
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Welcome to your CDK TypeScript project
|
|
1
|
+
# Welcome to your CDK TypeScript project
|
|
2
2
|
|
|
3
3
|
This is a blank project for TypeScript development with CDK.
|
|
4
4
|
|
|
@@ -6,9 +6,9 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app.
|
|
|
6
6
|
|
|
7
7
|
## Useful commands
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
* `npm run build` compile typescript to js
|
|
10
|
+
* `npm run watch` watch for changes and compile
|
|
11
|
+
* `npm run test` perform the jest unit tests
|
|
12
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
13
|
+
* `cdk diff` compare deployed stack with current state
|
|
14
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Welcome to your CDK TypeScript Construct Library project
|
|
1
|
+
# Welcome to your CDK TypeScript Construct Library project
|
|
2
2
|
|
|
3
3
|
You should explore the contents of this project. It demonstrates a CDK Construct Library that includes a construct (`%name.PascalCased%`)
|
|
4
4
|
which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
|
|
@@ -7,6 +7,6 @@ The construct defines an interface (`%name.PascalCased%Props`) to configure the
|
|
|
7
7
|
|
|
8
8
|
## Useful commands
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
* `npm run build` compile typescript to js
|
|
11
|
+
* `npm run watch` watch for changes and compile
|
|
12
|
+
* `npm run test` perform the jest unit tests
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Welcome to your CDK JavaScript project
|
|
1
|
+
# Welcome to your CDK JavaScript project
|
|
2
2
|
|
|
3
3
|
You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`)
|
|
4
4
|
which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
|
|
@@ -7,7 +7,7 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app. The build ste
|
|
|
7
7
|
|
|
8
8
|
## Useful commands
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
* `npm run test` perform the jest unit tests
|
|
11
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
12
|
+
* `cdk diff` compare deployed stack with current state
|
|
13
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Welcome to your CDK TypeScript project
|
|
1
|
+
# Welcome to your CDK TypeScript project
|
|
2
2
|
|
|
3
3
|
You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`)
|
|
4
4
|
which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
|
|
@@ -7,9 +7,9 @@ The `cdk.json` file tells the CDK Toolkit how to execute your app.
|
|
|
7
7
|
|
|
8
8
|
## Useful commands
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
* `npm run build` compile typescript to js
|
|
11
|
+
* `npm run watch` watch for changes and compile
|
|
12
|
+
* `npm run test` perform the jest unit tests
|
|
13
|
+
* `cdk deploy` deploy this stack to your default AWS account/region
|
|
14
|
+
* `cdk diff` compare deployed stack with current state
|
|
15
|
+
* `cdk synth` emits the synthesized CloudFormation template
|
package/lib/plugin.d.ts
CHANGED
|
@@ -69,7 +69,21 @@ export declare class PluginHost {
|
|
|
69
69
|
* This feature is experimental, and only intended to be used internally at Amazon
|
|
70
70
|
* as a trial.
|
|
71
71
|
*
|
|
72
|
+
* After registering with 'my-plugin-name', the provider must be addressed as follows:
|
|
73
|
+
*
|
|
74
|
+
* ```ts
|
|
75
|
+
* const value = ContextProvider.getValue(this, {
|
|
76
|
+
* providerName: 'plugin',
|
|
77
|
+
* props: {
|
|
78
|
+
* pluginName: 'my-plugin-name',
|
|
79
|
+
* myParameter1: 'xyz',
|
|
80
|
+
* },
|
|
81
|
+
* includeEnvironment: true | false,
|
|
82
|
+
* dummyValue: 'what-to-return-on-the-first-pass',
|
|
83
|
+
* })
|
|
84
|
+
* ```
|
|
85
|
+
*
|
|
72
86
|
* @experimental
|
|
73
87
|
*/
|
|
74
|
-
registerContextProviderAlpha(
|
|
88
|
+
registerContextProviderAlpha(pluginProviderName: string, provider: ContextProviderPlugin): void;
|
|
75
89
|
}
|
package/lib/plugin.js
CHANGED
|
@@ -71,15 +71,29 @@ class PluginHost {
|
|
|
71
71
|
* This feature is experimental, and only intended to be used internally at Amazon
|
|
72
72
|
* as a trial.
|
|
73
73
|
*
|
|
74
|
+
* After registering with 'my-plugin-name', the provider must be addressed as follows:
|
|
75
|
+
*
|
|
76
|
+
* ```ts
|
|
77
|
+
* const value = ContextProvider.getValue(this, {
|
|
78
|
+
* providerName: 'plugin',
|
|
79
|
+
* props: {
|
|
80
|
+
* pluginName: 'my-plugin-name',
|
|
81
|
+
* myParameter1: 'xyz',
|
|
82
|
+
* },
|
|
83
|
+
* includeEnvironment: true | false,
|
|
84
|
+
* dummyValue: 'what-to-return-on-the-first-pass',
|
|
85
|
+
* })
|
|
86
|
+
* ```
|
|
87
|
+
*
|
|
74
88
|
* @experimental
|
|
75
89
|
*/
|
|
76
|
-
registerContextProviderAlpha(
|
|
90
|
+
registerContextProviderAlpha(pluginProviderName, provider) {
|
|
77
91
|
if (!provider_1.isContextProviderPlugin(provider)) {
|
|
78
92
|
throw new Error(`Object you gave me does not look like a ContextProviderPlugin: ${util_1.inspect(provider)}`);
|
|
79
93
|
}
|
|
80
|
-
context_providers_1.
|
|
94
|
+
context_providers_1.registerPluginContextProvider(pluginProviderName, provider);
|
|
81
95
|
}
|
|
82
96
|
}
|
|
83
97
|
exports.PluginHost = PluginHost;
|
|
84
98
|
PluginHost.instance = new PluginHost();
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtCQUErQjtBQUMvQiwrQkFBK0I7QUFHL0IsMkRBQW9FO0FBQ3BFLDJEQUE4RjtBQUM5Rix1Q0FBa0M7QUFpQ2xDOzs7R0FHRztBQUNILE1BQWEsVUFBVTtJQVNyQjtRQU5BOzs7V0FHRztRQUNhLDhCQUF5QixHQUFHLElBQUksS0FBSyxFQUE0QixDQUFDO1FBR2hGLElBQUksVUFBVSxDQUFDLFFBQVEsSUFBSSxVQUFVLENBQUMsUUFBUSxLQUFLLElBQUksRUFBRTtZQUN2RCxNQUFNLElBQUksS0FBSyxDQUFDLGlGQUFpRixDQUFDLENBQUM7U0FDcEc7SUFDSCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLElBQUksQ0FBQyxVQUFrQjtRQUM1QixJQUFJO1lBQ0YsMERBQTBEO1lBQzFELE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNuQyxtQkFBbUI7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRTtnQkFDckIsZUFBSyxDQUFDLFVBQVUsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMseURBQXlELENBQUMsQ0FBQztnQkFDbEcsTUFBTSxJQUFJLEtBQUssQ0FBQyxVQUFVLFVBQVUsbUNBQW1DLENBQUMsQ0FBQzthQUMxRTtZQUNELElBQUksTUFBTSxDQUFDLElBQUksRUFBRTtnQkFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUFFO1NBQ3ZEO1FBQUMsT0FBTyxDQUFDLEVBQUU7WUFDVixlQUFLLENBQUMsa0JBQWtCLEtBQUssQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7WUFDL0QsTUFBTSxJQUFJLEtBQUssQ0FBQywyQkFBMkIsVUFBVSxFQUFFLENBQUMsQ0FBQztTQUMxRDtRQUVELFNBQVMsUUFBUSxDQUFDLENBQU07WUFDdEIsT0FBTyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsQ0FBQyxPQUFPLEtBQUssR0FBRyxDQUFDO1FBQ3hDLENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGdDQUFnQyxDQUFDLE1BQWdDO1FBQ3RFLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BK0JHO0lBQ0ksNEJBQTRCLENBQUMsa0JBQTBCLEVBQUUsUUFBK0I7UUFDN0YsSUFBSSxDQUFDLGtDQUF1QixDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ3RDLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLGNBQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDeEc7UUFDRCxpREFBNkIsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUM5RCxDQUFDOztBQXRGSCxnQ0F1RkM7QUF0RmUsbUJBQVEsR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW5zcGVjdCB9IGZyb20gJ3V0aWwnO1xuaW1wb3J0ICogYXMgY2hhbGsgZnJvbSAnY2hhbGsnO1xuXG5pbXBvcnQgeyBDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2UgfSBmcm9tICcuL2FwaS9hd3MtYXV0aC9jcmVkZW50aWFscyc7XG5pbXBvcnQgeyByZWdpc3RlclBsdWdpbkNvbnRleHRQcm92aWRlciB9IGZyb20gJy4vY29udGV4dC1wcm92aWRlcnMnO1xuaW1wb3J0IHsgQ29udGV4dFByb3ZpZGVyUGx1Z2luLCBpc0NvbnRleHRQcm92aWRlclBsdWdpbiB9IGZyb20gJy4vY29udGV4dC1wcm92aWRlcnMvcHJvdmlkZXInO1xuaW1wb3J0IHsgZXJyb3IgfSBmcm9tICcuL2xvZ2dpbmcnO1xuXG4vKipcbiAqIFRoZSBiYXNpYyBjb250cmFjdCBmb3IgcGx1Zy1pbnMgdG8gYWRoZXJlIHRvOjpcbiAqXG4gKiAgIGltcG9ydCB7IFBsdWdpbiwgUGx1Z2luSG9zdCB9IGZyb20gJ2F3cy1jZGsnO1xuICogICBpbXBvcnQgeyBDdXN0b21DcmVkZW50aWFsUHJvdmlkZXJTb3VyY2UgfSBmcm9tICcuL2N1c3RvbS1jcmVkZW50aWFsLXByb3ZpZGVyLXNvdXJjZSc7XG4gKlxuICogICBleHBvcnQgZGVmYXVsdCBjbGFzcyBGb29DREtQbHVnSW4gaW1wbGVtZW50cyBQbHVnaW5Ib3N0IHtcbiAqICAgICBwdWJsaWMgcmVhZG9ubHkgdmVyc2lvbiA9ICcxJztcbiAqXG4gKiAgICAgcHVibGljIGluaXQoaG9zdDogUGx1Z2luSG9zdCkge1xuICogICAgIGhvc3QucmVnaXN0ZXJDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2UobmV3IEN1c3RvbUNyZWRlbnRpYWxQcm92aWRlclNvdXJjZSgpKTtcbiAqICAgICB9XG4gKiAgIH1cbiAqXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgUGx1Z2luIHtcbiAgLyoqXG4gICAqIFRoZSB2ZXJzaW9uIG9mIHRoZSBwbHVnLWluIGludGVyZmFjZSB1c2VkIGJ5IHRoZSBwbHVnLWluLiBUaGlzIHdpbGwgYmUgdXNlZCBieVxuICAgKiB0aGUgcGx1Zy1pbiBob3N0IHRvIGhhbmRsZSB2ZXJzaW9uIGNoYW5nZXMuXG4gICAqL1xuICB2ZXJzaW9uOiAnMSc7XG5cbiAgLyoqXG4gICAqIFdoZW4gZGVmaW5lZCwgdGhpcyBmdW5jdGlvbiBpcyBpbnZva2VkIHJpZ2h0IGFmdGVyIHRoZSBwbHVnLWluIGhhcyBiZWVuIGxvYWRlZCxcbiAgICogc28gdGhhdCB0aGUgcGx1Zy1pbiBpcyBhYmxlIHRvIGluaXRpYWxpemUgaXRzZWxmLiBJdCBtYXkgY2FsbCBtZXRob2RzIG9mIHRoZVxuICAgKiBgYFBsdWdpbkhvc3RgYCBpbnN0YW5jZSBpdCByZWNlaXZlcyB0byByZWdpc3RlciBuZXcgYGBDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2VgYFxuICAgKiBpbnN0YW5jZXMuXG4gICAqL1xuICBpbml0PzogKGhvc3Q6IFBsdWdpbkhvc3QpID0+IHZvaWQ7XG59XG5cbi8qKlxuICogQSB1dGlsaXR5IHRvIG1hbmFnZSBwbHVnLWlucy5cbiAqXG4gKi9cbmV4cG9ydCBjbGFzcyBQbHVnaW5Ib3N0IHtcbiAgcHVibGljIHN0YXRpYyBpbnN0YW5jZSA9IG5ldyBQbHVnaW5Ib3N0KCk7XG5cbiAgLyoqXG4gICAqIEFjY2VzcyB0aGUgY3VycmVudGx5IHJlZ2lzdGVyZWQgQ3JlZGVudGlhbFByb3ZpZGVyU291cmNlcy4gTmV3IHNvdXJjZXMgY2FuXG4gICAqIGJlIHJlZ2lzdGVyZWQgdXNpbmcgdGhlICtyZWdpc3RlckNyZWRlbnRpYWxQcm92aWRlclNvdXJjZSsgbWV0aG9kLlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IGNyZWRlbnRpYWxQcm92aWRlclNvdXJjZXMgPSBuZXcgQXJyYXk8Q3JlZGVudGlhbFByb3ZpZGVyU291cmNlPigpO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIGlmIChQbHVnaW5Ib3N0Lmluc3RhbmNlICYmIFBsdWdpbkhvc3QuaW5zdGFuY2UgIT09IHRoaXMpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignTmV3IGluc3RhbmNlcyBvZiBQbHVnaW5Ib3N0IG11c3Qgbm90IGJlIGJ1aWx0LiBVc2UgUGx1Z2luSG9zdC5pbnN0YW5jZSBpbnN0ZWFkIScpO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBMb2FkcyBhIHBsdWctaW4gaW50byB0aGlzIFBsdWdpbkhvc3QuXG4gICAqXG4gICAqIEBwYXJhbSBtb2R1bGVTcGVjIHRoZSBzcGVjaWZpY2F0aW9uIChwYXRoIG9yIG5hbWUpIG9mIHRoZSBwbHVnLWluIG1vZHVsZSB0byBiZSBsb2FkZWQuXG4gICAqL1xuICBwdWJsaWMgbG9hZChtb2R1bGVTcGVjOiBzdHJpbmcpIHtcbiAgICB0cnkge1xuICAgICAgLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLXJlcXVpcmUtaW1wb3J0cyAqL1xuICAgICAgY29uc3QgcGx1Z2luID0gcmVxdWlyZShtb2R1bGVTcGVjKTtcbiAgICAgIC8qIGVzbGludC1lbmFibGUgKi9cbiAgICAgIGlmICghaXNQbHVnaW4ocGx1Z2luKSkge1xuICAgICAgICBlcnJvcihgTW9kdWxlICR7Y2hhbGsuZ3JlZW4obW9kdWxlU3BlYyl9IGlzIG5vdCBhIHZhbGlkIHBsdWctaW4sIG9yIGhhcyBhbiB1bnN1cHBvcnRlZCB2ZXJzaW9uLmApO1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYE1vZHVsZSAke21vZHVsZVNwZWN9IGRvZXMgbm90IGRlZmluZSBhIHZhbGlkIHBsdWctaW4uYCk7XG4gICAgICB9XG4gICAgICBpZiAocGx1Z2luLmluaXQpIHsgcGx1Z2luLmluaXQoUGx1Z2luSG9zdC5pbnN0YW5jZSk7IH1cbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICBlcnJvcihgVW5hYmxlIHRvIGxvYWQgJHtjaGFsay5ncmVlbihtb2R1bGVTcGVjKX06ICR7ZS5zdGFja31gKTtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgVW5hYmxlIHRvIGxvYWQgcGx1Zy1pbjogJHttb2R1bGVTcGVjfWApO1xuICAgIH1cblxuICAgIGZ1bmN0aW9uIGlzUGx1Z2luKHg6IGFueSk6IHggaXMgUGx1Z2luIHtcbiAgICAgIHJldHVybiB4ICE9IG51bGwgJiYgeC52ZXJzaW9uID09PSAnMSc7XG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIEFsbG93cyBwbHVnLWlucyB0byByZWdpc3RlciBuZXcgQ3JlZGVudGlhbFByb3ZpZGVyU291cmNlcy5cbiAgICpcbiAgICogQHBhcmFtIHNvdXJjZSBhIG5ldyBDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2UgdG8gcmVnaXN0ZXIuXG4gICAqL1xuICBwdWJsaWMgcmVnaXN0ZXJDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2Uoc291cmNlOiBDcmVkZW50aWFsUHJvdmlkZXJTb3VyY2UpIHtcbiAgICB0aGlzLmNyZWRlbnRpYWxQcm92aWRlclNvdXJjZXMucHVzaChzb3VyY2UpO1xuICB9XG5cbiAgLyoqXG4gICAqIChFWFBFUklNRU5UQUwpIEFsbG93IHBsdWdpbnMgdG8gcmVnaXN0ZXIgY29udGV4dCBwcm92aWRlcnNcbiAgICpcbiAgICogQ29udGV4dCBwcm92aWRlcnMgYXJlIG9iamVjdHMgd2l0aCB0aGUgZm9sbG93aW5nIG1ldGhvZDpcbiAgICpcbiAgICogYGBgdHNcbiAgICogICBnZXRWYWx1ZShhcmdzOiB7W2tleTogc3RyaW5nXTogYW55fSk6IFByb21pc2U8YW55PjtcbiAgICogYGBgXG4gICAqXG4gICAqIEN1cnJlbnRseSwgdGhleSBjYW5ub3QgcmV1c2UgdGhlIENESydzIGF1dGhlbnRpY2F0aW9uIG1lY2hhbmlzbXMsIHNvIHRoZXlcbiAgICogbXVzdCBiZSBwcmVwYXJlZCB0byBlaXRoZXIgbm90IG1ha2UgQVdTIGNhbGxzIG9yIHVzZSB0aGVpciBvd24gc291cmNlIG9mXG4gICAqIEFXUyBjcmVkZW50aWFscy5cbiAgICpcbiAgICogVGhpcyBmZWF0dXJlIGlzIGV4cGVyaW1lbnRhbCwgYW5kIG9ubHkgaW50ZW5kZWQgdG8gYmUgdXNlZCBpbnRlcm5hbGx5IGF0IEFtYXpvblxuICAgKiBhcyBhIHRyaWFsLlxuICAgKlxuICAgKiBBZnRlciByZWdpc3RlcmluZyB3aXRoICdteS1wbHVnaW4tbmFtZScsIHRoZSBwcm92aWRlciBtdXN0IGJlIGFkZHJlc3NlZCBhcyBmb2xsb3dzOlxuICAgKlxuICAgKiBgYGB0c1xuICAgKiBjb25zdCB2YWx1ZSA9IENvbnRleHRQcm92aWRlci5nZXRWYWx1ZSh0aGlzLCB7XG4gICAqICAgcHJvdmlkZXJOYW1lOiAncGx1Z2luJyxcbiAgICogICBwcm9wczoge1xuICAgKiAgICAgcGx1Z2luTmFtZTogJ215LXBsdWdpbi1uYW1lJyxcbiAgICogICAgIG15UGFyYW1ldGVyMTogJ3h5eicsXG4gICAqICAgfSxcbiAgICogICBpbmNsdWRlRW52aXJvbm1lbnQ6IHRydWUgfCBmYWxzZSxcbiAgICogICBkdW1teVZhbHVlOiAnd2hhdC10by1yZXR1cm4tb24tdGhlLWZpcnN0LXBhc3MnLFxuICAgKiB9KVxuICAgKiBgYGBcbiAgICpcbiAgICogQGV4cGVyaW1lbnRhbFxuICAgKi9cbiAgcHVibGljIHJlZ2lzdGVyQ29udGV4dFByb3ZpZGVyQWxwaGEocGx1Z2luUHJvdmlkZXJOYW1lOiBzdHJpbmcsIHByb3ZpZGVyOiBDb250ZXh0UHJvdmlkZXJQbHVnaW4pIHtcbiAgICBpZiAoIWlzQ29udGV4dFByb3ZpZGVyUGx1Z2luKHByb3ZpZGVyKSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKGBPYmplY3QgeW91IGdhdmUgbWUgZG9lcyBub3QgbG9vayBsaWtlIGEgQ29udGV4dFByb3ZpZGVyUGx1Z2luOiAke2luc3BlY3QocHJvdmlkZXIpfWApO1xuICAgIH1cbiAgICByZWdpc3RlclBsdWdpbkNvbnRleHRQcm92aWRlcihwbHVnaW5Qcm92aWRlck5hbWUsIHByb3ZpZGVyKTtcbiAgfVxufVxuIl19
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.publishAssets = void 0;
|
|
4
4
|
const cxapi = require("@aws-cdk/cx-api");
|
|
5
5
|
const cdk_assets = require("cdk-assets");
|
|
6
|
-
const
|
|
6
|
+
const credentials_1 = require("../api/aws-auth/credentials");
|
|
7
7
|
const logging_1 = require("../logging");
|
|
8
8
|
/**
|
|
9
9
|
* Use cdk-assets to publish all assets in the given manifest.
|
|
@@ -42,7 +42,7 @@ class PublishingAws {
|
|
|
42
42
|
}
|
|
43
43
|
async discoverPartition() {
|
|
44
44
|
var _a;
|
|
45
|
-
return (_a = (await this.aws.baseCredentialsPartition(this.targetEnv,
|
|
45
|
+
return (_a = (await this.aws.baseCredentialsPartition(this.targetEnv, credentials_1.Mode.ForWriting))) !== null && _a !== void 0 ? _a : 'aws';
|
|
46
46
|
}
|
|
47
47
|
async discoverDefaultRegion() {
|
|
48
48
|
return this.targetEnv.region;
|
|
@@ -84,7 +84,7 @@ class PublishingAws {
|
|
|
84
84
|
if (maybeSdk) {
|
|
85
85
|
return maybeSdk;
|
|
86
86
|
}
|
|
87
|
-
const sdk = (await this.aws.forEnvironment(env,
|
|
87
|
+
const sdk = (await this.aws.forEnvironment(env, credentials_1.Mode.ForWriting, {
|
|
88
88
|
assumeRoleArn: options.assumeRoleArn,
|
|
89
89
|
assumeRoleExternalId: options.assumeRoleExternalId,
|
|
90
90
|
})).sdk;
|
|
@@ -108,4 +108,4 @@ class PublishingProgressListener {
|
|
|
108
108
|
EVENT_TO_LOGGER[type](`[${event.percentComplete}%] ${type}: ${event.message}`);
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"asset-publishing.js","sourceRoot":"","sources":["asset-publishing.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cxapi from '@aws-cdk/cx-api';\nimport * as AWS from 'aws-sdk';\nimport * as cdk_assets from 'cdk-assets';\nimport { Mode } from '../api/aws-auth/credentials';\nimport { ISDK } from '../api/aws-auth/sdk';\nimport { SdkProvider } from '../api/aws-auth/sdk-provider';\nimport { debug, error, print } from '../logging';\n\n/**\n * Use cdk-assets to publish all assets in the given manifest.\n */\nexport async function publishAssets(manifest: cdk_assets.AssetManifest, sdk: SdkProvider, targetEnv: cxapi.Environment) {\n  // This shouldn't really happen (it's a programming error), but we don't have\n  // the types here to guide us. Do an runtime validation to be super super sure.\n  if (targetEnv.account === undefined || targetEnv.account === cxapi.UNKNOWN_ACCOUNT\n    || targetEnv.region === undefined || targetEnv.account === cxapi.UNKNOWN_REGION) {\n    throw new Error(`Asset publishing requires resolved account and region, got ${JSON.stringify(targetEnv)}`);\n  }\n\n  const publisher = new cdk_assets.AssetPublishing(manifest, {\n    aws: new PublishingAws(sdk, targetEnv),\n    progressListener: new PublishingProgressListener(),\n    throwOnError: false,\n  });\n  await publisher.publish();\n  if (publisher.hasFailures) {\n    throw new Error('Failed to publish one or more assets. See the error messages above for more information.');\n  }\n}\n\nclass PublishingAws implements cdk_assets.IAws {\n  private sdkCache: Map<String, ISDK> = new Map();\n\n  constructor(\n    /**\n     * The base SDK to work with\n     */\n    private readonly aws: SdkProvider,\n\n    /**\n     * Environment where the stack we're deploying is going\n     */\n    private readonly targetEnv: cxapi.Environment) {\n  }\n\n  public async discoverPartition(): Promise<string> {\n    return (await this.aws.baseCredentialsPartition(this.targetEnv, Mode.ForWriting)) ?? 'aws';\n  }\n\n  public async discoverDefaultRegion(): Promise<string> {\n    return this.targetEnv.region;\n  }\n\n  public async discoverCurrentAccount(): Promise<cdk_assets.Account> {\n    const account = await this.aws.defaultAccount();\n    return account ?? {\n      accountId: '<unknown account>',\n      partition: 'aws',\n    };\n  }\n\n  public async discoverTargetAccount(options: cdk_assets.ClientOptions): Promise<cdk_assets.Account> {\n    return (await this.sdk(options)).currentAccount();\n  }\n\n  public async s3Client(options: cdk_assets.ClientOptions): Promise<AWS.S3> {\n    return (await this.sdk(options)).s3();\n  }\n\n  public async ecrClient(options: cdk_assets.ClientOptions): Promise<AWS.ECR> {\n    return (await this.sdk(options)).ecr();\n  }\n\n  public async secretsManagerClient(options: cdk_assets.ClientOptions): Promise<AWS.SecretsManager> {\n    return (await this.sdk(options)).secretsManager();\n  }\n\n  /**\n   * Get an SDK appropriate for the given client options\n   */\n  private async sdk(options: cdk_assets.ClientOptions): Promise<ISDK> {\n    const env = {\n      ...this.targetEnv,\n      region: options.region ?? this.targetEnv.region, // Default: same region as the stack\n    };\n\n    const cacheKey = JSON.stringify({\n      env, // region, name, account\n      assumeRuleArn: options.assumeRoleArn,\n      assumeRoleExternalId: options.assumeRoleExternalId,\n    });\n\n    const maybeSdk = this.sdkCache.get(cacheKey);\n    if (maybeSdk) {\n      return maybeSdk;\n    }\n\n    const sdk = (await this.aws.forEnvironment(env, Mode.ForWriting, {\n      assumeRoleArn: options.assumeRoleArn,\n      assumeRoleExternalId: options.assumeRoleExternalId,\n    })).sdk;\n    this.sdkCache.set(cacheKey, sdk);\n\n    return sdk;\n  }\n}\n\nconst EVENT_TO_LOGGER: Record<cdk_assets.EventType, (x: string) => void> = {\n  build: debug,\n  cached: debug,\n  check: debug,\n  debug,\n  fail: error,\n  found: debug,\n  start: print,\n  success: print,\n  upload: debug,\n};\n\nclass PublishingProgressListener implements cdk_assets.IPublishProgressListener {\n  public onPublishEvent(type: cdk_assets.EventType, event: cdk_assets.IPublishProgress): void {\n    EVENT_TO_LOGGER[type](`[${event.percentComplete}%] ${type}: ${event.message}`);\n  }\n}\n"]}
|