Fix tests

Assume that the provided `s3Client` conforms to the v3 API to make tests
pass.

Author: Saro

lib/s3.js

@@ -1,9 +1,7 @@
 'use strict';
 
-var AWS             = require('aws-sdk'),
-    {
-      S3
-    } = require("@aws-sdk/client-s3");
+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');
@@ -34,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 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

@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@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');
         });
     });