From e32c0f361c9919dfe5dd86dbc50ccdd078c45103 Mon Sep 17 00:00:00 2001
From: Shlok Amin <shlokamin@me.com>
Date: Thu, 24 Oct 2024 11:38:33 -0400
Subject: [PATCH] fix(scripts): make aws deploy scripts work with new sdk
 (#16586)

closes AUTH-979
---
 scripts/deploy/lib/copyObject.js   | 35 ++++++++++++++++++++----------
 scripts/deploy/lib/removeObject.js | 27 ++++++++++++++++-------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/scripts/deploy/lib/copyObject.js b/scripts/deploy/lib/copyObject.js
index 1735cb4a55e..63418067b40 100644
--- a/scripts/deploy/lib/copyObject.js
+++ b/scripts/deploy/lib/copyObject.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const mime = require('mime')
+const { CopyObjectCommand } = require('@aws-sdk/client-s3')
 
 // TODO(mc, 2019-07-16): optimize cache values
 const getCopyParams = obj => ({
@@ -12,7 +13,7 @@ const getCopyParams = obj => ({
 /**
  * Copy an object to an S3 bucket
  *
- * @param {S3} s3 - AWS.S3 instance
+ * @param {S3Client} s3 - AWS SDK v3 S3Client instance
  * @param {S3Object} sourceObj - Object to copy
  * @param {string} destBucket - Destination bucket
  * @param {string} [destPath] - Destination bucket folder (root if unspecified)
@@ -21,10 +22,10 @@ const getCopyParams = obj => ({
  *
  * @typedef S3Object
  * @property {string} Bucket - Object bucket
- * @property {String} Prefix - Deploy folder in bucket
+ * @property {string} Prefix - Deploy folder in bucket
  * @property {string} Key - Full key to object
  */
-module.exports = function copyObject(
+module.exports = async function copyObject(
   s3,
   sourceObj,
   destBucket,
@@ -37,18 +38,28 @@ module.exports = function copyObject(
   const copyParams = getCopyParams(sourceObj)
 
   console.log(
-    `${dryrun ? 'DRYRUN: ' : ''}Copy
-    Source: ${copySource}
-    Dest: /${destBucket}/${destKey}
-    Params: ${JSON.stringify(copyParams)}\n`
+    `${
+      dryrun ? 'DRYRUN: ' : ''
+    }Copy\nSource: ${copySource}\nDest: /${destBucket}/${destKey}\nParams: ${JSON.stringify(
+      copyParams
+    )}\n`
   )
 
   if (dryrun) return Promise.resolve()
 
-  const copyObjectParams = Object.assign(
-    { Bucket: destBucket, Key: destKey, CopySource: copySource },
-    copyParams
-  )
+  const copyObjectParams = {
+    Bucket: destBucket,
+    Key: destKey,
+    CopySource: copySource,
+    ...copyParams,
+  }
 
-  return s3.copyObject(copyObjectParams).promise()
+  try {
+    const command = new CopyObjectCommand(copyObjectParams)
+    await s3.send(command)
+    console.log(`Successfully copied to /${destBucket}/${destKey}`)
+  } catch (err) {
+    console.error(`Error copying object: ${err.message}`)
+    throw err
+  }
 }
diff --git a/scripts/deploy/lib/removeObject.js b/scripts/deploy/lib/removeObject.js
index 56bd309a6eb..728d8927496 100644
--- a/scripts/deploy/lib/removeObject.js
+++ b/scripts/deploy/lib/removeObject.js
@@ -1,9 +1,11 @@
 'use strict'
 
+const { DeleteObjectCommand } = require('@aws-sdk/client-s3');
+
 /**
  * Remove an object from S3
  *
- * @param {AWS.S3} s3 - AWS.S3 instance
+ * @param {S3Client} s3 - S3Client instance
  * @param {S3Object} obj - Object to remove
  * @param {boolean} [dryrun] - Don't actually remove anything
  * @returns {Promise} Promise that resolves when the removal is complete
@@ -13,13 +15,22 @@
  * @property {String} Prefix - Deploy folder in bucket
  * @property {string} Key - Full key to object
  */
-module.exports = function removeObject(s3, obj, dryrun) {
+module.exports = async function removeObject(s3, obj, dryrun) {
   console.log(
-    `${dryrun ? 'DRYRUN: ' : ''}Remove
-    Source: /${obj.Bucket}/${obj.Key}\n`
-  )
+    `${dryrun ? 'DRYRUN: ' : ''}Remove\nSource: /${obj.Bucket}/${obj.Key}\n`
+  );
+
+  if (dryrun) return Promise.resolve();
 
-  if (dryrun) return Promise.resolve()
+  // Construct the deleteObject command with the bucket and key
+  const deleteParams = { Bucket: obj.Bucket, Key: obj.Key };
 
-  return s3.deleteObject({ Bucket: obj.Bucket, Key: obj.Key }).promise()
-}
+  try {
+    // Use the send method with DeleteObjectCommand
+    const result = await s3.send(new DeleteObjectCommand(deleteParams));
+    return result;
+  } catch (error) {
+    console.error('Error removing object:', error);
+    throw error;
+  }
+};