Merge pull request #263 from nationalarchives/fix/correct-uri-formats…

…-for-s3

(Fix) When moving & retreiving items in S3, strip the leading slash from keys

judgments/utils.py

@@ -101,10 +101,14 @@ def set_metadata(old_uri, new_uri):
 def copy_assets(old_uri, new_uri):
     client = create_s3_client()
     bucket = env("PRIVATE_ASSET_BUCKET")
+    old_uri = old_uri.lstrip("/")
+    new_uri = new_uri.lstrip("/")
+
     response = client.list_objects(Bucket=bucket, Prefix=old_uri)
+
     for result in response.get("Contents", []):
         old_key = str(result["Key"])
-        new_key = build_new_key(old_key, new_uri.lstrip("/"))
+        new_key = build_new_key(old_key, new_uri)
         if new_key is not None:
             try:
                 source = {"Bucket": bucket, "Key": old_key}

judgments/views.py

@@ -425,6 +425,7 @@ def generate_docx_url(uri: str):
         return ""
 
     client = create_s3_client()
+    uri = uri.lstrip("/")
 
     key = f'{uri}/{uri.replace("/", "_")}.docx'
 
@@ -439,6 +440,7 @@ def generate_pdf_url(uri: str):
         return ""
 
     client = create_s3_client()
+    uri = uri.lstrip("/")
 
     key = f'{uri}/{uri.replace("/", "_")}.pdf'