ember-cli-deploy-s3-index 3.0.0 → 4.0.1

package/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log
 
 
+
+## 4.0.1 (2024-04-03)
+
+#### :rocket: Enhancement
+* Release changes in 4.0.0-0 prerelease.
+* [#134](https://github.com/ember-cli-deploy/ember-cli-deploy-s3-index/pull/134) Optionally ignore ACLs ([@khornberg](https://github.com/khornberg))
+
+#### Committers: 1
+- Kyle Hornberg ([@khornberg](https://github.com/khornberg))
+
+
+## 4.0.0-0 (2023-08-28)
+
+Pre-release to verify aws sdk update
+
 ## 3.0.0 (2023-05-16)
 
 #### :boom: Breaking Change
@@ -17,6 +32,8 @@
 - Kelvin Luck ([@vitch](https://github.com/vitch))
 - Luke Melia ([@lukemelia](https://github.com/lukemelia))
 
+## 2.0.0 There was no 2.0
+
 ## [v1.0.1](https://github.com/ember-cli-deploy/ember-cli-deploy-s3-index/tree/v1.0.1)
 [Full Changelog](https://github.com/ember-cli-deploy/ember-cli-deploy-s3-index/compare/v1.0.0...v1.0.1)
 

package/README.md

@@ -110,6 +110,8 @@ A file matching this pattern will be uploaded to S3. The active key in S3 will b
 
 The ACL to apply to the objects.
 
+Set to `false` to not apply any ACLs.
+
 *Default:* `'public-read'`
 
 ### cacheControl
@@ -140,9 +142,9 @@ A flag to specify whether the revision should be overwritten if it already exist
 
 The underlying S3 library used to upload the files to S3. This allows the user to use the default upload client provided by this plugin but switch out the underlying library that is used to actually send the files.
 
-The client specified MUST implement functions called `getObject` and `putObject`.
+The client specified MUST implement functions called `getObject` and `putObject`. See [Using V2 API] (https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/welcome.html#using_v2_commands).
 
-*Default:* the default S3 library is `aws-sdk`
+*Default:* the default S3 library is `@aws-sdk/s3-client` (AWS JS SDK v3). Please use this addon version < 3.0.0 if you want to use AWS JS SDK 2.0 
 
 ### endpoint
 
@@ -151,7 +153,7 @@ or Openstack Swift
 
 If `endpoint` set the `region` option will be ignored.
 
-*Default:* `[region].s3.amazonaws.com` 
+*Default:* `[region].s3.amazonaws.com`
 
 
 ### serverSideEncryption
@@ -334,4 +336,4 @@ If you'd like to be able to preview a deployed revision before activation, you'l
 [4]: https://github.com/ember-cli-deploy/ember-cli-deploy-build "ember-cli-deploy-build"
 [5]: https://github.com/ember-cli/ember-cli-deploy "ember-cli-deploy"
 [6]: https://github.com/ember-cli-deploy/ember-cli-deploy-revision-data "ember-cli-deploy-revision-data"
-[7]: https://docs.aws.amazon.com/AWSJavaScriptSDK/guide/node-configuring.html#Setting_AWS_Credentials "Setting AWS Credentials"
+[7]: https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/loading-node-credentials-shared.html "Setting AWS Credentials"

package/index.js

@@ -66,7 +66,6 @@ module.exports = {
         var options = {
           bucket: bucket,
           prefix: prefix,
-          acl: acl,
           cacheControl: cacheControl,
           filePattern: filePattern,
           filePath: filePath,
@@ -77,6 +76,10 @@ module.exports = {
           urlEncodeSourceObject: urlEncodeSourceObject
         };
 
+        if (acl) {
+          options.acl = acl;
+        }
+
         if (serverSideEncryption) {
           options.serverSideEncryption = serverSideEncryption;
         }
@@ -99,12 +102,15 @@ module.exports = {
         var options = {
           bucket: bucket,
           prefix: prefix,
-          acl: acl,
           filePattern: filePattern,
           revisionKey: revisionKey,
           urlEncodeSourceObject: urlEncodeSourceObject,
         };
 
+        if (acl) {
+          options.acl = acl;
+        }
+
         if (serverSideEncryption) {
           options.serverSideEncryption = serverSideEncryption;
         }

package/lib/s3.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var AWS             = require('aws-sdk');
+var { fromIni } = require('@aws-sdk/credential-providers');
+var { S3 } = require('@aws-sdk/client-s3');
 var CoreObject      = require('core-object');
 var RSVP            = require('rsvp');
 var fs              = require('fs');
@@ -31,20 +32,31 @@ module.exports = CoreObject.extend({
     var config = plugin.pluginConfig;
     var profile = plugin.readConfig('profile');
     var endpoint = plugin.readConfig('endpoint');
+    var credentials;
 
     this._plugin = plugin;
 
-    if (profile && !this._plugin.readConfig('s3Client')) {
-      this._plugin.log('Using AWS profile from config', { verbose: true });
-      AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile: profile });
+    var providedS3Client = plugin.readConfig("s3Client");
+    
+
+    if (profile && !providedS3Client) {
+      this._plugin.log("Using AWS profile from config", { verbose: true });
+      credentials = fromIni({ profile: profile });
     }
 
     if (endpoint) {
-      this._plugin.log('Using endpoint from config', { verbose: true });
-      AWS.config.endpoint = new AWS.Endpoint(endpoint);
+      this._plugin.log('Using endpoint from config', { verbose: true });      
     }
 
-    this._client = plugin.readConfig('s3Client') || new AWS.S3(config);
+    this._client = providedS3Client || new S3(config);
+  
+    if (endpoint) {
+      this._client.config.endpoint = endpoint;
+    }
+    if (credentials) {
+      this._client.config.credentials = credentials;
+    }
+    
   },
 
   upload: function(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-deploy-s3-index",
-  "version": "3.0.0",
+  "version": "4.0.1",
   "description": "Ember CLI Deploy plugin to deploy ember-cli's bootstrap index file to S3.",
   "keywords": [
     "ember-addon",
@@ -18,7 +18,8 @@
     "test": "node tests/runner.js && ./node_modules/.bin/eslint index.js lib/* tests/**/*.js"
   },
   "dependencies": {
-    "aws-sdk": "^2.667.0",
+    "@aws-sdk/client-s3": "^3.385.0",
+    "@aws-sdk/credential-providers": "^3.391.0",
     "core-object": "^3.0.0",
     "ember-cli-deploy-plugin": "^0.2.9",
     "mime-types": "^2.1.27",