@dotcom-tool-kit/upload-assets-to-s3 2.0.10 → 2.0.11
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-assets-to-s3.d.ts","sourceRoot":"","sources":["../../src/tasks/upload-assets-to-s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAE7C,OAAO,GAAG,MAAM,SAAS,CAAA;AAMzB,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uDAAuD,CAAA;AAE9D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,OAAO,sBAAsB,CAAC;IAC/E,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAS7C;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAGpB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrF,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"upload-assets-to-s3.d.ts","sourceRoot":"","sources":["../../src/tasks/upload-assets-to-s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAE7C,OAAO,GAAG,MAAM,SAAS,CAAA;AAMzB,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uDAAuD,CAAA;AAE9D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,OAAO,sBAAsB,CAAC;IAC/E,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAS7C;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAGpB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrF,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBxE"}
|
|
@@ -62,13 +62,19 @@ class UploadAssetsToS3 extends types_1.Task {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
async uploadAssetsToS3(options) {
|
|
65
|
+
var _a, _b;
|
|
65
66
|
// Wrap extensions in braces if there are multiple
|
|
66
67
|
const extensions = options.extensions.includes(',') ? `{${options.extensions}}` : options.extensions;
|
|
67
68
|
const globFile = `**/*${extensions}`;
|
|
68
69
|
const files = glob_1.glob.sync(globFile, { cwd: options.directory });
|
|
69
70
|
const s3 = new aws_sdk_1.default.S3({
|
|
70
|
-
accessKeyId
|
|
71
|
-
|
|
71
|
+
// fallback to default value for accessKeyId if neither accessKeyIdEnvVar or accessKeyId have been provided as options
|
|
72
|
+
accessKeyId:
|
|
73
|
+
/* eslint-disable-next-line */
|
|
74
|
+
process.env[(_a = options.accessKeyIdEnvVar) !== null && _a !== void 0 ? _a : options.accessKeyId],
|
|
75
|
+
secretAccessKey:
|
|
76
|
+
/* eslint-disable-next-line */
|
|
77
|
+
process.env[(_b = options.secretAccessKeyEnvVar) !== null && _b !== void 0 ? _b : options.secretAccessKey]
|
|
72
78
|
});
|
|
73
79
|
await Promise.all(files.map((file) => this.uploadFile(file, options, s3)));
|
|
74
80
|
}
|
|
@@ -76,8 +82,8 @@ class UploadAssetsToS3 extends types_1.Task {
|
|
|
76
82
|
exports.default = UploadAssetsToS3;
|
|
77
83
|
UploadAssetsToS3.description = '';
|
|
78
84
|
UploadAssetsToS3.defaultOptions = {
|
|
79
|
-
accessKeyId:
|
|
80
|
-
secretAccessKey:
|
|
85
|
+
accessKeyId: 'aws_access_hashed_assets',
|
|
86
|
+
secretAccessKey: 'aws_secret_hashed_assets',
|
|
81
87
|
directory: 'public',
|
|
82
88
|
reviewBucket: ['ft-next-hashed-assets-preview'],
|
|
83
89
|
prodBucket: ['ft-next-hashed-assets-prod', 'ft-next-hashed-assets-prod-us'],
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dotcom-tool-kit/upload-assets-to-s3",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.11",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib",
|
|
6
6
|
"scripts": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@dotcom-tool-kit/error": "^2.0.1",
|
|
14
14
|
"@dotcom-tool-kit/logger": "^2.1.2",
|
|
15
|
-
"@dotcom-tool-kit/types": "^2.
|
|
15
|
+
"@dotcom-tool-kit/types": "^2.7.0",
|
|
16
16
|
"aws-sdk": "^2.901.0",
|
|
17
17
|
"glob": "^7.1.6",
|
|
18
18
|
"mime": "^2.5.2",
|