cdk-assets 2.0.0-rc.8 → 2.2.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 +34 -1
- package/bin/docker-credential-cdk-assets +2 -0
- package/bin/docker-credential-cdk-assets.d.ts +13 -0
- package/bin/docker-credential-cdk-assets.js +43 -0
- package/bin/publish.js +2 -92
- package/lib/aws.d.ts +27 -1
- package/lib/aws.js +101 -1
- package/lib/private/docker-credentials.d.ts +31 -0
- package/lib/private/docker-credentials.js +77 -0
- package/lib/private/docker.d.ts +26 -0
- package/lib/private/docker.js +41 -20
- package/lib/private/handlers/container-images.js +17 -5
- package/lib/private/handlers/files.js +118 -21
- package/lib/publishing.js +7 -6
- package/npm-shrinkwrap.json +113 -108
- package/package.json +22 -21
package/lib/private/docker.js
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Docker = void 0;
|
|
4
|
-
|
|
4
|
+
const fs = require("fs");
|
|
5
|
+
const os = require("os");
|
|
6
|
+
const path = require("path");
|
|
7
|
+
const docker_credentials_1 = require("./docker-credentials");
|
|
5
8
|
const shell_1 = require("./shell");
|
|
6
9
|
class Docker {
|
|
7
10
|
constructor(logger) {
|
|
8
11
|
this.logger = logger;
|
|
12
|
+
this.configDir = undefined;
|
|
9
13
|
}
|
|
10
14
|
/**
|
|
11
15
|
* Whether an image with the given tag exists
|
|
@@ -37,7 +41,7 @@ class Docker {
|
|
|
37
41
|
* Get credentials from ECR and run docker login
|
|
38
42
|
*/
|
|
39
43
|
async login(ecr) {
|
|
40
|
-
const credentials = await obtainEcrCredentials(ecr);
|
|
44
|
+
const credentials = await docker_credentials_1.obtainEcrCredentials(ecr);
|
|
41
45
|
// Use --password-stdin otherwise docker will complain. Loudly.
|
|
42
46
|
await this.execute(['login',
|
|
43
47
|
'--username', credentials.username,
|
|
@@ -56,9 +60,42 @@ class Docker {
|
|
|
56
60
|
async push(tag) {
|
|
57
61
|
await this.execute(['push', tag]);
|
|
58
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* If a CDK Docker Credentials file exists, creates a new Docker config directory.
|
|
65
|
+
* Sets up `docker-credential-cdk-assets` to be the credential helper for each domain in the CDK config.
|
|
66
|
+
* All future commands (e.g., `build`, `push`) will use this config.
|
|
67
|
+
*
|
|
68
|
+
* See https://docs.docker.com/engine/reference/commandline/login/#credential-helpers for more details on cred helpers.
|
|
69
|
+
*
|
|
70
|
+
* @returns true if CDK config was found and configured, false otherwise
|
|
71
|
+
*/
|
|
72
|
+
configureCdkCredentials() {
|
|
73
|
+
const config = docker_credentials_1.cdkCredentialsConfig();
|
|
74
|
+
if (!config) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
this.configDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cdkDockerConfig'));
|
|
78
|
+
const domains = Object.keys(config.domainCredentials);
|
|
79
|
+
const credHelpers = domains.reduce((map, domain) => {
|
|
80
|
+
map[domain] = 'cdk-assets'; // Use docker-credential-cdk-assets for this domain
|
|
81
|
+
return map;
|
|
82
|
+
}, {});
|
|
83
|
+
fs.writeFileSync(path.join(this.configDir, 'config.json'), JSON.stringify({ credHelpers }), { encoding: 'utf-8' });
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Removes any configured Docker config directory.
|
|
88
|
+
* All future commands (e.g., `build`, `push`) will use the default config.
|
|
89
|
+
*
|
|
90
|
+
* This is useful after calling `configureCdkCredentials` to reset to default credentials.
|
|
91
|
+
*/
|
|
92
|
+
resetAuthPlugins() {
|
|
93
|
+
this.configDir = undefined;
|
|
94
|
+
}
|
|
59
95
|
async execute(args, options = {}) {
|
|
96
|
+
const configArgs = this.configDir ? ['--config', this.configDir] : [];
|
|
60
97
|
try {
|
|
61
|
-
await shell_1.shell(['docker', ...args], { logger: this.logger, ...options });
|
|
98
|
+
await shell_1.shell(['docker', ...configArgs, ...args], { logger: this.logger, ...options });
|
|
62
99
|
}
|
|
63
100
|
catch (e) {
|
|
64
101
|
if (e.code === 'ENOENT') {
|
|
@@ -69,23 +106,7 @@ class Docker {
|
|
|
69
106
|
}
|
|
70
107
|
}
|
|
71
108
|
exports.Docker = Docker;
|
|
72
|
-
async function obtainEcrCredentials(ecr, logger) {
|
|
73
|
-
if (logger) {
|
|
74
|
-
logger('Fetching ECR authorization token');
|
|
75
|
-
}
|
|
76
|
-
const authData = (await ecr.getAuthorizationToken({}).promise()).authorizationData || [];
|
|
77
|
-
if (authData.length === 0) {
|
|
78
|
-
throw new Error('No authorization data received from ECR');
|
|
79
|
-
}
|
|
80
|
-
const token = Buffer.from(authData[0].authorizationToken, 'base64').toString('ascii');
|
|
81
|
-
const [username, password] = token.split(':');
|
|
82
|
-
return {
|
|
83
|
-
username,
|
|
84
|
-
password,
|
|
85
|
-
endpoint: authData[0].proxyEndpoint,
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
109
|
function flatten(x) {
|
|
89
110
|
return Array.prototype.concat([], ...x);
|
|
90
111
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDRCQUE0QjtBQUM1QixtQ0FBc0Q7QUFjdEQsTUFBYSxNQUFNO0lBQ2pCLFlBQTZCLE1BQWU7UUFBZixXQUFNLEdBQU4sTUFBTSxDQUFTO0lBQzVDLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUM3QixJQUFJO1lBQ0YsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDdEQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsSUFBSSxDQUFDLENBQUMsSUFBSSxLQUFLLGdCQUFnQixJQUFJLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxFQUFFO2dCQUFFLE1BQU0sQ0FBQyxDQUFDO2FBQUU7WUFDakUsT0FBTyxLQUFLLENBQUM7U0FDZDtJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQXFCO1FBQ3RDLE1BQU0sWUFBWSxHQUFHO1lBQ25CLE9BQU87WUFDUCxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLElBQUksRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUNqRyxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUc7WUFDcEIsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDckQs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QUFDLENBQUM7QUFDMUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIGltcG9ydCAqIGFzIG9zIGZyb20gJ29zJztcbmltcG9ydCB7IExvZ2dlciwgc2hlbGwsIFNoZWxsT3B0aW9ucyB9IGZyb20gJy4vc2hlbGwnO1xuXG5pbnRlcmZhY2UgQnVpbGRPcHRpb25zIHtcbiAgcmVhZG9ubHkgZGlyZWN0b3J5OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFRhZyB0aGUgaW1hZ2Ugd2l0aCBhIGdpdmVuIHJlcG9OYW1lOnRhZyBjb21iaW5hdGlvblxuICAgKi9cbiAgcmVhZG9ubHkgdGFnOiBzdHJpbmc7XG4gIHJlYWRvbmx5IHRhcmdldD86IHN0cmluZztcbiAgcmVhZG9ubHkgZmlsZT86IHN0cmluZztcbiAgcmVhZG9ubHkgYnVpbGRBcmdzPzogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbn1cblxuZXhwb3J0IGNsYXNzIERvY2tlciB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgbG9nZ2VyPzogTG9nZ2VyKSB7XG4gIH1cblxuICAvKipcbiAgICogV2hldGhlciBhbiBpbWFnZSB3aXRoIHRoZSBnaXZlbiB0YWcgZXhpc3RzXG4gICAqL1xuICBwdWJsaWMgYXN5bmMgZXhpc3RzKHRhZzogc3RyaW5nKSB7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuZXhlY3V0ZShbJ2luc3BlY3QnLCB0YWddLCB7IHF1aWV0OiB0cnVlIH0pO1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgaWYgKGUuY29kZSAhPT0gJ1BST0NFU1NfRkFJTEVEJyB8fCBlLmV4aXRDb2RlICE9PSAxKSB7IHRocm93IGU7IH1cbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgYnVpbGQob3B0aW9uczogQnVpbGRPcHRpb25zKSB7XG4gICAgY29uc3QgYnVpbGRDb21tYW5kID0gW1xuICAgICAgJ2J1aWxkJyxcbiAgICAgIC4uLmZsYXR0ZW4oT2JqZWN0LmVudHJpZXMob3B0aW9ucy5idWlsZEFyZ3MgfHwge30pLm1hcCgoW2ssIHZdKSA9PiBbJy0tYnVpbGQtYXJnJywgYCR7a309JHt2fWBdKSksXG4gICAgICAnLS10YWcnLCBvcHRpb25zLnRhZyxcbiAgICAgIC4uLm9wdGlvbnMudGFyZ2V0ID8gWyctLXRhcmdldCcsIG9wdGlvbnMudGFyZ2V0XSA6IFtdLFxuICAgICAgLi4ub3B0aW9ucy5maWxlID8gWyctLWZpbGUnLCBvcHRpb25zLmZpbGVdIDogW10sXG4gICAgICAnLicsXG4gICAgXTtcbiAgICBhd2FpdCB0aGlzLmV4ZWN1dGUoYnVpbGRDb21tYW5kLCB7IGN3ZDogb3B0aW9ucy5kaXJlY3RvcnkgfSk7XG4gIH1cblxuICAvKipcbiAgICogR2V0IGNyZWRlbnRpYWxzIGZyb20gRUNSIGFuZCBydW4gZG9ja2VyIGxvZ2luXG4gICAqL1xuICBwdWJsaWMgYXN5bmMgbG9naW4oZWNyOiBBV1MuRUNSKSB7XG4gICAgY29uc3QgY3JlZGVudGlhbHMgPSBhd2FpdCBvYnRhaW5FY3JDcmVkZW50aWFscyhlY3IpO1xuXG4gICAgLy8gVXNlIC0tcGFzc3dvcmQtc3RkaW4gb3RoZXJ3aXNlIGRvY2tlciB3aWxsIGNvbXBsYWluLiBMb3VkbHkuXG4gICAgYXdhaXQgdGhpcy5leGVjdXRlKFsnbG9naW4nLFxuICAgICAgJy0tdXNlcm5hbWUnLCBjcmVkZW50aWFscy51c2VybmFtZSxcbiAgICAgICctLXBhc3N3b3JkLXN0ZGluJyxcbiAgICAgIGNyZWRlbnRpYWxzLmVuZHBvaW50XSwge1xuICAgICAgaW5wdXQ6IGNyZWRlbnRpYWxzLnBhc3N3b3JkLFxuXG4gICAgICAvLyBOZWVkIHRvIHF1aWV0IG90aGVyd2lzZSBEb2NrZXIgd2lsbCBjb21wbGFpblxuICAgICAgLy8gJ1dBUk5JTkchIFlvdXIgcGFzc3dvcmQgd2lsbCBiZSBzdG9yZWQgdW5lbmNyeXB0ZWQnXG4gICAgICAvLyBkb2Vzbid0IHJlYWxseSBtYXR0ZXIgc2luY2UgaXQncyBhIHRva2VuLlxuICAgICAgcXVpZXQ6IHRydWUsXG4gICAgfSk7XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgdGFnKHNvdXJjZVRhZzogc3RyaW5nLCB0YXJnZXRUYWc6IHN0cmluZykge1xuICAgIGF3YWl0IHRoaXMuZXhlY3V0ZShbJ3RhZycsIHNvdXJjZVRhZywgdGFyZ2V0VGFnXSk7XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgcHVzaCh0YWc6IHN0cmluZykge1xuICAgIGF3YWl0IHRoaXMuZXhlY3V0ZShbJ3B1c2gnLCB0YWddKTtcbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgZXhlY3V0ZShhcmdzOiBzdHJpbmdbXSwgb3B0aW9uczogU2hlbGxPcHRpb25zID0ge30pIHtcbiAgICB0cnkge1xuICAgICAgYXdhaXQgc2hlbGwoWydkb2NrZXInLCAuLi5hcmdzXSwgeyBsb2dnZXI6IHRoaXMubG9nZ2VyLCAuLi5vcHRpb25zIH0pO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGlmIChlLmNvZGUgPT09ICdFTk9FTlQnKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcignVW5hYmxlIHRvIGV4ZWN1dGUgXFwnZG9ja2VyXFwnIGluIG9yZGVyIHRvIGJ1aWxkIGEgY29udGFpbmVyIGFzc2V0LiBQbGVhc2UgaW5zdGFsbCBcXCdkb2NrZXJcXCcgYW5kIHRyeSBhZ2Fpbi4nKTtcbiAgICAgIH1cbiAgICAgIHRocm93IGU7XG4gICAgfVxuICB9XG59XG5cbmFzeW5jIGZ1bmN0aW9uIG9idGFpbkVjckNyZWRlbnRpYWxzKGVjcjogQVdTLkVDUiwgbG9nZ2VyPzogTG9nZ2VyKSB7XG4gIGlmIChsb2dnZXIpIHsgbG9nZ2VyKCdGZXRjaGluZyBFQ1IgYXV0aG9yaXphdGlvbiB0b2tlbicpOyB9XG4gIGNvbnN0IGF1dGhEYXRhID0gKGF3YWl0IGVjci5nZXRBdXRob3JpemF0aW9uVG9rZW4oeyB9KS5wcm9taXNlKCkpLmF1dGhvcml6YXRpb25EYXRhIHx8IFtdO1xuICBpZiAoYXV0aERhdGEubGVuZ3RoID09PSAwKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdObyBhdXRob3JpemF0aW9uIGRhdGEgcmVjZWl2ZWQgZnJvbSBFQ1InKTtcbiAgfVxuICBjb25zdCB0b2tlbiA9IEJ1ZmZlci5mcm9tKGF1dGhEYXRhWzBdLmF1dGhvcml6YXRpb25Ub2tlbiEsICdiYXNlNjQnKS50b1N0cmluZygnYXNjaWknKTtcbiAgY29uc3QgW3VzZXJuYW1lLCBwYXNzd29yZF0gPSB0b2tlbi5zcGxpdCgnOicpO1xuXG4gIHJldHVybiB7XG4gICAgdXNlcm5hbWUsXG4gICAgcGFzc3dvcmQsXG4gICAgZW5kcG9pbnQ6IGF1dGhEYXRhWzBdLnByb3h5RW5kcG9pbnQhLFxuICB9O1xufVxuXG5mdW5jdGlvbiBmbGF0dGVuKHg6IHN0cmluZ1tdW10pIHtcbiAgcmV0dXJuIEFycmF5LnByb3RvdHlwZS5jb25jYXQoW10sIC4uLngpO1xufVxuIl19
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"docker.js","sourceRoot":"","sources":["docker.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport * as os from 'os';\nimport * as path from 'path';\nimport { cdkCredentialsConfig, obtainEcrCredentials } from './docker-credentials';\nimport { Logger, shell, ShellOptions } from './shell';\n\ninterface BuildOptions {\n  readonly directory: string;\n\n  /**\n   * Tag the image with a given repoName:tag combination\n   */\n  readonly tag: string;\n  readonly target?: string;\n  readonly file?: string;\n  readonly buildArgs?: Record<string, string>;\n}\n\nexport interface DockerCredentialsConfig {\n  readonly version: string;\n  readonly domainCredentials: Record<string, DockerDomainCredentials>;\n}\n\nexport interface DockerDomainCredentials {\n  readonly secretsManagerSecretId?: string;\n  readonly ecrRepository?: string;\n}\n\nexport class Docker {\n\n  private configDir: string | undefined = undefined;\n\n  constructor(private readonly logger?: Logger) {\n  }\n\n  /**\n   * Whether an image with the given tag exists\n   */\n  public async exists(tag: string) {\n    try {\n      await this.execute(['inspect', tag], { quiet: true });\n      return true;\n    } catch (e) {\n      if (e.code !== 'PROCESS_FAILED' || e.exitCode !== 1) { throw e; }\n      return false;\n    }\n  }\n\n  public async build(options: BuildOptions) {\n    const buildCommand = [\n      'build',\n      ...flatten(Object.entries(options.buildArgs || {}).map(([k, v]) => ['--build-arg', `${k}=${v}`])),\n      '--tag', options.tag,\n      ...options.target ? ['--target', options.target] : [],\n      ...options.file ? ['--file', options.file] : [],\n      '.',\n    ];\n    await this.execute(buildCommand, { cwd: options.directory });\n  }\n\n  /**\n   * Get credentials from ECR and run docker login\n   */\n  public async login(ecr: AWS.ECR) {\n    const credentials = await obtainEcrCredentials(ecr);\n\n    // Use --password-stdin otherwise docker will complain. Loudly.\n    await this.execute(['login',\n      '--username', credentials.username,\n      '--password-stdin',\n      credentials.endpoint], {\n      input: credentials.password,\n\n      // Need to quiet otherwise Docker will complain\n      // 'WARNING! Your password will be stored unencrypted'\n      // doesn't really matter since it's a token.\n      quiet: true,\n    });\n  }\n\n  public async tag(sourceTag: string, targetTag: string) {\n    await this.execute(['tag', sourceTag, targetTag]);\n  }\n\n  public async push(tag: string) {\n    await this.execute(['push', tag]);\n  }\n\n  /**\n   * If a CDK Docker Credentials file exists, creates a new Docker config directory.\n   * Sets up `docker-credential-cdk-assets` to be the credential helper for each domain in the CDK config.\n   * All future commands (e.g., `build`, `push`) will use this config.\n   *\n   * See https://docs.docker.com/engine/reference/commandline/login/#credential-helpers for more details on cred helpers.\n   *\n   * @returns true if CDK config was found and configured, false otherwise\n   */\n  public configureCdkCredentials(): boolean {\n    const config = cdkCredentialsConfig();\n    if (!config) { return false; }\n\n    this.configDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cdkDockerConfig'));\n\n    const domains = Object.keys(config.domainCredentials);\n    const credHelpers = domains.reduce((map: Record<string, string>, domain) => {\n      map[domain] = 'cdk-assets'; // Use docker-credential-cdk-assets for this domain\n      return map;\n    }, {});\n    fs.writeFileSync(path.join(this.configDir, 'config.json'), JSON.stringify({ credHelpers }), { encoding: 'utf-8' });\n\n    return true;\n  }\n\n  /**\n   * Removes any configured Docker config directory.\n   * All future commands (e.g., `build`, `push`) will use the default config.\n   *\n   * This is useful after calling `configureCdkCredentials` to reset to default credentials.\n   */\n  public resetAuthPlugins() {\n    this.configDir = undefined;\n  }\n\n  private async execute(args: string[], options: ShellOptions = {}) {\n    const configArgs = this.configDir ? ['--config', this.configDir] : [];\n\n    try {\n      await shell(['docker', ...configArgs, ...args], { logger: this.logger, ...options });\n    } catch (e) {\n      if (e.code === 'ENOENT') {\n        throw new Error('Unable to execute \\'docker\\' in order to build a container asset. Please install \\'docker\\' and try again.');\n      }\n      throw e;\n    }\n  }\n}\n\nfunction flatten(x: string[][]) {\n  return Array.prototype.concat([], ...x);\n}\n"]}
|
|
@@ -28,8 +28,15 @@ class ContainerImageAssetHandler {
|
|
|
28
28
|
if (this.host.aborted) {
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
|
-
//
|
|
32
|
-
|
|
31
|
+
// Default behavior is to login before build so that the Dockerfile can reference images in the ECR repo
|
|
32
|
+
// However, if we're in a pipelines environment (for example),
|
|
33
|
+
// we may have alternative credentials to the default ones to use for the build itself.
|
|
34
|
+
// If the special config file is present, delay the login to the default credentials until the push.
|
|
35
|
+
// If the config file is present, we will configure and use those credentials for the build.
|
|
36
|
+
let cdkDockerCredentialsConfigured = this.docker.configureCdkCredentials();
|
|
37
|
+
if (!cdkDockerCredentialsConfigured) {
|
|
38
|
+
await this.docker.login(ecr);
|
|
39
|
+
}
|
|
33
40
|
const localTagName = this.asset.source.executable
|
|
34
41
|
? await this.buildExternalAsset(this.asset.source.executable)
|
|
35
42
|
: await this.buildDirectoryAsset();
|
|
@@ -41,6 +48,10 @@ class ContainerImageAssetHandler {
|
|
|
41
48
|
return;
|
|
42
49
|
}
|
|
43
50
|
await this.docker.tag(localTagName, imageUri);
|
|
51
|
+
if (cdkDockerCredentialsConfigured) {
|
|
52
|
+
this.docker.resetAuthPlugins();
|
|
53
|
+
await this.docker.login(ecr);
|
|
54
|
+
}
|
|
44
55
|
await this.docker.push(imageUri);
|
|
45
56
|
}
|
|
46
57
|
/**
|
|
@@ -65,12 +76,13 @@ class ContainerImageAssetHandler {
|
|
|
65
76
|
* External command is responsible for deduplicating the build if possible,
|
|
66
77
|
* and is expected to return the generated image identifier on stdout.
|
|
67
78
|
*/
|
|
68
|
-
async buildExternalAsset(executable) {
|
|
79
|
+
async buildExternalAsset(executable, cwd) {
|
|
80
|
+
const assetPath = cwd !== null && cwd !== void 0 ? cwd : this.workDir;
|
|
69
81
|
this.host.emitMessage(progress_1.EventType.BUILD, `Building Docker image using command '${executable}'`);
|
|
70
82
|
if (this.host.aborted) {
|
|
71
83
|
return undefined;
|
|
72
84
|
}
|
|
73
|
-
return (await shell_1.shell(executable, { quiet: true })).trim();
|
|
85
|
+
return (await shell_1.shell(executable, { cwd: assetPath, quiet: true })).trim();
|
|
74
86
|
}
|
|
75
87
|
/**
|
|
76
88
|
* Check whether the image already exists in the ECR repo
|
|
@@ -141,4 +153,4 @@ async function repositoryUri(ecr, repositoryName) {
|
|
|
141
153
|
return undefined;
|
|
142
154
|
}
|
|
143
155
|
}
|
|
144
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"container-images.js","sourceRoot":"","sources":["container-images.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport { DockerImageDestination } from '@aws-cdk/cloud-assembly-schema';\nimport { DockerImageManifestEntry } from '../../asset-manifest';\nimport { EventType } from '../../progress';\nimport { IAssetHandler, IHandlerHost } from '../asset-handler';\nimport { Docker } from '../docker';\nimport { replaceAwsPlaceholders } from '../placeholders';\nimport { shell } from '../shell';\n\nexport class ContainerImageAssetHandler implements IAssetHandler {\n  private readonly docker = new Docker(m => this.host.emitMessage(EventType.DEBUG, m));\n\n  constructor(\n    private readonly workDir: string,\n    private readonly asset: DockerImageManifestEntry,\n    private readonly host: IHandlerHost) {\n  }\n\n  public async publish(): Promise<void> {\n    const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);\n    const ecr = await this.host.aws.ecrClient(destination);\n    const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId;\n    const repoUri = await repositoryUri(ecr, destination.repositoryName);\n\n    if (!repoUri) {\n      throw new Error(`No ECR repository named '${destination.repositoryName}' in account ${await account()}. Is this account bootstrapped?`);\n    }\n\n    const imageUri = `${repoUri}:${destination.imageTag}`;\n\n    if (await this.destinationAlreadyExists(ecr, destination, imageUri)) { return; }\n    if (this.host.aborted) { return; }\n\n    // Login before build so that the Dockerfile can reference images in the ECR repo\n    await this.docker.login(ecr);\n\n    const localTagName = this.asset.source.executable\n      ? await this.buildExternalAsset(this.asset.source.executable)\n      : await this.buildDirectoryAsset();\n\n    if (localTagName === undefined || this.host.aborted) {\n      return;\n    }\n\n    this.host.emitMessage(EventType.UPLOAD, `Push ${imageUri}`);\n    if (this.host.aborted) { return; }\n    await this.docker.tag(localTagName, imageUri);\n    await this.docker.push(imageUri);\n  }\n\n  /**\n   * Build a (local) Docker asset from a directory with a Dockerfile\n   *\n   * Tags under a deterministic, unique, local identifier wich will skip\n   * the build if it already exists.\n   */\n  private async buildDirectoryAsset(): Promise<string | undefined> {\n    const localTagName = `cdkasset-${this.asset.id.assetId.toLowerCase()}`;\n\n    if (!(await this.isImageCached(localTagName))) {\n      if (this.host.aborted) { return undefined; }\n\n      await this.buildImage(localTagName);\n    }\n\n    return localTagName;\n  }\n\n  /**\n   * Build a (local) Docker asset by running an external command\n   *\n   * External command is responsible for deduplicating the build if possible,\n   * and is expected to return the generated image identifier on stdout.\n   */\n  private async buildExternalAsset(executable: string[]): Promise<string | undefined> {\n    this.host.emitMessage(EventType.BUILD, `Building Docker image using command '${executable}'`);\n    if (this.host.aborted) { return undefined; }\n\n    return (await shell(executable, { quiet: true })).trim();\n  }\n\n\n  /**\n   * Check whether the image already exists in the ECR repo\n   *\n   * Use the fields from the destination to do the actual check. The imageUri\n   * should correspond to that, but is only used to print Docker image location\n   * for user benefit (the format is slightly different).\n   */\n  private async destinationAlreadyExists(ecr: AWS.ECR, destination: DockerImageDestination, imageUri: string): Promise<boolean> {\n    this.host.emitMessage(EventType.CHECK, `Check ${imageUri}`);\n    if (await imageExists(ecr, destination.repositoryName, destination.imageTag)) {\n      this.host.emitMessage(EventType.FOUND, `Found ${imageUri}`);\n      return true;\n    }\n\n    return false;\n  }\n\n  private async buildImage(localTagName: string): Promise<void> {\n    const source = this.asset.source;\n    if (!source.directory) {\n      throw new Error(`'directory' is expected in the DockerImage asset source, got: ${JSON.stringify(source)}`);\n    }\n\n    const fullPath = path.resolve(this.workDir, source.directory);\n    this.host.emitMessage(EventType.BUILD, `Building Docker image at ${fullPath}`);\n\n    await this.docker.build({\n      directory: fullPath,\n      tag: localTagName,\n      buildArgs: source.dockerBuildArgs,\n      target: source.dockerBuildTarget,\n      file: source.dockerFile,\n    });\n  }\n\n  private async isImageCached(localTagName: string): Promise<boolean> {\n    if (await this.docker.exists(localTagName)) {\n      this.host.emitMessage(EventType.CACHED, `Cached ${localTagName}`);\n      return true;\n    }\n\n    return false;\n  }\n}\n\nasync function imageExists(ecr: AWS.ECR, repositoryName: string, imageTag: string) {\n  try {\n    await ecr.describeImages({ repositoryName, imageIds: [{ imageTag }] }).promise();\n    return true;\n  } catch (e) {\n    if (e.code !== 'ImageNotFoundException') { throw e; }\n    return false;\n  }\n}\n\n/**\n * Return the URI for the repository with the given name\n *\n * Returns undefined if the repository does not exist.\n */\nasync function repositoryUri(ecr: AWS.ECR, repositoryName: string): Promise<string | undefined> {\n  try {\n    const response = await ecr.describeRepositories({ repositoryNames: [repositoryName] }).promise();\n    return (response.repositories || [])[0]?.repositoryUri;\n  } catch (e) {\n    if (e.code !== 'RepositoryNotFoundException') { throw e; }\n    return undefined;\n  }\n}\n"]}
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"container-images.js","sourceRoot":"","sources":["container-images.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAG7B,6CAA2C;AAE3C,sCAAmC;AACnC,kDAAyD;AACzD,oCAAiC;AAEjC,MAAa,0BAA0B;IAGrC,YACmB,OAAe,EACf,KAA+B,EAC/B,IAAkB;QAFlB,YAAO,GAAP,OAAO,CAAQ;QACf,UAAK,GAAL,KAAK,CAA0B;QAC/B,SAAI,GAAJ,IAAI,CAAc;QALpB,WAAM,GAAG,IAAI,eAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAMrF,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,WAAW,GAAG,MAAM,qCAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE,wBAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,0CAAE,SAAS,GAAA,CAAC;QACtF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QAErE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,WAAW,CAAC,cAAc,gBAAgB,MAAM,OAAO,EAAE,iCAAiC,CAAC,CAAC;SACzI;QAED,MAAM,QAAQ,GAAG,GAAG,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;QAEtD,IAAI,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE;YAAE,OAAO;SAAE;QAChF,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO;SAAE;QAElC,wGAAwG;QACxG,8DAA8D;QAC9D,uFAAuF;QACvF,oGAAoG;QACpG,4FAA4F;QAC5F,IAAI,8BAA8B,GAAG,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QAC3E,IAAI,CAAC,8BAA8B,EAAE;YAAE,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAAE;QAEtE,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU;YAC/C,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7D,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAErC,IAAI,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACnD,OAAO;SACR;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,MAAM,EAAE,QAAQ,QAAQ,EAAE,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO;SAAE;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAE9C,IAAI,8BAA8B,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC9B;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,mBAAmB;QAC/B,MAAM,YAAY,GAAG,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QAEvE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE;YAC7C,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAAE,OAAO,SAAS,CAAC;aAAE;YAE5C,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,kBAAkB,CAAC,UAAoB,EAAE,GAAY;QAEjE,MAAM,SAAS,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,IAAI,CAAC,OAAO,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,KAAK,EAAE,wCAAwC,UAAU,GAAG,CAAC,CAAC;QAC9F,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO,SAAS,CAAC;SAAE;QAE5C,OAAO,CAAC,MAAM,aAAK,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3E,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,wBAAwB,CAAC,GAAY,EAAE,WAAmC,EAAE,QAAgB;QACxG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC,CAAC;QAC5D,IAAI,MAAM,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE;YAC5E,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,YAAoB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,iEAAiE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC5G;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,KAAK,EAAE,4BAA4B,QAAQ,EAAE,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACtB,SAAS,EAAE,QAAQ;YACnB,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,MAAM,CAAC,eAAe;YACjC,MAAM,EAAE,MAAM,CAAC,iBAAiB;YAChC,IAAI,EAAE,MAAM,CAAC,UAAU;SACxB,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,YAAoB;QAC9C,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAS,CAAC,MAAM,EAAE,UAAU,YAAY,EAAE,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAjID,gEAiIC;AAED,KAAK,UAAU,WAAW,CAAC,GAAY,EAAE,cAAsB,EAAE,QAAgB;IAC/E,IAAI;QACF,MAAM,GAAG,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QACjF,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,CAAC,IAAI,KAAK,wBAAwB,EAAE;YAAE,MAAM,CAAC,CAAC;SAAE;QACrD,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,GAAY,EAAE,cAAsB;;IAC/D,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,oBAAoB,CAAC,EAAE,eAAe,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QACjG,aAAO,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,aAAa,CAAC;KACxD;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,CAAC,IAAI,KAAK,6BAA6B,EAAE;YAAE,MAAM,CAAC,CAAC;SAAE;QAC1D,OAAO,SAAS,CAAC;KAClB;AACH,CAAC","sourcesContent":["import * as path from 'path';\nimport { DockerImageDestination } from '@aws-cdk/cloud-assembly-schema';\nimport { DockerImageManifestEntry } from '../../asset-manifest';\nimport { EventType } from '../../progress';\nimport { IAssetHandler, IHandlerHost } from '../asset-handler';\nimport { Docker } from '../docker';\nimport { replaceAwsPlaceholders } from '../placeholders';\nimport { shell } from '../shell';\n\nexport class ContainerImageAssetHandler implements IAssetHandler {\n  private readonly docker = new Docker(m => this.host.emitMessage(EventType.DEBUG, m));\n\n  constructor(\n    private readonly workDir: string,\n    private readonly asset: DockerImageManifestEntry,\n    private readonly host: IHandlerHost) {\n  }\n\n  public async publish(): Promise<void> {\n    const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);\n    const ecr = await this.host.aws.ecrClient(destination);\n    const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId;\n    const repoUri = await repositoryUri(ecr, destination.repositoryName);\n\n    if (!repoUri) {\n      throw new Error(`No ECR repository named '${destination.repositoryName}' in account ${await account()}. Is this account bootstrapped?`);\n    }\n\n    const imageUri = `${repoUri}:${destination.imageTag}`;\n\n    if (await this.destinationAlreadyExists(ecr, destination, imageUri)) { return; }\n    if (this.host.aborted) { return; }\n\n    // Default behavior is to login before build so that the Dockerfile can reference images in the ECR repo\n    // However, if we're in a pipelines environment (for example),\n    // we may have alternative credentials to the default ones to use for the build itself.\n    // If the special config file is present, delay the login to the default credentials until the push.\n    // If the config file is present, we will configure and use those credentials for the build.\n    let cdkDockerCredentialsConfigured = this.docker.configureCdkCredentials();\n    if (!cdkDockerCredentialsConfigured) { await this.docker.login(ecr); }\n\n    const localTagName = this.asset.source.executable\n      ? await this.buildExternalAsset(this.asset.source.executable)\n      : await this.buildDirectoryAsset();\n\n    if (localTagName === undefined || this.host.aborted) {\n      return;\n    }\n\n    this.host.emitMessage(EventType.UPLOAD, `Push ${imageUri}`);\n    if (this.host.aborted) { return; }\n    await this.docker.tag(localTagName, imageUri);\n\n    if (cdkDockerCredentialsConfigured) {\n      this.docker.resetAuthPlugins();\n      await this.docker.login(ecr);\n    }\n\n    await this.docker.push(imageUri);\n  }\n\n  /**\n   * Build a (local) Docker asset from a directory with a Dockerfile\n   *\n   * Tags under a deterministic, unique, local identifier wich will skip\n   * the build if it already exists.\n   */\n  private async buildDirectoryAsset(): Promise<string | undefined> {\n    const localTagName = `cdkasset-${this.asset.id.assetId.toLowerCase()}`;\n\n    if (!(await this.isImageCached(localTagName))) {\n      if (this.host.aborted) { return undefined; }\n\n      await this.buildImage(localTagName);\n    }\n\n    return localTagName;\n  }\n\n  /**\n   * Build a (local) Docker asset by running an external command\n   *\n   * External command is responsible for deduplicating the build if possible,\n   * and is expected to return the generated image identifier on stdout.\n   */\n  private async buildExternalAsset(executable: string[], cwd?: string): Promise<string | undefined> {\n\n    const assetPath = cwd ?? this.workDir;\n\n    this.host.emitMessage(EventType.BUILD, `Building Docker image using command '${executable}'`);\n    if (this.host.aborted) { return undefined; }\n\n    return (await shell(executable, { cwd: assetPath, quiet: true })).trim();\n  }\n\n  /**\n   * Check whether the image already exists in the ECR repo\n   *\n   * Use the fields from the destination to do the actual check. The imageUri\n   * should correspond to that, but is only used to print Docker image location\n   * for user benefit (the format is slightly different).\n   */\n  private async destinationAlreadyExists(ecr: AWS.ECR, destination: DockerImageDestination, imageUri: string): Promise<boolean> {\n    this.host.emitMessage(EventType.CHECK, `Check ${imageUri}`);\n    if (await imageExists(ecr, destination.repositoryName, destination.imageTag)) {\n      this.host.emitMessage(EventType.FOUND, `Found ${imageUri}`);\n      return true;\n    }\n\n    return false;\n  }\n\n  private async buildImage(localTagName: string): Promise<void> {\n    const source = this.asset.source;\n    if (!source.directory) {\n      throw new Error(`'directory' is expected in the DockerImage asset source, got: ${JSON.stringify(source)}`);\n    }\n\n    const fullPath = path.resolve(this.workDir, source.directory);\n    this.host.emitMessage(EventType.BUILD, `Building Docker image at ${fullPath}`);\n\n    await this.docker.build({\n      directory: fullPath,\n      tag: localTagName,\n      buildArgs: source.dockerBuildArgs,\n      target: source.dockerBuildTarget,\n      file: source.dockerFile,\n    });\n  }\n\n  private async isImageCached(localTagName: string): Promise<boolean> {\n    if (await this.docker.exists(localTagName)) {\n      this.host.emitMessage(EventType.CACHED, `Cached ${localTagName}`);\n      return true;\n    }\n\n    return false;\n  }\n}\n\nasync function imageExists(ecr: AWS.ECR, repositoryName: string, imageTag: string) {\n  try {\n    await ecr.describeImages({ repositoryName, imageIds: [{ imageTag }] }).promise();\n    return true;\n  } catch (e) {\n    if (e.code !== 'ImageNotFoundException') { throw e; }\n    return false;\n  }\n}\n\n/**\n * Return the URI for the repository with the given name\n *\n * Returns undefined if the repository does not exist.\n */\nasync function repositoryUri(ecr: AWS.ECR, repositoryName: string): Promise<string | undefined> {\n  try {\n    const response = await ecr.describeRepositories({ repositoryNames: [repositoryName] }).promise();\n    return (response.repositories || [])[0]?.repositoryUri;\n  } catch (e) {\n    if (e.code !== 'RepositoryNotFoundException') { throw e; }\n    return undefined;\n  }\n}\n"]}
|
|
@@ -4,6 +4,7 @@ exports.FileAssetHandler = void 0;
|
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const cloud_assembly_schema_1 = require("@aws-cdk/cloud-assembly-schema");
|
|
7
|
+
const mime = require("mime");
|
|
7
8
|
const progress_1 = require("../../progress");
|
|
8
9
|
const archive_1 = require("../archive");
|
|
9
10
|
const fs_extra_1 = require("../fs-extra");
|
|
@@ -21,10 +22,11 @@ class FileAssetHandler {
|
|
|
21
22
|
const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`;
|
|
22
23
|
const s3 = await this.host.aws.s3Client(destination);
|
|
23
24
|
this.host.emitMessage(progress_1.EventType.CHECK, `Check ${s3Url}`);
|
|
25
|
+
const bucketInfo = BucketInformation.for(this.host);
|
|
24
26
|
// A thunk for describing the current account. Used when we need to format an error
|
|
25
27
|
// message, not in the success case.
|
|
26
|
-
const account = async () => { var _a; return (_a = (await this.host.aws.
|
|
27
|
-
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)) {
|
|
28
30
|
case BucketOwnership.MINE:
|
|
29
31
|
break;
|
|
30
32
|
case BucketOwnership.DOES_NOT_EXIST:
|
|
@@ -36,20 +38,42 @@ class FileAssetHandler {
|
|
|
36
38
|
this.host.emitMessage(progress_1.EventType.FOUND, `Found ${s3Url}`);
|
|
37
39
|
return;
|
|
38
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, `ACCES_DENIED for getting encryption of bucket '${destination.bucketName}'. Either wrong account ${await account()} or s3:GetEncryptionConfiguration not set for cdk role. Try "cdk bootstrap" again.`);
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
39
61
|
if (this.host.aborted) {
|
|
40
62
|
return;
|
|
41
63
|
}
|
|
42
64
|
const publishFile = this.asset.source.executable ?
|
|
43
65
|
await this.externalPackageFile(this.asset.source.executable) : await this.packageFile(this.asset.source);
|
|
44
66
|
this.host.emitMessage(progress_1.EventType.UPLOAD, `Upload ${s3Url}`);
|
|
45
|
-
|
|
67
|
+
const params = Object.assign({}, {
|
|
46
68
|
Bucket: destination.bucketName,
|
|
47
69
|
Key: destination.objectKey,
|
|
48
70
|
Body: fs_1.createReadStream(publishFile.packagedPath),
|
|
49
71
|
ContentType: publishFile.contentType,
|
|
50
|
-
})
|
|
72
|
+
}, paramsEncryption);
|
|
73
|
+
await s3.upload(params).promise();
|
|
51
74
|
}
|
|
52
75
|
async packageFile(source) {
|
|
76
|
+
var _a;
|
|
53
77
|
if (!source.path) {
|
|
54
78
|
throw new Error(`'path' is expected in the File asset source, got: ${JSON.stringify(source)}`);
|
|
55
79
|
}
|
|
@@ -67,7 +91,8 @@ class FileAssetHandler {
|
|
|
67
91
|
return { packagedPath, contentType };
|
|
68
92
|
}
|
|
69
93
|
else {
|
|
70
|
-
|
|
94
|
+
const contentType = (_a = mime.getType(fullPath)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
|
|
95
|
+
return { packagedPath: fullPath, contentType };
|
|
71
96
|
}
|
|
72
97
|
}
|
|
73
98
|
async externalPackageFile(executable) {
|
|
@@ -85,21 +110,14 @@ var BucketOwnership;
|
|
|
85
110
|
BucketOwnership[BucketOwnership["MINE"] = 1] = "MINE";
|
|
86
111
|
BucketOwnership[BucketOwnership["SOMEONE_ELSES_OR_NO_ACCESS"] = 2] = "SOMEONE_ELSES_OR_NO_ACCESS";
|
|
87
112
|
})(BucketOwnership || (BucketOwnership = {}));
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}
|
|
97
|
-
if (['AccessDenied', 'AllAccessDisabled'].includes(e.code)) {
|
|
98
|
-
return BucketOwnership.SOMEONE_ELSES_OR_NO_ACCESS;
|
|
99
|
-
}
|
|
100
|
-
throw e;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
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 = {}));
|
|
103
121
|
async function objectExists(s3, bucket, key) {
|
|
104
122
|
/*
|
|
105
123
|
* The object existence check here refrains from using the `headObject` operation because this
|
|
@@ -115,4 +133,83 @@ async function objectExists(s3, bucket, key) {
|
|
|
115
133
|
const response = await s3.listObjectsV2({ Bucket: bucket, Prefix: key, MaxKeys: 1 }).promise();
|
|
116
134
|
return response.Contents != null && response.Contents.some(object => object.Key === key);
|
|
117
135
|
}
|
|
118
|
-
//# 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 { 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      return { packagedPath: fullPath };\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, `ACCES_DENIED for getting encryption of bucket '${destination.bucketName}'. Either wrong account ${await account()} or s3:GetEncryptionConfiguration not set for cdk role. Try \"cdk bootstrap\" again.`);\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}"]}
|