Improve HTTP failure messages

Author: sampsapenna

swift_upload_runner/api.py

@@ -132,7 +132,7 @@ async def handle_get_object_chunk(
         # thus, reducing said 1 from the resulting chunk number
         chunk_number = int(request.query["resumableChunkNumber"]) - 1
     except KeyError:
-        raise aiohttp.web.HTTPBadRequest(reason="Malformed query string.")
+        raise aiohttp.web.HTTPBadRequest(reason="Malformed query string")
 
     upload_session = await get_upload_instance(
         request,

swift_upload_runner/auth.py

@@ -98,7 +98,7 @@ async def handle_validate_authentication(
         path = request.url.path
     except KeyError:
         raise aiohttp.web.HTTPUnauthorized(
-            reason="Query string missing validity or signature."
+            reason="Query string missing validity or signature"
         )
 
     await test_signature(

swift_upload_runner/common.py

@@ -49,7 +49,7 @@ def get_session_id(
             return request.query["session"]
         except KeyError:
             raise aiohttp.web.HTTPUnauthorized(
-                reason="Runner session ID missing"
+                reason="Missing runner session ID"
             )
 
 
@@ -110,7 +110,7 @@ async def get_upload_instance(
     try:
         ident = query["resumableIdentifier"]
     except KeyError:
-        raise aiohttp.web.HTTPBadRequest(reason="Malformed query string.")
+        raise aiohttp.web.HTTPBadRequest(reason="Malformed query string")
     try:
         upload_session = request.app[session]["uploads"][pro][cont][ident]
     except KeyError:

swift_upload_runner/download.py

@@ -341,7 +341,7 @@ def _parse_archive_fs(
             print(path)
             # Path of zero means an incorrect input
             if len(path) == 0:
-                raise ValueError("Can't archive files without name.")
+                raise ValueError("Tried to archive a file wihtout a name")
             # Path of > 1 implies a directory in between
             # Create TarInfo for the directory
             if len(path) > 1:

swift_upload_runner/replicate.py

@@ -85,7 +85,7 @@ async def a_create_container(
         ) as resp:
             if resp.status not in {201, 202}:
                 raise aiohttp.web.HTTPForbidden(
-                    reason="Can't create the upload container."
+                    reason="Upload container creation failed"
                 )
         LOGGER.debug(f"Created container {container}")
 
@@ -107,11 +107,11 @@ async def a_sync_object_segments(
         ) as resp:
             if resp.status == 404:
                 raise aiohttp.web.HTTPNotFound(
-                    reason="Couldn't find segment container."
+                    reason="Segment container not found"
                 )
             if resp.status == 403:
                 raise aiohttp.web.HTTPForbidden(
-                    reason="Not allowed to access segment container."
+                    reason="Segment container access not allowed"
                 )
             prefix = manifest.replace(manifest.split('/')[0], "").lstrip('/')
             LOGGER.debug(f"Segment prefix: {prefix}")
@@ -149,7 +149,7 @@ async def a_sync_object_segments(
 
                 if resp_g.status not in {200, 201, 202}:
                     raise aiohttp.web.HTTPNotFound(
-                        reason="Couldn't find segment"
+                        reason="Segment not found"
                     )
                 LOGGER.debug(f"Copying segment {segment}")
                 headers["Content-Length"] = str(length)
@@ -173,7 +173,7 @@ async def a_sync_object_segments(
                         raise aiohttp.web.HTTPRequestTimeout()
                     if resp_p.status not in {201, 202}:
                         raise aiohttp.web.HTTPBadRequest(
-                            reason="Couldn't upload object segment"
+                            reason="Segment upload failed"
                         )
                 LOGGER.debug(f"Success in copying segment {segment}")
 
@@ -202,7 +202,7 @@ async def a_copy_object(
             # If the source object doesn't exist, abort
             if resp_g.status != 200:
                 raise aiohttp.web.HTTPBadRequest(
-                    reason="Couldn't fetch the source object."
+                    reason="Source object fetch failed"
                 )
             LOGGER.debug(f"Got stream handle for {object_name}")
 
@@ -242,7 +242,7 @@ async def a_copy_object(
                         raise aiohttp.web.HTTPRequestTimeout()
                     if resp_p.status not in {201, 202}:
                         raise aiohttp.web.HTTPBadRequest(
-                            reason="Couldn't upload object segment"
+                            reason="Object segment upload failed"
                         )
                 LOGGER.debug(f"Success in copying object {object_name}")
             else:
@@ -271,7 +271,7 @@ async def a_copy_object(
                 ) as resp:
                     if resp.status != 201:
                         raise aiohttp.web.HTTPInternalServerError(
-                            reason="Manifest creation failure."
+                            reason="Object manifest creation failed"
                         )
                 LOGGER.debug(f"Uploaded manifest for {object_name}")
 
@@ -300,7 +300,7 @@ async def a_copy_from_container(self):
                     f"Container fetch failed with status {resp.status}"
                 )
                 raise aiohttp.web.HTTPBadRequest(
-                    reason="Couldn't fetch the source container"
+                    reason="Source container fetch failed"
                 )
             LOGGER.debug("Got container object listing")
             objects = await resp.text()

swift_upload_runner/upload.py

@@ -124,7 +124,7 @@ async def a_create_container(
         ) as resp:
             if resp.status not in {201, 202}:
                 raise aiohttp.web.HTTPForbidden(
-                    reason="Can't create the upload container."
+                    reason="Upload container creation failed"
                 )
 
     async def a_check_container(