work in review suggestions

baermat · baermat · commit bf73c2ce29a5 · 2025-04-01T10:24:11.000+02:00
diff --git a/localstack-core/localstack/services/sqs/models.py b/localstack-core/localstack/services/sqs/models.py
@@ -30,7 +30,6 @@
 )
 from localstack.services.sqs.queue import InterruptiblePriorityQueue, InterruptibleQueue
 from localstack.services.sqs.utils import (
-    decode_receipt_handle,
     encode_move_task_handle,
     encode_receipt_handle,
     extract_receipt_handle_info,
@@ -446,7 +445,7 @@ def approx_number_of_messages_delayed(self) -> int:
         return len(self.delayed)
 
     def validate_receipt_handle(self, receipt_handle: str):
-        if self.arn != decode_receipt_handle(receipt_handle):
+        if self.arn != extract_receipt_handle_info(receipt_handle).queue_arn:
             raise ReceiptHandleIsInvalid(
                 f'The input receipt handle "{receipt_handle}" is not a valid receipt handle.'
             )
diff --git a/localstack-core/localstack/services/sqs/utils.py b/localstack-core/localstack/services/sqs/utils.py
@@ -116,17 +116,6 @@ def parse_queue_url(queue_url: str) -> Tuple[str, Optional[str], str]:
     return account_id, region, queue_name
 
 
-def decode_receipt_handle(receipt_handle: str) -> str:
-    try:
-        _, queue_arn, *_ = extract_receipt_handle_info(receipt_handle)
-        parse_arn(queue_arn)  # raises a ValueError if it is not an arn
-        return queue_arn
-    except (IndexError, ValueError):
-        raise ReceiptHandleIsInvalid(
-            f'The input receipt handle "{receipt_handle}" is not a valid receipt handle.'
-        )
-
-
 class ReceiptHandleInformation(NamedTuple):
     identifier: str
     queue_arn: str
@@ -137,11 +126,15 @@ class ReceiptHandleInformation(NamedTuple):
 def extract_receipt_handle_info(receipt_handle: str) -> ReceiptHandleInformation:
     try:
         handle = base64.b64decode(receipt_handle).decode("utf-8")
-        return ReceiptHandleInformation(*handle.split(" "))
-    except (IndexError, ValueError):
+        parts = handle.split(" ")
+        if len(parts) != 4:
+            raise ValueError(f'The input receipt handle "{receipt_handle}" is incomplete.')
+        parse_arn(parts[1])
+        return ReceiptHandleInformation(*parts)
+    except (IndexError, ValueError) as e:
         raise ReceiptHandleIsInvalid(
             f'The input receipt handle "{receipt_handle}" is not a valid receipt handle.'
-        )
+        ) from e
 
 
 def encode_receipt_handle(queue_arn, message) -> str:
