fix change_message_visibility of non-inflight message (localstack#9632)

baermat · web-flow · commit cca230a58372 · 2023-11-15T14:48:35.000+01:00
diff --git a/localstack/services/sqs/models.py b/localstack/services/sqs/models.py
@@ -14,7 +14,6 @@
 from localstack.aws.api.sqs import (
     InvalidAttributeName,
     Message,
-    MessageNotInflight,
     QueueAttributeMap,
     QueueAttributeName,
     ReceiptHandleIsInvalid,
@@ -366,7 +365,7 @@ def update_visibility_timeout(self, receipt_handle: str, visibility_timeout: int
             standard_message = self.receipts[receipt_handle]
 
             if standard_message not in self.inflight:
-                raise MessageNotInflight()
+                return
 
             standard_message.update_visibility_timeout(visibility_timeout)
 
diff --git a/tests/aws/services/sqs/test_sqs.py b/tests/aws/services/sqs/test_sqs.py
@@ -932,6 +932,21 @@ def test_extend_message_visibility_timeout_set_in_queue(self, sqs_create_queue,
         assert messages[0]["Body"] == "test"
         assert len(messages) == 1
 
+    @markers.aws.validated
+    def test_change_message_visibility_after_visibility_timeout_expiration(
+        self, snapshot, sqs_create_queue, aws_client
+    ):
+        queue_url = sqs_create_queue(Attributes={"VisibilityTimeout": "1"})
+        aws_client.sqs.send_message(QueueUrl=queue_url, MessageBody="test")
+        response = aws_client.sqs.receive_message(QueueUrl=queue_url)
+        receipt = response["Messages"][0]["ReceiptHandle"]
+        time.sleep(2)
+        # VisibiltyTimeout was 1 and has now expired
+        response = aws_client.sqs.change_message_visibility(
+            QueueUrl=queue_url, ReceiptHandle=receipt, VisibilityTimeout=2
+        )
+        snapshot.match("visibility_timeout_expired", response)
+
     @markers.aws.validated
     def test_receive_message_with_visibility_timeout_updates_timeout(
         self, sqs_create_queue, aws_client
diff --git a/tests/aws/services/sqs/test_sqs.snapshot.json b/tests/aws/services/sqs/test_sqs.snapshot.json
@@ -1335,5 +1335,16 @@
         }
       }
     }
+  },
+  "tests/aws/services/sqs/test_sqs.py::TestSqsProvider::test_change_message_visibility_after_visibility_timeout_expiration": {
+    "recorded-date": "14-11-2023, 17:51:55",
+    "recorded-content": {
+      "visibility_timeout_expired": {
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 200
+        }
+      }
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1335,5 +1335,16 @@`
`1335`	`1335`	`}`
`1336`	`1336`	`}`
`1337`	`1337`	`}`
	`1338`	`+ },`
	`1339`	`+ "tests/aws/services/sqs/test_sqs.py::TestSqsProvider::test_change_message_visibility_after_visibility_timeout_expiration": {`
	`1340`	`+ "recorded-date": "14-11-2023, 17:51:55",`
	`1341`	`+ "recorded-content": {`
	`1342`	`+ "visibility_timeout_expired": {`
	`1343`	`+ "ResponseMetadata": {`
	`1344`	`+ "HTTPHeaders": {},`
	`1345`	`+ "HTTPStatusCode": 200`
	`1346`	`+ }`
	`1347`	`+ }`
	`1348`	`+ }`
`1338`	`1349`	`}`
`1339`	`1350`	`}`