aws sdk v3 (#1936)

* update to v3 aws-sdk libs

* npx aws-sdk-js-codemod@latest -t v2-to-v3 .

* clean up

* get tests passing

* yarn run lint:js:fix

Author: jagthedrummer

lib/cloudfront.js

@@ -9,7 +9,10 @@ module.exports = CoreObject.extend({
     this._super();
     this._plugin = options.plugin;
 
-    var AWS = require('aws-sdk');
+    const { fromIni } = require('@aws-sdk/credential-providers');
+
+    const { CloudFront } = require('@aws-sdk/client-cloudfront');
+
     const accessKeyId = this._plugin.readConfig('accessKeyId');
     const secretAccessKey = this._plugin.readConfig('secretAccessKey');
     const profile = this._plugin.readConfig('profile');
@@ -23,18 +26,19 @@ module.exports = CoreObject.extend({
     }
 
     if (accessKeyId && secretAccessKey) {
-      awsOptions.accessKeyId = accessKeyId;
-      awsOptions.secretAccessKey = secretAccessKey;
+      awsOptions.credentials = {
+        accessKeyId: accessKeyId,
+        secretAccessKey: secretAccessKey,
+      };
     }
 
     if (profile) {
       this._plugin.log('Using AWS profile from config', { verbose: true });
-      AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile });
+      awsOptions.credentials = fromIni({ profile: profile });
     }
 
     this._client =
-      this._plugin.readConfig('cloudfrontClient') ||
-      new AWS.CloudFront(awsOptions);
+      this._plugin.readConfig('cloudfrontClient') || new CloudFront(awsOptions);
   },
 
   invalidate: function (options) {

package.json

@@ -19,7 +19,8 @@
     "test": "node tests/runner.js"
   },
   "dependencies": {
-    "aws-sdk": "^2.458.0",
+    "@aws-sdk/client-cloudfront": "^3.855.0",
+    "@aws-sdk/credential-providers": "^3.855.0",
     "core-object": "^3.1.5",
     "ember-cli-deploy-plugin": "~0.2.9",
     "rsvp": "^4.8.3",

tests/lib/cloudfront-test.js

@@ -56,8 +56,8 @@ describe('cloudfront', function () {
       });
 
       it('uses the AWS client', function () {
-        var AWS = require('aws-sdk');
-        assert.ok(subject._client instanceof AWS.CloudFront);
+        var { CloudFront } = require('@aws-sdk/client-cloudfront');
+        assert.ok(subject._client instanceof CloudFront);
       });
 
       context('with credentials in plugin config', function () {
@@ -74,14 +74,11 @@ describe('cloudfront', function () {
         });
 
         it('uses the configured credentials', function () {
-          assert.equal(
-            'set_via_config',
-            subject._client.config.credentials.accessKeyId
-          );
-          assert.equal(
-            'set_via_config',
-            subject._client.config.credentials.secretAccessKey
-          );
+          let promise = subject._client.config.credentials();
+          return assert.isFulfilled(promise).then(function (credentials) {
+            assert.equal('set_via_config', credentials.accessKeyId);
+            assert.equal('set_via_config', credentials.secretAccessKey);
+          });
         });
       });
 
@@ -92,14 +89,11 @@ describe('cloudfront', function () {
         });
 
         it('falls back to default AWS credential resolution', function () {
-          assert.equal(
-            'set_via_env_var',
-            subject._client.config.credentials.accessKeyId
-          );
-          assert.equal(
-            'set_via_env_var',
-            subject._client.config.credentials.secretAccessKey
-          );
+          let promise = subject._client.config.credentials();
+          return assert.isFulfilled(promise).then(function (credentials) {
+            assert.equal('set_via_env_var', credentials.accessKeyId);
+            assert.equal('set_via_env_var', credentials.secretAccessKey);
+          });
         });
       });
     });