Merge pull request #138 from saravanak/aws-sdk-v3-upgrade

Fixes #137 AWS sdk v3 upgrade

Author: lukemelia

.gitignore

@@ -15,3 +15,5 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
+
+.tool-versions

README.md

@@ -140,9 +140,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
 
@@ -334,4 +334,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"

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.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-deploy-s3-index",
-  "version": "3.0.0",
+  "version": "4.0.0-0",
   "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",

tests/unit/lib/s3-test.js

@@ -35,7 +35,8 @@ describe('s3', function() {
       copyObject: function(params, cb) {
         copyParams = params;
         cb();
-      }
+      },
+      config: {}
     };
     mockUi = {
       messages: [],
@@ -222,7 +223,7 @@ describe('s3', function() {
       var promise = subject.upload(options);
       return assert.isFulfilled(promise)
         .then(function() {
-          assert.equal(require('aws-sdk').config.endpoint.host, endpoint, 'Endpoint in SDK is correct');
+          assert.equal(s3Client.config.endpoint, endpoint, 'Endpoint in SDK is correct');
           assert.equal(mockUi.messages[0], '- Using endpoint from config', 'Prefix is included in log output');
         });
     });