Merge ~wyattrees/maas:refactor-heartbeat-interval into maas:master

[Wyatt Rees]

refactor: take site manager heartbeat interval from response header

[MAAS Lander (maas-lander)]

UNIT TESTS
-b refactor-heartbeat-interval lp:~wyattrees/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5621/console
COMMIT: 078519d46300279075be8514a96d2d7784fbb6e1

review: Needs Fixing

c48cfd1... by Wyatt Rees on 2024-05-24

fix test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b refactor-heartbeat-interval lp:~wyattrees/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c48cfd125b669fd43d4be9cafd7ce2195cba368a

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

diff --git a/src/maastemporalworker/workflow/msm.py b/src/maastemporalworker/workflow/msm.py
index 23dd0e0..a6b1ebb 100644
--- a/src/maastemporalworker/workflow/msm.py
+++ b/src/maastemporalworker/workflow/msm.py
@@ -227,8 +227,9 @@ class MSMConnectorActivity(ActivityBase):
         ) as response:
             match response.status:
                 case 200:
-                    data = await response.json()
-                    return int(data["heartbeat_interval_seconds"])
+                    return int(
+                        response.headers["MSM-Heartbeat-Interval-Seconds"]
+                    )
                 case 401 | 404:
                     activity.logger.error(
                         "Enrolment cancelled by MSM, aborting"
diff --git a/src/tests/maastemporalworker/workflow/test_msm.py b/src/tests/maastemporalworker/workflow/test_msm.py
index 3f9abc9..a61f446 100644
--- a/src/tests/maastemporalworker/workflow/test_msm.py
+++ b/src/tests/maastemporalworker/workflow/test_msm.py
@@ -91,6 +91,7 @@ class TestMSMActivities:
         status: int,
         reason: str,
         body: dict[str, Any] | None = None,
+        headers: dict[str, Any] | None = None,
     ) -> Mock:
         mock_response = mocker.create_autospec(ClientResponse)
         type(mock_response).ok = PropertyMock(return_value=ok)
@@ -98,6 +99,8 @@ class TestMSMActivities:
         type(mock_response).reason = PropertyMock(return_value=reason)
         if body:
             mock_response.json.return_value = body
+        if headers:
+            type(mock_response).headers = PropertyMock(return_value=headers)
         mocked_session.post.return_value.__aenter__.return_value = (
             mock_response
         )
@@ -238,8 +241,8 @@ class TestMSMActivities:
             True,
             200,
             "",
-            body={
-                "heartbeat_interval_seconds": 300,
+            headers={
+                "MSM-Heartbeat-Interval-Seconds": 300,
             },
         )