boto3-assist 0.9.3__tar.gz → 0.9.4__tar.gz

{boto3_assist-0.9.3 → boto3_assist-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boto3_assist
-Version: 0.9.3
+Version: 0.9.4
 Summary: Additional boto3 wrappers to make your life a little easier
 Author-email: Eric Wilson <boto3-assist@geekcafe.com>
 License-File: LICENSE-EXPLAINED.txt

{boto3_assist-0.9.3 → boto3_assist-0.9.4}/pyproject.toml

@@ -7,7 +7,7 @@ packages = ["src/boto3_assist"]
 
 [project]
 name = "boto3_assist"
-version = "0.9.3"
+version = "0.9.4"
 
 authors = [
   { name="Eric Wilson", email="boto3-assist@geekcafe.com" }

{boto3_assist-0.9.3 → boto3_assist-0.9.4}/src/boto3_assist/errors/custom_exceptions.py

@@ -32,3 +32,15 @@ class InvalidRoutePath(Exception):
             "message": message,
         }
         super().__init__(self.message)
+
+
+class FileNotFound(Exception):
+    """File Not Found Error"""
+
+    def __init__(self, message="File Not Found"):
+        """Invalid Route"""
+        self.message = {
+            "status_code": 404,
+            "message": message,
+        }
+        super().__init__(self.message)

{boto3_assist-0.9.3 → boto3_assist-0.9.4}/src/boto3_assist/s3/s3_object.py

@@ -18,7 +18,7 @@ from boto3_assist.s3.s3_connection import S3Connection
 from boto3_assist.utilities.datetime_utility import DatetimeUtility
 from boto3_assist.utilities.file_operations import FileOperations
 from boto3_assist.utilities.http_utility import HttpUtility
-
+from boto3_assist.errors.custom_exceptions import FileNotFound
 
 logger = Logger(child=True)
 
@@ -462,15 +462,28 @@ class S3Object:
 
         except Exception as e:  # pylint: disable=W0718
             error = str(e)
-            logger.error({"metric_filter": "s3_download_error", "error": str(e)})
-            raise RuntimeError(
-                {
-                    "metric_filter": "s3_download_error",
-                    "error": str(e),
-                    "bucket": bucket_name,
-                    "key": key,
-                }
-            ) from e
+            error_info = {
+                "metric_filter": "s3_download_error",
+                "error": str(e),
+                "bucket": bucket_name,
+                "key": key,
+            }
+
+            logger.error(error_info)
+            # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3/client/get_object.html
+            error = str(e)
+            if "An error occurred (AccessDenied)" in error:
+                if (
+                    "is not authorized to perform: s3:ListBucket on resource" in error
+                    and "because no identity-based policy allows the s3:ListBucket action"
+                    in error
+                ):
+                    # the file is not found but you're getting a access error since you don't
+                    # have s3:ListBucket.  To make life easier, we're just going to return a 404 error
+                    raise FileNotFound("File Not Found") from e
+
+            # last ditch
+            raise RuntimeError(error_info) from e
 
         finally:
             logger.debug(

boto3_assist-0.9.4/src/boto3_assist/version.py

@@ -0,0 +1 @@
+__version__ = '0.9.4'

boto3_assist-0.9.3/src/boto3_assist/version.py

@@ -1 +0,0 @@
-__version__ = '0.9.3'