cdk-assets 2.0.0 → 2.4.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/LICENSE +1 -1
- package/NOTICE +1 -1
- package/lib/aws.d.ts +2 -0
- package/lib/aws.js +12 -1
- package/lib/private/handlers/files.js +114 -20
- package/lib/publishing.js +7 -6
- package/npm-shrinkwrap.json +7 -7
- package/package.json +7 -7
package/LICENSE
CHANGED
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
same "printed page" as the copyright notice for easier
|
|
187
187
|
identification within third-party archives.
|
|
188
188
|
|
|
189
|
-
Copyright 2018-
|
|
189
|
+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
190
190
|
|
|
191
191
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
192
|
you may not use this file except in compliance with the License.
|
package/NOTICE
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
AWS Cloud Development Kit (AWS CDK)
|
|
2
|
-
Copyright 2018-
|
|
2
|
+
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
package/lib/aws.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export interface IAws {
|
|
|
5
5
|
discoverPartition(): Promise<string>;
|
|
6
6
|
discoverDefaultRegion(): Promise<string>;
|
|
7
7
|
discoverCurrentAccount(): Promise<Account>;
|
|
8
|
+
discoverTargetAccount(options: ClientOptions): Promise<Account>;
|
|
8
9
|
s3Client(options: ClientOptions): Promise<AWS.S3>;
|
|
9
10
|
ecrClient(options: ClientOptions): Promise<AWS.ECR>;
|
|
10
11
|
secretsManagerClient(options: ClientOptions): Promise<AWS.SecretsManager>;
|
|
@@ -43,6 +44,7 @@ export declare class DefaultAwsClient implements IAws {
|
|
|
43
44
|
discoverPartition(): Promise<string>;
|
|
44
45
|
discoverDefaultRegion(): Promise<string>;
|
|
45
46
|
discoverCurrentAccount(): Promise<Account>;
|
|
47
|
+
discoverTargetAccount(options: ClientOptions): Promise<Account>;
|
|
46
48
|
private awsOptions;
|
|
47
49
|
/**
|
|
48
50
|
* Explicit manual AssumeRole call
|
package/lib/aws.js
CHANGED
|
@@ -47,6 +47,17 @@ class DefaultAwsClient {
|
|
|
47
47
|
}
|
|
48
48
|
return this.account;
|
|
49
49
|
}
|
|
50
|
+
async discoverTargetAccount(options) {
|
|
51
|
+
const sts = new this.AWS.STS(await this.awsOptions(options));
|
|
52
|
+
const response = await sts.getCallerIdentity().promise();
|
|
53
|
+
if (!response.Account || !response.Arn) {
|
|
54
|
+
throw new Error(`Unrecognized reponse from STS: '${JSON.stringify(response)}'`);
|
|
55
|
+
}
|
|
56
|
+
return {
|
|
57
|
+
accountId: response.Account,
|
|
58
|
+
partition: response.Arn.split(':')[1],
|
|
59
|
+
};
|
|
60
|
+
}
|
|
50
61
|
async awsOptions(options) {
|
|
51
62
|
let credentials;
|
|
52
63
|
if (options.assumeRoleArn) {
|
|
@@ -89,4 +100,4 @@ exports.DefaultAwsClient = DefaultAwsClient;
|
|
|
89
100
|
function safeUsername() {
|
|
90
101
|
return os.userInfo().username.replace(/[^\w+=,.@-]/g, '@');
|
|
91
102
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"aws.js","sourceRoot":"","sources":["aws.ts"],"names":[],"mappings":"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","sourcesContent":["import * as os from 'os';\n\n/**\n * AWS SDK operations required by Asset Publishing\n */\nexport interface IAws {\n  discoverPartition(): Promise<string>;\n  discoverDefaultRegion(): Promise<string>;\n  discoverCurrentAccount(): Promise<Account>;\n\n  s3Client(options: ClientOptions): Promise<AWS.S3>;\n  ecrClient(options: ClientOptions): Promise<AWS.ECR>;\n  secretsManagerClient(options: ClientOptions): Promise<AWS.SecretsManager>;\n}\n\nexport interface ClientOptions {\n  region?: string;\n  assumeRoleArn?: string;\n  assumeRoleExternalId?: string;\n}\n\n/**\n * An AWS account\n *\n * An AWS account always exists in only one partition. Usually we don't care about\n * the partition, but when we need to form ARNs we do.\n */\nexport interface Account {\n  /**\n   * The account number\n   */\n  readonly accountId: string;\n\n  /**\n   * The partition ('aws' or 'aws-cn' or otherwise)\n   */\n  readonly partition: string;\n}\n\n/**\n * AWS client using the AWS SDK for JS with no special configuration\n */\nexport class DefaultAwsClient implements IAws {\n  private readonly AWS: typeof import('aws-sdk');\n  private account?: Account;\n\n  constructor(profile?: string) {\n    // Force AWS SDK to look in ~/.aws/credentials and potentially use the configured profile.\n    process.env.AWS_SDK_LOAD_CONFIG = '1';\n    process.env.AWS_STS_REGIONAL_ENDPOINTS = 'regional';\n    process.env.AWS_NODEJS_CONNECTION_REUSE_ENABLED = '1';\n    if (profile) {\n      process.env.AWS_PROFILE = profile;\n    }\n\n    // We need to set the environment before we load this library for the first time.\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    this.AWS = require('aws-sdk');\n  }\n\n  public async s3Client(options: ClientOptions) {\n    return new this.AWS.S3(await this.awsOptions(options));\n  }\n\n  public async ecrClient(options: ClientOptions) {\n    return new this.AWS.ECR(await this.awsOptions(options));\n  }\n\n  public async secretsManagerClient(options: ClientOptions) {\n    return new this.AWS.SecretsManager(await this.awsOptions(options));\n  }\n\n  public async discoverPartition(): Promise<string> {\n    return (await this.discoverCurrentAccount()).partition;\n  }\n\n  public async discoverDefaultRegion(): Promise<string> {\n    return this.AWS.config.region || 'us-east-1';\n  }\n\n  public async discoverCurrentAccount(): Promise<Account> {\n    if (this.account === undefined) {\n      const sts = new this.AWS.STS();\n      const response = await sts.getCallerIdentity().promise();\n      if (!response.Account || !response.Arn) {\n        throw new Error(`Unrecognized reponse from STS: '${JSON.stringify(response)}'`);\n      }\n      this.account = {\n        accountId: response.Account!,\n        partition: response.Arn!.split(':')[1],\n      };\n    }\n\n    return this.account;\n  }\n\n  private async awsOptions(options: ClientOptions) {\n    let credentials;\n\n    if (options.assumeRoleArn) {\n      credentials = await this.assumeRole(options.region, options.assumeRoleArn, options.assumeRoleExternalId);\n    }\n\n    return {\n      region: options.region,\n      customUserAgent: 'cdk-assets',\n      credentials,\n    };\n  }\n\n  /**\n   * Explicit manual AssumeRole call\n   *\n   * Necessary since I can't seem to get the built-in support for ChainableTemporaryCredentials to work.\n   *\n   * It needs an explicit configuration of `masterCredentials`, we need to put\n   * a `DefaultCredentialProverChain()` in there but that is not possible.\n   */\n  private async assumeRole(region: string | undefined, roleArn: string, externalId?: string): Promise<AWS.Credentials> {\n    return new this.AWS.ChainableTemporaryCredentials({\n      params: {\n        RoleArn: roleArn,\n        ExternalId: externalId,\n        RoleSessionName: `cdk-assets-${safeUsername()}`,\n      },\n      stsConfig: {\n        region,\n        customUserAgent: 'cdk-assets',\n      },\n    });\n  }\n}\n\n/**\n * Return the username with characters invalid for a RoleSessionName removed\n *\n * @see https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html#API_AssumeRole_RequestParameters\n */\nfunction safeUsername() {\n  return os.userInfo().username.replace(/[^\\w+=,.@-]/g, '@');\n}\n\n"]}
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"aws.js","sourceRoot":"","sources":["aws.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAwCzB;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAY,OAAgB;QAC1B,0FAA0F;QAC1F,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,UAAU,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,GAAG,CAAC;QACtD,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;SACnC;QAED,iFAAiF;QACjF,iEAAiE;QACjE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,OAAsB;QAC1C,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,OAAsB;QAC3C,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,OAAsB;QACtD,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,OAAO,CAAC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,SAAS,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,WAAW,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,sBAAsB;QACjC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9B,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aACjF;YACD,IAAI,CAAC,OAAO,GAAG;gBACb,SAAS,EAAE,QAAQ,CAAC,OAAQ;gBAC5B,SAAS,EAAE,QAAQ,CAAC,GAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACvC,CAAC;SACH;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,OAAsB;QACvD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACjF;QACD,OAAO;YACL,SAAS,EAAE,QAAQ,CAAC,OAAQ;YAC5B,SAAS,EAAE,QAAQ,CAAC,GAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACvC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAsB;QAC7C,IAAI,WAAW,CAAC;QAEhB,IAAI,OAAO,CAAC,aAAa,EAAE;YACzB,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;SAC1G;QAED,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,eAAe,EAAE,YAAY;YAC7B,WAAW;SACZ,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,UAAU,CAAC,MAA0B,EAAE,OAAe,EAAE,UAAmB;QACvF,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC;YAChD,MAAM,EAAE;gBACN,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,UAAU;gBACtB,eAAe,EAAE,cAAc,YAAY,EAAE,EAAE;aAChD;YACD,SAAS,EAAE;gBACT,MAAM;gBACN,eAAe,EAAE,YAAY;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;CACF;AArGD,4CAqGC;AAED;;;;GAIG;AACH,SAAS,YAAY;IACnB,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC","sourcesContent":["import * as os from 'os';\n\n/**\n * AWS SDK operations required by Asset Publishing\n */\nexport interface IAws {\n  discoverPartition(): Promise<string>;\n  discoverDefaultRegion(): Promise<string>;\n  discoverCurrentAccount(): Promise<Account>;\n\n  discoverTargetAccount(options: ClientOptions): Promise<Account>;\n  s3Client(options: ClientOptions): Promise<AWS.S3>;\n  ecrClient(options: ClientOptions): Promise<AWS.ECR>;\n  secretsManagerClient(options: ClientOptions): Promise<AWS.SecretsManager>;\n}\n\nexport interface ClientOptions {\n  region?: string;\n  assumeRoleArn?: string;\n  assumeRoleExternalId?: string;\n}\n\n/**\n * An AWS account\n *\n * An AWS account always exists in only one partition. Usually we don't care about\n * the partition, but when we need to form ARNs we do.\n */\nexport interface Account {\n  /**\n   * The account number\n   */\n  readonly accountId: string;\n\n  /**\n   * The partition ('aws' or 'aws-cn' or otherwise)\n   */\n  readonly partition: string;\n}\n\n/**\n * AWS client using the AWS SDK for JS with no special configuration\n */\nexport class DefaultAwsClient implements IAws {\n  private readonly AWS: typeof import('aws-sdk');\n  private account?: Account;\n\n  constructor(profile?: string) {\n    // Force AWS SDK to look in ~/.aws/credentials and potentially use the configured profile.\n    process.env.AWS_SDK_LOAD_CONFIG = '1';\n    process.env.AWS_STS_REGIONAL_ENDPOINTS = 'regional';\n    process.env.AWS_NODEJS_CONNECTION_REUSE_ENABLED = '1';\n    if (profile) {\n      process.env.AWS_PROFILE = profile;\n    }\n\n    // We need to set the environment before we load this library for the first time.\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    this.AWS = require('aws-sdk');\n  }\n\n  public async s3Client(options: ClientOptions) {\n    return new this.AWS.S3(await this.awsOptions(options));\n  }\n\n  public async ecrClient(options: ClientOptions) {\n    return new this.AWS.ECR(await this.awsOptions(options));\n  }\n\n  public async secretsManagerClient(options: ClientOptions) {\n    return new this.AWS.SecretsManager(await this.awsOptions(options));\n  }\n\n  public async discoverPartition(): Promise<string> {\n    return (await this.discoverCurrentAccount()).partition;\n  }\n\n  public async discoverDefaultRegion(): Promise<string> {\n    return this.AWS.config.region || 'us-east-1';\n  }\n\n  public async discoverCurrentAccount(): Promise<Account> {\n    if (this.account === undefined) {\n      const sts = new this.AWS.STS();\n      const response = await sts.getCallerIdentity().promise();\n      if (!response.Account || !response.Arn) {\n        throw new Error(`Unrecognized reponse from STS: '${JSON.stringify(response)}'`);\n      }\n      this.account = {\n        accountId: response.Account!,\n        partition: response.Arn!.split(':')[1],\n      };\n    }\n\n    return this.account;\n  }\n\n  public async discoverTargetAccount(options: ClientOptions): Promise<Account> {\n    const sts = new this.AWS.STS(await this.awsOptions(options));\n    const response = await sts.getCallerIdentity().promise();\n    if (!response.Account || !response.Arn) {\n      throw new Error(`Unrecognized reponse from STS: '${JSON.stringify(response)}'`);\n    }\n    return {\n      accountId: response.Account!,\n      partition: response.Arn!.split(':')[1],\n    };\n  }\n\n  private async awsOptions(options: ClientOptions) {\n    let credentials;\n\n    if (options.assumeRoleArn) {\n      credentials = await this.assumeRole(options.region, options.assumeRoleArn, options.assumeRoleExternalId);\n    }\n\n    return {\n      region: options.region,\n      customUserAgent: 'cdk-assets',\n      credentials,\n    };\n  }\n\n  /**\n   * Explicit manual AssumeRole call\n   *\n   * Necessary since I can't seem to get the built-in support for ChainableTemporaryCredentials to work.\n   *\n   * It needs an explicit configuration of `masterCredentials`, we need to put\n   * a `DefaultCredentialProverChain()` in there but that is not possible.\n   */\n  private async assumeRole(region: string | undefined, roleArn: string, externalId?: string): Promise<AWS.Credentials> {\n    return new this.AWS.ChainableTemporaryCredentials({\n      params: {\n        RoleArn: roleArn,\n        ExternalId: externalId,\n        RoleSessionName: `cdk-assets-${safeUsername()}`,\n      },\n      stsConfig: {\n        region,\n        customUserAgent: 'cdk-assets',\n      },\n    });\n  }\n}\n\n/**\n * Return the username with characters invalid for a RoleSessionName removed\n *\n * @see https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html#API_AssumeRole_RequestParameters\n */\nfunction safeUsername() {\n  return os.userInfo().username.replace(/[^\\w+=,.@-]/g, '@');\n}\n\n"]}
|
|
@@ -22,10 +22,11 @@ class FileAssetHandler {
|
|
|
22
22
|
const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`;
|
|
23
23
|
const s3 = await this.host.aws.s3Client(destination);
|
|
24
24
|
this.host.emitMessage(progress_1.EventType.CHECK, `Check ${s3Url}`);
|
|
25
|
+
const bucketInfo = BucketInformation.for(this.host);
|
|
25
26
|
// A thunk for describing the current account. Used when we need to format an error
|
|
26
27
|
// message, not in the success case.
|
|
27
|
-
const account = async () => { var _a; return (_a = (await this.host.aws.
|
|
28
|
-
switch (await bucketOwnership(s3, destination.bucketName)) {
|
|
28
|
+
const account = async () => { var _a; return (_a = (await this.host.aws.discoverTargetAccount(destination))) === null || _a === void 0 ? void 0 : _a.accountId; };
|
|
29
|
+
switch (await bucketInfo.bucketOwnership(s3, destination.bucketName)) {
|
|
29
30
|
case BucketOwnership.MINE:
|
|
30
31
|
break;
|
|
31
32
|
case BucketOwnership.DOES_NOT_EXIST:
|
|
@@ -37,18 +38,39 @@ class FileAssetHandler {
|
|
|
37
38
|
this.host.emitMessage(progress_1.EventType.FOUND, `Found ${s3Url}`);
|
|
38
39
|
return;
|
|
39
40
|
}
|
|
41
|
+
// Identify the the bucket encryption type to set the header on upload
|
|
42
|
+
// required for SCP rules denying uploads without encryption header
|
|
43
|
+
let paramsEncryption = {};
|
|
44
|
+
const encryption2 = await bucketInfo.bucketEncryption(s3, destination.bucketName);
|
|
45
|
+
switch (encryption2) {
|
|
46
|
+
case BucketEncryption.NO_ENCRYPTION:
|
|
47
|
+
break;
|
|
48
|
+
case BucketEncryption.SSEAlgorithm_AES256:
|
|
49
|
+
paramsEncryption = { ServerSideEncryption: 'AES256' };
|
|
50
|
+
break;
|
|
51
|
+
case BucketEncryption.SSEAlgorithm_aws_kms:
|
|
52
|
+
paramsEncryption = { ServerSideEncryption: 'aws:kms' };
|
|
53
|
+
break;
|
|
54
|
+
case BucketEncryption.DOES_NOT_EXIST:
|
|
55
|
+
this.host.emitMessage(progress_1.EventType.DEBUG, `No bucket named '${destination.bucketName}'. Is account ${await account()} bootstrapped?`);
|
|
56
|
+
break;
|
|
57
|
+
case BucketEncryption.ACCES_DENIED:
|
|
58
|
+
this.host.emitMessage(progress_1.EventType.DEBUG, `Could not read encryption settings of bucket '${destination.bucketName}': uploading with default settings ("cdk bootstrap" to version 9 if your organization's policies prevent a successful upload or to get rid of this message).`);
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
40
61
|
if (this.host.aborted) {
|
|
41
62
|
return;
|
|
42
63
|
}
|
|
43
64
|
const publishFile = this.asset.source.executable ?
|
|
44
65
|
await this.externalPackageFile(this.asset.source.executable) : await this.packageFile(this.asset.source);
|
|
45
66
|
this.host.emitMessage(progress_1.EventType.UPLOAD, `Upload ${s3Url}`);
|
|
46
|
-
|
|
67
|
+
const params = Object.assign({}, {
|
|
47
68
|
Bucket: destination.bucketName,
|
|
48
69
|
Key: destination.objectKey,
|
|
49
70
|
Body: fs_1.createReadStream(publishFile.packagedPath),
|
|
50
71
|
ContentType: publishFile.contentType,
|
|
51
|
-
})
|
|
72
|
+
}, paramsEncryption);
|
|
73
|
+
await s3.upload(params).promise();
|
|
52
74
|
}
|
|
53
75
|
async packageFile(source) {
|
|
54
76
|
var _a;
|
|
@@ -88,21 +110,14 @@ var BucketOwnership;
|
|
|
88
110
|
BucketOwnership[BucketOwnership["MINE"] = 1] = "MINE";
|
|
89
111
|
BucketOwnership[BucketOwnership["SOMEONE_ELSES_OR_NO_ACCESS"] = 2] = "SOMEONE_ELSES_OR_NO_ACCESS";
|
|
90
112
|
})(BucketOwnership || (BucketOwnership = {}));
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
}
|
|
100
|
-
if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) {
|
|
101
|
-
return BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS;
|
|
102
|
-
}
|
|
103
|
-
throw e;
|
|
104
|
-
}
|
|
105
|
-
}
|
|
113
|
+
var BucketEncryption;
|
|
114
|
+
(function (BucketEncryption) {
|
|
115
|
+
BucketEncryption[BucketEncryption["NO_ENCRYPTION"] = 0] = "NO_ENCRYPTION";
|
|
116
|
+
BucketEncryption[BucketEncryption["SSEAlgorithm_AES256"] = 1] = "SSEAlgorithm_AES256";
|
|
117
|
+
BucketEncryption[BucketEncryption["SSEAlgorithm_aws_kms"] = 2] = "SSEAlgorithm_aws_kms";
|
|
118
|
+
BucketEncryption[BucketEncryption["ACCES_DENIED"] = 3] = "ACCES_DENIED";
|
|
119
|
+
BucketEncryption[BucketEncryption["DOES_NOT_EXIST"] = 4] = "DOES_NOT_EXIST";
|
|
120
|
+
})(BucketEncryption || (BucketEncryption = {}));
|
|
106
121
|
async function objectExists(s3, bucket, key) {
|
|
107
122
|
/*
|
|
108
123
|
* The object existence check here refrains from using the `headObject` operation because this
|
|
@@ -118,4 +133,83 @@ async function objectExists(s3, bucket, key) {
|
|
|
118
133
|
const response = await s3.listObjectsV2({ Bucket: bucket, Prefix: key, MaxKeys: 1 }).promise();
|
|
119
134
|
return response.Contents != null && response.Contents.some(object => object.Key === key);
|
|
120
135
|
}
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"files.js","sourceRoot":"","sources":["files.ts"],"names":[],"mappings":"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","sourcesContent":["import { createReadStream, promises as fs } from 'fs';\nimport * as path from 'path';\nimport { FileAssetPackaging, FileSource } from '@aws-cdk/cloud-assembly-schema';\nimport * as mime from 'mime';\nimport { FileManifestEntry } from '../../asset-manifest';\nimport { EventType } from '../../progress';\nimport { zipDirectory } from '../archive';\nimport { IAssetHandler, IHandlerHost } from '../asset-handler';\nimport { pathExists } from '../fs-extra';\nimport { replaceAwsPlaceholders } from '../placeholders';\nimport { shell } from '../shell';\n\nexport class FileAssetHandler implements IAssetHandler {\n  private readonly fileCacheRoot: string;\n\n  constructor(\n    private readonly workDir: string,\n    private readonly asset: FileManifestEntry,\n    private readonly host: IHandlerHost) {\n    this.fileCacheRoot = path.join(workDir, '.cache');\n  }\n\n  public async publish(): Promise<void> {\n    const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);\n    const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`;\n\n    const s3 = await this.host.aws.s3Client(destination);\n    this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`);\n\n    // A thunk for describing the current account. Used when we need to format an error\n    // message, not in the success case.\n    const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId;\n    switch (await bucketOwnership(s3, destination.bucketName)) {\n      case BucketOwnership.MINE:\n        break;\n      case BucketOwnership.DOES_NOT_EXIST:\n        throw new Error(`No bucket named '${destination.bucketName}'. Is account ${await account()} bootstrapped?`);\n      case BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS:\n        throw new Error(`Bucket named '${destination.bucketName}' exists, but not in account ${await account()}. Wrong account?`);\n    }\n\n    if (await objectExists(s3, destination.bucketName, destination.objectKey)) {\n      this.host.emitMessage(EventType.FOUND, `Found ${s3Url}`);\n      return;\n    }\n\n    if (this.host.aborted) { return; }\n    const publishFile = this.asset.source.executable ?\n      await this.externalPackageFile(this.asset.source.executable) : await this.packageFile(this.asset.source);\n\n    this.host.emitMessage(EventType.UPLOAD, `Upload ${s3Url}`);\n    await s3.upload({\n      Bucket: destination.bucketName,\n      Key: destination.objectKey,\n      Body: createReadStream(publishFile.packagedPath),\n      ContentType: publishFile.contentType,\n    }).promise();\n  }\n\n  private async packageFile(source: FileSource): Promise<PackagedFileAsset> {\n    if (!source.path) {\n      throw new Error(`'path' is expected in the File asset source, got: ${JSON.stringify(source)}`);\n    }\n\n    const fullPath = path.resolve(this.workDir, source.path);\n\n    if (source.packaging === FileAssetPackaging.ZIP_DIRECTORY) {\n      const contentType = 'application/zip';\n\n      await fs.mkdir(this.fileCacheRoot, { recursive: true });\n      const packagedPath = path.join(this.fileCacheRoot, `${this.asset.id.assetId}.zip`);\n\n      if (await pathExists(packagedPath)) {\n        this.host.emitMessage(EventType.CACHED, `From cache ${path}`);\n        return { packagedPath, contentType };\n      }\n\n      this.host.emitMessage(EventType.BUILD, `Zip ${fullPath} -> ${path}`);\n      await zipDirectory(fullPath, packagedPath);\n      return { packagedPath, contentType };\n    } else {\n      const contentType = mime.getType(fullPath) ?? 'application/octet-stream';\n      return { packagedPath: fullPath, contentType };\n    }\n  }\n\n  private async externalPackageFile(executable: string[]): Promise<PackagedFileAsset> {\n    this.host.emitMessage(EventType.BUILD, `Building asset source using command: '${executable}'`);\n\n    return {\n      packagedPath: (await shell(executable, { quiet: true })).trim(),\n      contentType: 'application/zip',\n    };\n  }\n}\n\nenum BucketOwnership {\n  DOES_NOT_EXIST,\n  MINE,\n  SOMEONE_ELSES_OR_NO_ACCESS\n}\n\nasync function bucketOwnership(s3: AWS.S3, bucket: string): Promise<BucketOwnership> {\n  try {\n    await s3.getBucketLocation({ Bucket: bucket }).promise();\n    return BucketOwnership.MINE;\n  } catch (e) {\n    if (e.code === 'NoSuchBucket') { return BucketOwnership.DOES_NOT_EXIST; }\n    if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) { return BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS; }\n    throw e;\n  }\n}\n\nasync function objectExists(s3: AWS.S3, bucket: string, key: string) {\n  /*\n   * The object existence check here refrains from using the `headObject` operation because this\n   * would create a negative cache entry, making GET-after-PUT eventually consistent. This has been\n   * observed to result in CloudFormation issuing \"ValidationError: S3 error: Access Denied\", for\n   * example in https://github.com/aws/aws-cdk/issues/6430.\n   *\n   * To prevent this, we are instead using the listObjectsV2 call, using the looked up key as the\n   * prefix, and limiting results to 1. Since the list operation returns keys ordered by binary\n   * UTF-8 representation, the key we are looking for is guaranteed to always be the first match\n   * returned if it exists.\n   */\n  const response = await s3.listObjectsV2({ Bucket: bucket, Prefix: key, MaxKeys: 1 }).promise();\n  return response.Contents != null && response.Contents.some(object => object.Key === key);\n}\n\n\n/**\n * A packaged asset which can be uploaded (either a single file or directory)\n */\ninterface PackagedFileAsset {\n  /**\n   * Path of the file or directory\n   */\n  readonly packagedPath: string;\n\n  /**\n   * Content type to be added in the S3 upload action\n   *\n   * @default - No content type\n   */\n  readonly contentType?: string;\n}\n"]}
|
|
136
|
+
/**
|
|
137
|
+
* Cache for bucket information, so we don't have to keep doing the same calls again and again
|
|
138
|
+
*
|
|
139
|
+
* We scope the lifetime of the cache to the lifetime of the host, so that we don't have to do
|
|
140
|
+
* anything special for tests and yet the cache will live for the entire lifetime of the asset
|
|
141
|
+
* upload session when used by the CLI.
|
|
142
|
+
*/
|
|
143
|
+
class BucketInformation {
|
|
144
|
+
constructor() {
|
|
145
|
+
this.ownerships = new Map();
|
|
146
|
+
this.encryptions = new Map();
|
|
147
|
+
}
|
|
148
|
+
static for(host) {
|
|
149
|
+
const existing = BucketInformation.caches.get(host);
|
|
150
|
+
if (existing) {
|
|
151
|
+
return existing;
|
|
152
|
+
}
|
|
153
|
+
const fresh = new BucketInformation();
|
|
154
|
+
BucketInformation.caches.set(host, fresh);
|
|
155
|
+
return fresh;
|
|
156
|
+
}
|
|
157
|
+
async bucketOwnership(s3, bucket) {
|
|
158
|
+
return cached(this.ownerships, bucket, () => this._bucketOwnership(s3, bucket));
|
|
159
|
+
}
|
|
160
|
+
async bucketEncryption(s3, bucket) {
|
|
161
|
+
return cached(this.encryptions, bucket, () => this._bucketEncryption(s3, bucket));
|
|
162
|
+
}
|
|
163
|
+
async _bucketOwnership(s3, bucket) {
|
|
164
|
+
try {
|
|
165
|
+
await s3.getBucketLocation({ Bucket: bucket }).promise();
|
|
166
|
+
return BucketOwnership.MINE;
|
|
167
|
+
}
|
|
168
|
+
catch (e) {
|
|
169
|
+
if (e.code === 'NoSuchBucket') {
|
|
170
|
+
return BucketOwnership.DOES_NOT_EXIST;
|
|
171
|
+
}
|
|
172
|
+
if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) {
|
|
173
|
+
return BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS;
|
|
174
|
+
}
|
|
175
|
+
throw e;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
async _bucketEncryption(s3, bucket) {
|
|
179
|
+
var _a, _b, _c, _d, _e, _f;
|
|
180
|
+
try {
|
|
181
|
+
const encryption = await s3.getBucketEncryption({ Bucket: bucket }).promise();
|
|
182
|
+
const l = (_c = (_b = (_a = encryption === null || encryption === void 0 ? void 0 : encryption.ServerSideEncryptionConfiguration) === null || _a === void 0 ? void 0 : _a.Rules) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
|
|
183
|
+
if (l > 0) {
|
|
184
|
+
let ssealgo = (_f = (_e = (_d = encryption === null || encryption === void 0 ? void 0 : encryption.ServerSideEncryptionConfiguration) === null || _d === void 0 ? void 0 : _d.Rules[0]) === null || _e === void 0 ? void 0 : _e.ApplyServerSideEncryptionByDefault) === null || _f === void 0 ? void 0 : _f.SSEAlgorithm;
|
|
185
|
+
if (ssealgo === 'AES256')
|
|
186
|
+
return BucketEncryption.SSEAlgorithm_AES256;
|
|
187
|
+
if (ssealgo === 'aws:kms')
|
|
188
|
+
return BucketEncryption.SSEAlgorithm_aws_kms;
|
|
189
|
+
}
|
|
190
|
+
return BucketEncryption.NO_ENCRYPTION;
|
|
191
|
+
}
|
|
192
|
+
catch (e) {
|
|
193
|
+
if (e.code === 'NoSuchBucket') {
|
|
194
|
+
return BucketEncryption.DOES_NOT_EXIST;
|
|
195
|
+
}
|
|
196
|
+
if (e.code === 'ServerSideEncryptionConfigurationNotFoundError') {
|
|
197
|
+
return BucketEncryption.NO_ENCRYPTION;
|
|
198
|
+
}
|
|
199
|
+
if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) {
|
|
200
|
+
return BucketEncryption.ACCES_DENIED;
|
|
201
|
+
}
|
|
202
|
+
return BucketEncryption.NO_ENCRYPTION;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
BucketInformation.caches = new WeakMap();
|
|
207
|
+
async function cached(cache, key, factory) {
|
|
208
|
+
if (cache.has(key)) {
|
|
209
|
+
return cache.get(key);
|
|
210
|
+
}
|
|
211
|
+
const fresh = await factory(key);
|
|
212
|
+
cache.set(key, fresh);
|
|
213
|
+
return fresh;
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"files.js","sourceRoot":"","sources":["files.ts"],"names":[],"mappings":"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","sourcesContent":["import { createReadStream, promises as fs } from 'fs';\nimport * as path from 'path';\nimport { FileAssetPackaging, FileSource } from '@aws-cdk/cloud-assembly-schema';\nimport * as mime from 'mime';\nimport { FileManifestEntry } from '../../asset-manifest';\nimport { EventType } from '../../progress';\nimport { zipDirectory } from '../archive';\nimport { IAssetHandler, IHandlerHost } from '../asset-handler';\nimport { pathExists } from '../fs-extra';\nimport { replaceAwsPlaceholders } from '../placeholders';\nimport { shell } from '../shell';\n\nexport class FileAssetHandler implements IAssetHandler {\n  private readonly fileCacheRoot: string;\n\n  constructor(\n    private readonly workDir: string,\n    private readonly asset: FileManifestEntry,\n    private readonly host: IHandlerHost) {\n    this.fileCacheRoot = path.join(workDir, '.cache');\n  }\n\n  public async publish(): Promise<void> {\n    const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);\n    const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`;\n    const s3 = await this.host.aws.s3Client(destination);\n    this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`);\n\n    const bucketInfo = BucketInformation.for(this.host);\n\n    // A thunk for describing the current account. Used when we need to format an error\n    // message, not in the success case.\n    const account = async () => (await this.host.aws.discoverTargetAccount(destination))?.accountId;\n    switch (await bucketInfo.bucketOwnership(s3, destination.bucketName)) {\n      case BucketOwnership.MINE:\n        break;\n      case BucketOwnership.DOES_NOT_EXIST:\n        throw new Error(`No bucket named '${destination.bucketName}'. Is account ${await account()} bootstrapped?`);\n      case BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS:\n        throw new Error(`Bucket named '${destination.bucketName}' exists, but not in account ${await account()}. Wrong account?`);\n    }\n\n    if (await objectExists(s3, destination.bucketName, destination.objectKey)) {\n      this.host.emitMessage(EventType.FOUND, `Found ${s3Url}`);\n      return;\n    }\n\n    // Identify the the bucket encryption type to set the header on upload\n    // required for SCP rules denying uploads without encryption header\n    let paramsEncryption: {[index: string]:any}= {};\n    const encryption2 = await bucketInfo.bucketEncryption(s3, destination.bucketName);\n    switch (encryption2) {\n      case BucketEncryption.NO_ENCRYPTION:\n        break;\n      case BucketEncryption.SSEAlgorithm_AES256:\n        paramsEncryption = { ServerSideEncryption: 'AES256' };\n        break;\n      case BucketEncryption.SSEAlgorithm_aws_kms:\n        paramsEncryption = { ServerSideEncryption: 'aws:kms' };\n        break;\n      case BucketEncryption.DOES_NOT_EXIST:\n        this.host.emitMessage(EventType.DEBUG, `No bucket named '${destination.bucketName}'. Is account ${await account()} bootstrapped?`);\n        break;\n      case BucketEncryption.ACCES_DENIED:\n        this.host.emitMessage(EventType.DEBUG, `Could not read encryption settings of bucket '${destination.bucketName}': uploading with default settings (\"cdk bootstrap\" to version 9 if your organization's policies prevent a successful upload or to get rid of this message).`);\n        break;\n    }\n\n    if (this.host.aborted) { return; }\n    const publishFile = this.asset.source.executable ?\n      await this.externalPackageFile(this.asset.source.executable) : await this.packageFile(this.asset.source);\n\n    this.host.emitMessage(EventType.UPLOAD, `Upload ${s3Url}`);\n\n    const params = Object.assign({}, {\n      Bucket: destination.bucketName,\n      Key: destination.objectKey,\n      Body: createReadStream(publishFile.packagedPath),\n      ContentType: publishFile.contentType,\n    },\n    paramsEncryption);\n\n    await s3.upload(params).promise();\n  }\n\n  private async packageFile(source: FileSource): Promise<PackagedFileAsset> {\n    if (!source.path) {\n      throw new Error(`'path' is expected in the File asset source, got: ${JSON.stringify(source)}`);\n    }\n\n    const fullPath = path.resolve(this.workDir, source.path);\n\n    if (source.packaging === FileAssetPackaging.ZIP_DIRECTORY) {\n      const contentType = 'application/zip';\n\n      await fs.mkdir(this.fileCacheRoot, { recursive: true });\n      const packagedPath = path.join(this.fileCacheRoot, `${this.asset.id.assetId}.zip`);\n\n      if (await pathExists(packagedPath)) {\n        this.host.emitMessage(EventType.CACHED, `From cache ${path}`);\n        return { packagedPath, contentType };\n      }\n\n      this.host.emitMessage(EventType.BUILD, `Zip ${fullPath} -> ${path}`);\n      await zipDirectory(fullPath, packagedPath);\n      return { packagedPath, contentType };\n    } else {\n      const contentType = mime.getType(fullPath) ?? 'application/octet-stream';\n      return { packagedPath: fullPath, contentType };\n    }\n  }\n\n  private async externalPackageFile(executable: string[]): Promise<PackagedFileAsset> {\n    this.host.emitMessage(EventType.BUILD, `Building asset source using command: '${executable}'`);\n\n    return {\n      packagedPath: (await shell(executable, { quiet: true })).trim(),\n      contentType: 'application/zip',\n    };\n  }\n}\n\nenum BucketOwnership {\n  DOES_NOT_EXIST,\n  MINE,\n  SOMEONE_ELSES_OR_NO_ACCESS\n}\n\nenum BucketEncryption {\n  NO_ENCRYPTION,\n  SSEAlgorithm_AES256,\n  SSEAlgorithm_aws_kms,\n  ACCES_DENIED,\n  DOES_NOT_EXIST\n}\n\nasync function objectExists(s3: AWS.S3, bucket: string, key: string) {\n  /*\n   * The object existence check here refrains from using the `headObject` operation because this\n   * would create a negative cache entry, making GET-after-PUT eventually consistent. This has been\n   * observed to result in CloudFormation issuing \"ValidationError: S3 error: Access Denied\", for\n   * example in https://github.com/aws/aws-cdk/issues/6430.\n   *\n   * To prevent this, we are instead using the listObjectsV2 call, using the looked up key as the\n   * prefix, and limiting results to 1. Since the list operation returns keys ordered by binary\n   * UTF-8 representation, the key we are looking for is guaranteed to always be the first match\n   * returned if it exists.\n   */\n  const response = await s3.listObjectsV2({ Bucket: bucket, Prefix: key, MaxKeys: 1 }).promise();\n  return response.Contents != null && response.Contents.some(object => object.Key === key);\n}\n\n\n/**\n * A packaged asset which can be uploaded (either a single file or directory)\n */\ninterface PackagedFileAsset {\n  /**\n   * Path of the file or directory\n   */\n  readonly packagedPath: string;\n\n  /**\n   * Content type to be added in the S3 upload action\n   *\n   * @default - No content type\n   */\n  readonly contentType?: string;\n}\n\n\n/**\n * Cache for bucket information, so we don't have to keep doing the same calls again and again\n *\n * We scope the lifetime of the cache to the lifetime of the host, so that we don't have to do\n * anything special for tests and yet the cache will live for the entire lifetime of the asset\n * upload session when used by the CLI.\n */\nclass BucketInformation {\n  public static for(host: IHandlerHost) {\n    const existing = BucketInformation.caches.get(host);\n    if (existing) { return existing; }\n\n    const fresh = new BucketInformation();\n    BucketInformation.caches.set(host, fresh);\n    return fresh;\n  }\n\n  private static readonly caches = new WeakMap<IHandlerHost, BucketInformation>();\n\n  private readonly ownerships = new Map<string, BucketOwnership>();\n  private readonly encryptions = new Map<string, BucketEncryption>();\n\n  private constructor() {\n  }\n\n  public async bucketOwnership(s3: AWS.S3, bucket: string): Promise<BucketOwnership> {\n    return cached(this.ownerships, bucket, () => this._bucketOwnership(s3, bucket));\n  }\n\n  public async bucketEncryption(s3: AWS.S3, bucket: string): Promise<BucketEncryption> {\n    return cached(this.encryptions, bucket, () => this._bucketEncryption(s3, bucket));\n  }\n\n  private async _bucketOwnership(s3: AWS.S3, bucket: string): Promise<BucketOwnership> {\n    try {\n      await s3.getBucketLocation({ Bucket: bucket }).promise();\n      return BucketOwnership.MINE;\n    } catch (e) {\n      if (e.code === 'NoSuchBucket') { return BucketOwnership.DOES_NOT_EXIST; }\n      if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) { return BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS; }\n      throw e;\n    }\n  }\n\n  private async _bucketEncryption(s3: AWS.S3, bucket: string): Promise<BucketEncryption> {\n    try {\n      const encryption = await s3.getBucketEncryption({ Bucket: bucket }).promise();\n      const l = encryption?.ServerSideEncryptionConfiguration?.Rules?.length ?? 0;\n      if (l > 0) {\n        let ssealgo = encryption?.ServerSideEncryptionConfiguration?.Rules[0]?.ApplyServerSideEncryptionByDefault?.SSEAlgorithm;\n        if (ssealgo === 'AES256') return BucketEncryption.SSEAlgorithm_AES256;\n        if (ssealgo === 'aws:kms') return BucketEncryption.SSEAlgorithm_aws_kms;\n      }\n      return BucketEncryption.NO_ENCRYPTION;\n    } catch (e) {\n      if (e.code === 'NoSuchBucket') {\n        return BucketEncryption.DOES_NOT_EXIST;\n      }\n      if (e.code === 'ServerSideEncryptionConfigurationNotFoundError') {\n        return BucketEncryption.NO_ENCRYPTION;\n      }\n\n      if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) {\n        return BucketEncryption.ACCES_DENIED;\n      }\n      return BucketEncryption.NO_ENCRYPTION;\n    }\n  }\n}\n\nasync function cached<A, B>(cache: Map<A, B>, key: A, factory: (x: A) => Promise<B>): Promise<B> {\n  if (cache.has(key)) {\n    return cache.get(key)!;\n  }\n\n  const fresh = await factory(key);\n  cache.set(key, fresh);\n  return fresh;\n}"]}
|
package/lib/publishing.js
CHANGED
|
@@ -23,6 +23,11 @@ class AssetPublishing {
|
|
|
23
23
|
async publish() {
|
|
24
24
|
var _a;
|
|
25
25
|
const self = this;
|
|
26
|
+
const handlerHost = {
|
|
27
|
+
aws: this.options.aws,
|
|
28
|
+
get aborted() { return self.aborted; },
|
|
29
|
+
emitMessage(t, m) { self.progressEvent(t, m); },
|
|
30
|
+
};
|
|
26
31
|
for (const asset of this.assets) {
|
|
27
32
|
if (this.aborted) {
|
|
28
33
|
break;
|
|
@@ -32,11 +37,7 @@ class AssetPublishing {
|
|
|
32
37
|
if (this.progressEvent(progress_1.EventType.START, `Publishing ${asset.id}`)) {
|
|
33
38
|
break;
|
|
34
39
|
}
|
|
35
|
-
const handler = handlers_1.makeAssetHandler(this.manifest, asset,
|
|
36
|
-
aws: this.options.aws,
|
|
37
|
-
get aborted() { return self.aborted; },
|
|
38
|
-
emitMessage(t, m) { self.progressEvent(t, m); },
|
|
39
|
-
});
|
|
40
|
+
const handler = handlers_1.makeAssetHandler(this.manifest, asset, handlerHost);
|
|
40
41
|
await handler.publish();
|
|
41
42
|
if (this.aborted) {
|
|
42
43
|
throw new Error('Aborted');
|
|
@@ -84,4 +85,4 @@ class AssetPublishing {
|
|
|
84
85
|
}
|
|
85
86
|
}
|
|
86
87
|
exports.AssetPublishing = AssetPublishing;
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"publishing.js","sourceRoot":"","sources":["publishing.ts"],"names":[],"mappings":"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","sourcesContent":["import { AssetManifest, IManifestEntry } from './asset-manifest';\nimport { IAws } from './aws';\nimport { IHandlerHost } from './private/asset-handler';\nimport { makeAssetHandler } from './private/handlers';\nimport { EventType, IPublishProgress, IPublishProgressListener } from './progress';\n\nexport interface AssetPublishingOptions {\n  /**\n   * Entry point for AWS client\n   */\n  readonly aws: IAws;\n\n  /**\n   * Listener for progress events\n   *\n   * @default No listener\n   */\n  readonly progressListener?: IPublishProgressListener;\n\n  /**\n   * Whether to throw at the end if there were errors\n   *\n   * @default true\n   */\n  readonly throwOnError?: boolean;\n}\n\n/**\n * A failure to publish an asset\n */\nexport interface FailedAsset {\n  /**\n   * The asset that failed to publish\n   */\n  readonly asset: IManifestEntry;\n\n  /**\n   * The failure that occurred\n   */\n  readonly error: Error;\n}\n\nexport class AssetPublishing implements IPublishProgress {\n  /**\n   * The message for the IPublishProgress interface\n   */\n  public message: string = 'Starting';\n\n  /**\n   * The current asset for the IPublishProgress interface\n   */\n  public currentAsset?: IManifestEntry;\n  public readonly failures = new Array<FailedAsset>();\n  private readonly assets: IManifestEntry[];\n\n  private readonly totalOperations: number;\n  private completedOperations: number = 0;\n  private aborted = false;\n\n  constructor(private readonly manifest: AssetManifest, private readonly options: AssetPublishingOptions) {\n    this.assets = manifest.entries;\n    this.totalOperations = this.assets.length;\n  }\n\n  /**\n   * Publish all assets from the manifest\n   */\n  public async publish(): Promise<void> {\n    const self = this;\n\n    const handlerHost: IHandlerHost = {\n      aws: this.options.aws,\n      get aborted() { return self.aborted; },\n      emitMessage(t, m) { self.progressEvent(t, m); },\n    };\n\n    for (const asset of this.assets) {\n      if (this.aborted) { break; }\n      this.currentAsset = asset;\n\n      try {\n        if (this.progressEvent(EventType.START, `Publishing ${asset.id}`)) { break; }\n\n        const handler = makeAssetHandler(this.manifest, asset, handlerHost);\n        await handler.publish();\n\n        if (this.aborted) {\n          throw new Error('Aborted');\n        }\n\n        this.completedOperations++;\n        if (this.progressEvent(EventType.SUCCESS, `Published ${asset.id}`)) { break; }\n      } catch (e) {\n        this.failures.push({ asset, error: e });\n        this.completedOperations++;\n        if (this.progressEvent(EventType.FAIL, e.message)) { break; }\n      }\n    }\n\n    if ((this.options.throwOnError ?? true) && this.failures.length > 0) {\n      throw new Error(`Error publishing: ${this.failures.map(e => e.error.message)}`);\n    }\n  }\n\n  public get percentComplete() {\n    if (this.totalOperations === 0) { return 100; }\n    return Math.floor((this.completedOperations / this.totalOperations) * 100);\n  }\n\n  public abort(): void {\n    this.aborted = true;\n  }\n\n  public get hasFailures() {\n    return this.failures.length > 0;\n  }\n\n  /**\n   * Publish a progress event to the listener, if present.\n   *\n   * Returns whether an abort is requested. Helper to get rid of repetitive code in publish().\n   */\n  private progressEvent(event: EventType, message: string): boolean {\n    this.message = message;\n    if (this.options.progressListener) { this.options.progressListener.onPublishEvent(event, this); }\n    return this.aborted;\n  }\n}"]}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cdk-assets",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"lockfileVersion": 1,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"@aws-cdk/cloud-assembly-schema": {
|
|
8
|
-
"version": "2.
|
|
8
|
+
"version": "2.4.0",
|
|
9
9
|
"requires": {
|
|
10
10
|
"jsonschema": "^1.4.0",
|
|
11
11
|
"semver": "^7.3.5"
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"@aws-cdk/cx-api": {
|
|
15
|
-
"version": "2.
|
|
15
|
+
"version": "2.4.0",
|
|
16
16
|
"requires": {
|
|
17
|
-
"@aws-cdk/cloud-assembly-schema": "2.
|
|
17
|
+
"@aws-cdk/cloud-assembly-schema": "2.4.0",
|
|
18
18
|
"semver": "^7.3.5"
|
|
19
19
|
}
|
|
20
20
|
},
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
"aws-sdk": {
|
|
36
|
-
"version": "2.
|
|
37
|
-
"integrity": "sha512-
|
|
38
|
-
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.
|
|
36
|
+
"version": "2.1048.0",
|
|
37
|
+
"integrity": "sha512-mVwWo+Udiuc/yEZ/DgJQGqOEtfiQjgUdtshx/t6ISe3+jW3TF9hUACwADwx2Sr/fuJyyJ3QD5JYLt5Cw35wQpA==",
|
|
38
|
+
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1048.0.tgz#02f2f35e0f51dd4510462e05c7a48fd4649d33f8",
|
|
39
39
|
"requires": {
|
|
40
40
|
"buffer": "4.9.2",
|
|
41
41
|
"events": "1.1.1",
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cdk-assets",
|
|
3
3
|
"description": "CDK Asset Publishing Tool",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.4.0",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"bin": {
|
|
@@ -32,20 +32,20 @@
|
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/archiver": "^5.3.0",
|
|
34
34
|
"@types/glob": "^7.2.0",
|
|
35
|
-
"@types/jest": "^27.0.
|
|
35
|
+
"@types/jest": "^27.0.3",
|
|
36
36
|
"@types/mime": "^2.0.3",
|
|
37
37
|
"@types/mock-fs": "^4.13.1",
|
|
38
38
|
"@types/node": "^10.17.60",
|
|
39
39
|
"@types/yargs": "^15.0.14",
|
|
40
|
-
"@aws-cdk/cdk-build-tools": "2.
|
|
41
|
-
"jest": "^27.
|
|
40
|
+
"@aws-cdk/cdk-build-tools": "2.4.0",
|
|
41
|
+
"jest": "^27.4.5",
|
|
42
42
|
"jszip": "^3.7.1",
|
|
43
43
|
"mock-fs": "^4.14.0",
|
|
44
|
-
"@aws-cdk/pkglint": "2.
|
|
44
|
+
"@aws-cdk/pkglint": "2.4.0"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@aws-cdk/cloud-assembly-schema": "2.
|
|
48
|
-
"@aws-cdk/cx-api": "2.
|
|
47
|
+
"@aws-cdk/cloud-assembly-schema": "2.4.0",
|
|
48
|
+
"@aws-cdk/cx-api": "2.4.0",
|
|
49
49
|
"archiver": "^5.3.0",
|
|
50
50
|
"aws-sdk": "^2.848.0",
|
|
51
51
|
"glob": "^7.2.0",
|