From c93bebb1e57f9809a48e4f76f046ca97cd6ec189 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Fri, 10 May 2019 07:57:53 +0100
Subject: [PATCH] [reactives3client] handle NoSuchKeyException

---
 .../s3thorp/awssdk/ReactiveS3Client.scala     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/net/kemitix/s3thorp/awssdk/ReactiveS3Client.scala b/src/main/scala/net/kemitix/s3thorp/awssdk/ReactiveS3Client.scala
index e98d6f4..b5e70e2 100644
--- a/src/main/scala/net/kemitix/s3thorp/awssdk/ReactiveS3Client.scala
+++ b/src/main/scala/net/kemitix/s3thorp/awssdk/ReactiveS3Client.scala
@@ -4,7 +4,7 @@ import cats.effect.IO
 import net.kemitix.s3thorp.Main.putStrLn
 import net.kemitix.s3thorp.Sync.{Bucket, LocalFile, RemoteKey}
 import software.amazon.awssdk.core.async.AsyncRequestBody
-import software.amazon.awssdk.services.s3.model.{HeadObjectRequest, NoSuchKeyException, PutObjectRequest}
+import software.amazon.awssdk.services.s3.model.{HeadObjectRequest, HeadObjectResponse, PutObjectRequest}
 
 private class ReactiveS3Client
   extends S3Client
@@ -15,15 +15,16 @@ private class ReactiveS3Client
       .bucket(bucket)
       .key(remoteKey)
       .build()
-    try {
-      for {
-        _ <- putStrLn(s"S3:HeadObject: $bucket : $remoteKey")
-        response <- s3Client.headObject(request)
-        _ <- putStrLn(s"  -- ${response.eTag()} : ${response.lastModified()}")
-      } yield Some((response.eTag(), response.lastModified()))
-    } catch {
-      //FIXME: this isn't catching the exception
-      case _: NoSuchKeyException => IO(None)
+    println(s"S3:HeadObject: $bucket : $remoteKey")
+    s3Client.headObject(request).attempt.map {
+      case Right(response) => {
+        println(s"  -- ${response.eTag()} : ${response.lastModified()}")
+        Some((response.eTag(), response.lastModified()))
+      }
+      case Left(_) => {
+        println("  -- Not found in S3")
+        None
+      }
     }
   }