@dotcom-tool-kit/upload-assets-to-s3 1.0.0-beta.30 → 1.0.0-beta.31

package/lib/tasks/upload-assets-to-s3.d.ts

@@ -1,17 +1,6 @@
 import { Task } from '@dotcom-tool-kit/task';
-export declare type UploadAssetsToS3Options = {
-    accessKeyId: string;
-    secretAccessKey: string;
-    directory: string;
-    bucketByEnv: {
-        review: string[] | string;
-        prod: string[] | string;
-    };
-    destination: string;
-    extensions: string;
-    cacheControl: string;
-};
-export default class UploadAssetsToS3 extends Task<UploadAssetsToS3Options> {
+import { UploadAssetsToS3Options, UploadAssetsToS3Schema } from '@dotcom-tool-kit/types/lib/schema/upload-assets-to-s3';
+export default class UploadAssetsToS3 extends Task<typeof UploadAssetsToS3Schema> {
     static description: string;
     static defaultOptions: UploadAssetsToS3Options;
     run(): Promise<void>;

package/lib/tasks/upload-assets-to-s3.d.ts.map

@@ -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,uBAAuB,CAAA;AAO5C,oBAAY,uBAAuB,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE;QACX,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QACzB,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;KACxB,CAAA;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,uBAAuB,CAAC;IACzE,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAW7C;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3B"}
+{"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,uBAAuB,CAAA;AAM5C,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;CAG3B"}

package/lib/tasks/upload-assets-to-s3.js

@@ -18,10 +18,8 @@ UploadAssetsToS3.defaultOptions = {
     accessKeyId: process.env.aws_access_hashed_assets || '',
     secretAccessKey: process.env.aws_secret_hashed_assets || '',
     directory: 'public',
-    bucketByEnv: {
-        review: 'ft-next-hashed-assets-preview',
-        prod: ['ft-next-hashed-assets-prod', 'ft-next-hashed-assets-prod-us']
-    },
+    reviewBucket: ['ft-next-hashed-assets-preview'],
+    prodBucket: ['ft-next-hashed-assets-prod', 'ft-next-hashed-assets-prod-us'],
     destination: 'hashed-assets/page-kit',
     extensions: 'js,css,map,gz,br,png,jpg,jpeg,gif,webp,svg,ico,json',
     cacheControl: 'public, max-age=31536000, stale-while-revalidate=60, stale-if-error=3600'
@@ -46,8 +44,16 @@ const uploadFile = async (file, options, s3) => {
     const type = getFileType(basename);
     const encoding = getFileEncoding(basename);
     const key = path_1.default.posix.join(options.destination, basename);
-    const { review, prod } = options.bucketByEnv;
-    const bucketByEnv = process.env.NODE_ENV === 'branch' ? review : prod;
+    const params = {
+        Bucket: '',
+        Key: key,
+        Body: fs.createReadStream(file),
+        ACL: 'public-read',
+        ContentType: `${type}; charset=utf-8`,
+        ContentEncoding: encoding,
+        CacheControl: options.cacheControl
+    };
+    const bucketByEnv = process.env.NODE_ENV === 'branch' ? options.reviewBucket : options.prodBucket;
     let currentBucket = '';
     try {
         if (typeof bucketByEnv === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/upload-assets-to-s3",
-  "version": "1.0.0-beta.30",
+  "version": "1.0.0-beta.31",
   "description": "",
   "main": "lib",
   "scripts": {
@@ -10,7 +10,8 @@
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "ISC",
   "dependencies": {
-    "@dotcom-tool-kit/task": "^1.0.0-beta.30",
+    "@dotcom-tool-kit/task": "^1.0.0-beta.31",
+    "@dotcom-tool-kit/types": "^1.0.0-beta.31",
     "aws-sdk": "^2.901.0",
     "glob": "^7.1.6",
     "mime": "^2.5.2"