Removed extra_attrs manifest digest override in batch signer

Override causes manifest_digest to be inconsistent.

Also make sure pipeline_run_id is always string

Author: midnightercz

src/pubtools/sign/signers/msgsigner.py

@@ -694,9 +694,9 @@ def _create_msg_batch_message(
                 signing_keys.append(_signing_key)
 
         extra_attrs = extra_attrs or {}
-        headers = self._construct_headers(sig_type, extra_attrs=extra_attrs)
-        if isinstance(operation, ContainerSignOperation):
-            extra_attrs["manifest_digest"] = operation.digests
+        extra_attrs_headers = extra_attrs.copy()
+        extra_attrs_headers.pop("manifest_digest")
+        headers = self._construct_headers(sig_type, extra_attrs=extra_attrs_headers)
         ret = MsgMessage(
             headers=headers,
             body=self._construct_signing_batch_message(
@@ -745,7 +745,7 @@ def _prepare_messages(self: Self, operation: ContainerSignOperation) -> List[Lis
                         args=[claims, repo, operation, SignRequestType.BATCH],
                         kwargs={
                             "extra_attrs": {
-                                "pipeline_run_id": operation.task_id,
+                                "pipeline_run_id": str(operation.task_id),
                                 "manifest_digest": digests,
                             }
                         },
@@ -758,7 +758,7 @@ def _prepare_messages(self: Self, operation: ContainerSignOperation) -> List[Lis
                     args=[claims, repo, operation, SignRequestType.BATCH],
                     kwargs={
                         "extra_attrs": {
-                            "pipeline_run_id": operation.task_id,
+                            "pipeline_run_id": str(operation.task_id),
                             "manifest_digest": digests,
                         }
                     },

tests/test_msg_batch_signer.py

@@ -255,12 +255,19 @@ def test_create_msg_batch_message(f_config_msg_batch_signer_ok):
                 task_id="1",
             )
             assert signer._create_msg_batch_message(
-                data, "repo", operation, SignRequestType.BATCH
+                data,
+                "repo",
+                operation,
+                SignRequestType.BATCH,
+                extra_attrs={
+                    "manifest_digest": ["some-digest-1", "some-digest-2", "some-digest-3"]
+                },
             ) == [
                 MsgMessage(
                     headers={
                         "service": "pubtools-sign",
                         "environment": "prod",
+                        "expires": 3000,
                         "owner_id": "pubtools-sign-test",
                         "mtype": "batch",
                         "source": "metadata",

tests/test_msg_signer.py

@@ -489,6 +489,7 @@ 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",
@@ -520,6 +521,7 @@ def test_create_msg_message(f_config_msg_signer_ok):
                 MsgMessage(
                     headers={
                         "service": "pubtools-sign",
+                        "expires": 3000,
                         "environment": "prod",
                         "owner_id": "pubtools-sign-test",
                         "mtype": SignRequestType.CONTAINER,
@@ -543,6 +545,7 @@ def test_create_msg_message(f_config_msg_signer_ok):
                 MsgMessage(
                     headers={
                         "service": "pubtools-sign",
+                        "expires": 3000,
                         "environment": "prod",
                         "owner_id": "pubtools-sign-test",
                         "mtype": SignRequestType.CLEARSIGN,