Changes to pass along all s3 putOption config options.

README.md

@@ -88,7 +88,7 @@ Here are the properties available in the config file:
 - `port` (optional): The port to run the import-map-deployer on. Defaults to 5000.
 - `region` (optional): The [AWS region](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html) to be used when retrieving and updating the import map.
   This can also be specified via the [AWS_DEFAULT_REGION environment variable](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html), which is the preferred method.
-- `cannedACL` (optional): The [S3 Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to be used when updating the import map.This value should be a string and it is validated against the list of values in the link above. This defaults to 'public-read'.
+- `s3.putObject` (optional): The s3.putObject is an object that is merged with the default putObject parameters. This can contain and override any of of the valid request options, such as ACL, encoding, SSE, etc. The sdk options can be found [here](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#putObject-property).
 - `s3Endpoint` (optional): The url for aws-sdk to call when interacting with S3. Defaults to AWS' default domain, but can be configured for
   Digital Ocean Spaces or other S3-compatible APIs.
 - `readManifest(env)` (optional): A javascript function that will be called to read the import map. One argument is provided, a string `env` indicating

examples/ci-for-import-map-deployer/gitlab-aws-ecs/conf.js

@@ -2,7 +2,11 @@ module.exports = {
   username: process.env.HTTP_USERNAME,
   password: process.env.HTTP_PASSWORD,
   region: process.env.AWS_DEFAULT_REGION || "us-east-2",
-  cannedACL: process.env.AWS_CANNED_ACL || "public-read",
+  s3: {
+    putObject: {
+      ACL: process.env.AWS_CANNED_ACL || "public-read",
+    },
+  },
   manifestFormat: "importmap",
   locations: {
     stage: process.env.STAGING_S3_OBJECT_URL,

src/io-methods/s3.js

@@ -21,15 +21,9 @@ function parseFilePath(filePath) {
   };
 }
 
-const validCannedACLs = [
-  // See: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl
-  "private", "public-read", "public-read-write", "aws-exec-read", "authenticated-read",
-  "bucket-owner-read", "bucket-owner-full-control", "log-delivery-write"
-];
-
-let cannedACL = "public-read";
-if (config && config.cannedACL && validCannedACLs.indexOf(config.cannedACL) !== -1) {
-  cannedACL = config.cannedACL;
+let s3PutObjectConfig = {};
+if (config && config.s3 && config.s3.putObject) {
+  s3PutObjectConfig = { ...config.s3.putObject };
 }
 
 const s3 = new aws.S3({
@@ -65,7 +59,8 @@ exports.writeManifest = function (filePath, data) {
         Body: data,
         ContentType: "application/json",
         CacheControl: "public, must-revalidate, max-age=0",
-        ACL: cannedACL,
+        ACL: "public-read",
+        ...s3PutObjectConfig
       },
       function (err) {
         if (err) reject(err);
@@ -88,7 +83,8 @@ exports.writeManifest = function (filePath, data) {
           Body: jsHelpers.createJsString(data),
           ContentType: "application/javascript",
           CacheControl: "public, must-revalidate, max-age=0",
-          ACL: cannedACL,
+          ACL: "public-read",
+          ...s3PutObjectConfig
         },
         function (err) {
           if (err) reject(err);