qontract-reconcile 0.10.1rc790__py3-none-any.whl → 0.10.1rc792__py3-none-any.whl

{qontract_reconcile-0.10.1rc790.dist-info → qontract_reconcile-0.10.1rc792.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc790
+Version: 0.10.1rc792
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc790.dist-info → qontract_reconcile-0.10.1rc792.dist-info}/RECORD

@@ -429,7 +429,7 @@ reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq
 reconcile/skupper_network/reconciler.py,sha256=XS-1oKBr_1l3dYUAVqUH6gCHg1G5ZuOfY_7fgGVAiFA,9996
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=o9vR6sp3ARDQFZrbCEShelTxjF1XgfLaElK_QVt_248,261
-reconcile/statuspage/atlassian.py,sha256=zXsO9qx_pqfk2TDSoa1JSv6UvY2nVsJAp6rRWuEcG24,13258
+reconcile/statuspage/atlassian.py,sha256=IxtGHd4GXYlJ2Qt3k-MfylM-SIYS7DYaCpjtQvPAmbY,13758
 reconcile/statuspage/integration.py,sha256=---tzyl381RddAkIhXb7n3ySjUhuX7FBBI152SYsRfk,3654
 reconcile/statuspage/page.py,sha256=cJH2sDA8jiAmSdaDitQqNjkyDq_UP2w3s7eauCi-yt4,3740
 reconcile/statuspage/state.py,sha256=HD9EOoKm_nEqCMLIwW809En3cq5VhyzKJPUbsh-bae8,1617
@@ -664,7 +664,7 @@ reconcile/utils/state.py,sha256=FK8NLT1xyumuXpYRm0Nk6pWpOE_U6-NovGn6zKCw8vw,1629
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=mZEKpu6nbfiQd60wRkc8-5sljBTUTOgaAKnF89itMzU,32085
-reconcile/utils/terrascript_aws_client.py,sha256=4FR4JUSniDOFMtc_r1t2z0x_drrBfcw-J33AdWeJEyw,272662
+reconcile/utils/terrascript_aws_client.py,sha256=VlvIHgrZRiMFVgx6a8ZHxoiJoDwqbtOmsZFnwwNrdL0,273199
 reconcile/utils/three_way_diff_strategy.py,sha256=nyqeQsLCoPI6e16k2CF3b9KNgQLU-rPf5RtfdUfVMwE,4468
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
@@ -785,8 +785,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc790.dist-info/METADATA,sha256=hGlhrIUEP7Ra-X9cEXOBXPCZA0mMazOKnqwWsMKfd6g,2364
-qontract_reconcile-0.10.1rc790.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc790.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc790.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc790.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc792.dist-info/METADATA,sha256=ubnMxzBVaqBUITyyF1R5bgCW_Eckk_tfSLomJ9VWdSg,2364
+qontract_reconcile-0.10.1rc792.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc792.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc792.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc792.dist-info/RECORD,,

reconcile/statuspage/atlassian.py

@@ -1,4 +1,5 @@
 import logging
+import time
 from typing import (
     Any,
     Optional,
@@ -8,6 +9,8 @@ from typing import (
 import requests
 import statuspageio  # type: ignore
 from pydantic import BaseModel
+from requests import Response
+from sretoolbox.utils import retry
 
 from reconcile.gql_definitions.statuspage.statuspages import StatusPageV1
 from reconcile.statuspage.page import (
@@ -60,25 +63,35 @@ class LegacyLibAtlassianAPI:
         self.page_id = page_id
         self.api_url = api_url
         self.token = token
+        self.auth_headers = {"Authorization": f"OAuth {self.token}"}
         self._client = statuspageio.Client(
             api_key=self.token, page_id=self.page_id, organization_id="unset"
         )
 
+    @retry(max_attempts=10)
+    def _do_get(self, url: str, params: dict[str, Any]) -> Response:
+        response = requests.get(
+            url, params=params, headers=self.auth_headers, timeout=30
+        )
+        response.raise_for_status()
+        return response
+
     def list_components(self) -> list[AtlassianRawComponent]:
         url = f"{self.api_url}/v1/pages/{self.page_id}/components"
-        headers = {"Authorization": f"OAuth {self.token}"}
         all_components: list[AtlassianRawComponent] = []
         page = 1
         per_page = 100
         while True:
             params = {"page": page, "per_page": per_page}
-            response = requests.get(url, params=params, headers=headers)
-            response.raise_for_status()
+            response = self._do_get(url, params=params)
             components = [AtlassianRawComponent(**c) for c in response.json()]
             all_components += components
             if len(components) < per_page:
                 break
             page += 1
+            # https://developer.statuspage.io/#section/Rate-Limiting
+            # Each API token is limited to 1 request / second as measured on a 60 second rolling window
+            time.sleep(1)
 
         return all_components
 

reconcile/utils/terrascript_aws_client.py

@@ -6464,11 +6464,20 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     )
 
         # resource - msk config
+        # unique msk config resource name enables "create_before_destroy" lifecycle
+        # which is required when changing version which requires a resource replacement
+        msk_version_str = values["kafka_version"].replace(".", "-")
+        msk_config_name = f"{resource_id}-{msk_version_str}"
         msk_config = aws_msk_configuration(
             resource_id,
-            name=resource_id,
+            name=msk_config_name,
             kafka_versions=[values["kafka_version"]],
             server_properties=values["server_properties"],
+            # lifecycle create_before_destroy is required to ensure that the config is created
+            # before it is assigned to the cluster
+            lifecycle={
+                "create_before_destroy": True,
+            },
         )
         tf_resources.append(msk_config)
         values.pop("server_properties", None)