From 131e1dbcfd2d40d57e910a4c896f185ec20659d3 Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon.johnson@ucsf.edu>
Date: Sun, 28 Apr 2024 21:39:42 -0700
Subject: [PATCH] Handle NotFound S3 Response

After the upgrade to AWS SDK V3 the headObject method needed to be
refactored for cases where the key or bucket are missing and S3 returns
a 404. In V3 of the SDK this is a thrown error that much be caught.
---
 lib/s3.js                 | 31 +++++++++++++------------------
 tests/unit/lib/s3-test.js |  4 ++--
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/lib/s3.js b/lib/s3.js
index a503336..b43b205 100644
--- a/lib/s3.js
+++ b/lib/s3.js
@@ -9,20 +9,15 @@ var readFile        = RSVP.denodeify(fs.readFile);
 var mime            = require('mime-types');
 var joinUriSegments = require('./util/join-uri-segments');
 
-function headObject(client, params) {
-  return new RSVP.Promise(function(resolve, reject) {
-    client.headObject(params, function(err, data) {
-      if (err && err.code === 'NotFound') {
-        return resolve();
-      }
-      else if (err) {
-        return reject(err);
-      }
-      else {
-        return resolve(data);
-      }
-    });
-  });
+async function headObject(client, params) {
+  try {
+    return await client.headObject(params);
+  } catch (err) {
+    if (err.name === 'NotFound') {
+      return;
+    }
+    throw err;
+  }
 }
 
 module.exports = CoreObject.extend({
@@ -37,7 +32,7 @@ module.exports = CoreObject.extend({
     this._plugin = plugin;
 
     var providedS3Client = plugin.readConfig("s3Client");
-    
+
 
     if (profile && !providedS3Client) {
       this._plugin.log("Using AWS profile from config", { verbose: true });
@@ -45,18 +40,18 @@ module.exports = CoreObject.extend({
     }
 
     if (endpoint) {
-      this._plugin.log('Using endpoint from config', { verbose: true });      
+      this._plugin.log('Using endpoint from config', { verbose: true });
     }
 
     this._client = providedS3Client || new S3(config);
-  
+
     if (endpoint) {
       this._client.config.endpoint = endpoint;
     }
     if (credentials) {
       this._client.config.credentials = credentials;
     }
-    
+
   },
 
   upload: function(options) {
diff --git a/tests/unit/lib/s3-test.js b/tests/unit/lib/s3-test.js
index 9d499c2..727078a 100644
--- a/tests/unit/lib/s3-test.js
+++ b/tests/unit/lib/s3-test.js
@@ -27,9 +27,9 @@ describe('s3', function() {
         cb(undefined, revisionsData);
       },
 
-      headObject: function(params, cb) {
+      headObject: async function(params, cb) {
         headParams = params;
-        cb(undefined, currentData);
+        return currentData;
       },
 
       copyObject: function(params, cb) {