From f008965527554a948ef1094e682461789ab41794 Mon Sep 17 00:00:00 2001
From: Andy Dunstall <andydunstall@hotmail.co.uk>
Date: Tue, 10 Oct 2023 13:03:46 +0100
Subject: [PATCH] feat(aws): s3 snapshot error handling (#2002)

* feat(s3): support bucket only dir

* feat(s3): improve error handling

* chore: update helio
---
 helio                                 |  2 +-
 src/server/detail/snapshot_storage.cc | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/helio b/helio
index 0950c8fd6..2d447ea39 160000
--- a/helio
+++ b/helio
@@ -1 +1 @@
-Subproject commit 0950c8fd612bba442caffdabd86d67a32246d461
+Subproject commit 2d447ea39da78d0ec0003e812c306f2846e8e727
diff --git a/src/server/detail/snapshot_storage.cc b/src/server/detail/snapshot_storage.cc
index 742e95734..40ac6ac70 100644
--- a/src/server/detail/snapshot_storage.cc
+++ b/src/server/detail/snapshot_storage.cc
@@ -35,8 +35,9 @@ std::optional<std::pair<std::string, std::string>> GetBucketPath(std::string_vie
   std::string_view clean = absl::StripPrefix(path, kS3Prefix);
 
   size_t pos = clean.find('/');
-  if (pos == std::string_view::npos)
-    return std::nullopt;
+  if (pos == std::string_view::npos) {
+    return std::make_pair(std::string(clean), "");
+  }
 
   std::string bucket_name{clean.substr(0, pos)};
   std::string obj_path{clean.substr(pos + 1)};
@@ -183,6 +184,7 @@ AwsS3SnapshotStorage::AwsS3SnapshotStorage(const std::string& endpoint, bool ec2
     // S3ClientConfiguration may request configuration and credentials from
     // EC2 metadata so must be run in a proactor thread.
     Aws::S3::S3ClientConfiguration s3_conf{};
+    LOG(INFO) << "Creating AWS S3 client; region=" << s3_conf.region << "; endpoint=" << endpoint;
     if (!sign_payload) {
       s3_conf.payloadSigningPolicy = Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::ForceNever;
     }
@@ -342,6 +344,24 @@ io::Result<std::vector<std::string>, GenericError> AwsS3SnapshotStorage::ListObj
       for (const auto& object : outcome.GetResult().GetContents()) {
         keys.push_back(object.GetKey());
       }
+    } else if (outcome.GetError().GetExceptionName() == "PermanentRedirect") {
+      return nonstd::make_unexpected(
+          GenericError{"Failed list objects in S3 bucket: Permanent redirect; Ensure your "
+                       "configured AWS region matches the S3 bucket region"});
+    } else if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_BUCKET) {
+      return nonstd::make_unexpected(GenericError{
+          "Failed list objects in S3 bucket: Bucket not found: " + std::string(bucket_name)});
+    } else if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::INVALID_ACCESS_KEY_ID) {
+      return nonstd::make_unexpected(
+          GenericError{"Failed list objects in S3 bucket: Invalid access key ID"});
+    } else if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::SIGNATURE_DOES_NOT_MATCH) {
+      return nonstd::make_unexpected(
+          GenericError{"Failed list objects in S3 bucket: Invalid signature; Check your AWS "
+                       "credentials are correct"});
+    } else if (outcome.GetError().GetExceptionName() == "InvalidToken") {
+      return nonstd::make_unexpected(
+          GenericError{"Failed list objects in S3 bucket: Invalid token; Check your AWS "
+                       "credentials are correct"});
     } else {
       return nonstd::make_unexpected(GenericError{"Failed list objects in S3 bucket: " +
                                                   outcome.GetError().GetExceptionName()});