Merge pull request #62 from emilyzheng/fix-expiry

Set ttl messge property

Author: emilyzheng

src/pubtools/sign/clients/msg_send_client.py

@@ -72,6 +72,7 @@ def on_sendable(self, event: proton.Event) -> None:
                         properties=message.headers,
                         address=message.address,
                         body=json.dumps(message.body),
+                        ttl=message.ttl,
                     )
                 )
             self.sent += 1

src/pubtools/sign/models/msg.py

@@ -10,11 +10,13 @@ class MsgMessage:
         headers (Dict[str, Any]): Headers of the message.
         address (str): Address to which the message is sent.
         body (Dict[str, Any]): Body of the message.
+        ttl (Optional[int]): Time To Live of the message.
     """
 
     headers: Dict[str, Any]
     address: str
     body: Dict[str, Any]
+    ttl: Optional[int] = 0
 
 
 @dataclasses.dataclass

src/pubtools/sign/signers/msgsigner.py

@@ -214,7 +214,6 @@ def _construct_headers(
             "owner_id": self.creator,
             "mtype": sig_type.value,
             "source": "metadata",
-            "expires": self.timeout * self.retries * 1000,
         }
         if extra_attrs:
             headers.update(extra_attrs)
@@ -251,6 +250,7 @@ def _create_msg_messages(
                 address=self.topic_send_to.format(
                     **dict(list(asdict(self).items()) + list(asdict(operation).items()))
                 ),
+                ttl=self.timeout * self.retries,
             )
             LOG.debug(f"Construted message with request_id {ret.body['request_id']}")
             messages.append(ret)
@@ -714,6 +714,7 @@ def _create_msg_batch_message(
             address=self.topic_send_to.format(
                 **dict(list(asdict(self).items()) + list(asdict(operation).items()))
             ),
+            ttl=self.timeout * self.retries,
         )
         LOG.debug(f"Construted message with request_id {ret.body['request_id']}")
         messages.append(ret)

tests/test_msg_batch_signer.py

@@ -261,7 +261,6 @@ def test_create_msg_batch_message(f_config_msg_batch_signer_ok):
                     headers={
                         "service": "pubtools-sign",
                         "environment": "prod",
-                        "expires": 3000,
                         "owner_id": "pubtools-sign-test",
                         "mtype": "batch",
                         "source": "metadata",
@@ -295,6 +294,7 @@ def test_create_msg_batch_message(f_config_msg_batch_signer_ok):
                         "created": "created-date-Z",
                         "requested_by": "pubtools-sign-test",
                     },
+                    ttl=3,
                 )
             ]
 

tests/test_msg_signer.py

@@ -489,7 +489,6 @@ def test__construct_headers(f_config_msg_signer_ok):
             assert ret == {
                 "service": "pubtools-sign",
                 "environment": "prod",
-                "expires": 3000,
                 "owner_id": "pubtools-sign-test",
                 "mtype": SignRequestType.CONTAINER,
                 "source": "metadata",
@@ -523,7 +522,6 @@ def test_create_msg_message(f_config_msg_signer_ok):
                         "service": "pubtools-sign",
                         "environment": "prod",
                         "owner_id": "pubtools-sign-test",
-                        "expires": 3000,
                         "mtype": SignRequestType.CONTAINER,
                         "source": "metadata",
                     },
@@ -536,6 +534,7 @@ def test_create_msg_message(f_config_msg_signer_ok):
                         "requested_by": "pubtools-sign-test",
                         "repo": "repo",
                     },
+                    ttl=3,
                 )
             ]
             assert signer._create_msg_messages(
@@ -546,7 +545,6 @@ def test_create_msg_message(f_config_msg_signer_ok):
                         "service": "pubtools-sign",
                         "environment": "prod",
                         "owner_id": "pubtools-sign-test",
-                        "expires": 3000,
                         "mtype": SignRequestType.CLEARSIGN,
                         "source": "metadata",
                     },
@@ -559,6 +557,7 @@ def test_create_msg_message(f_config_msg_signer_ok):
                         "requested_by": "pubtools-sign-test",
                         "repo": "repo",
                     },
+                    ttl=3,
                 )
             ]