qontract-reconcile 0.10.1rc462__py3-none-any.whl → 0.10.1rc464__py3-none-any.whl

{qontract_reconcile-0.10.1rc462.dist-info → qontract_reconcile-0.10.1rc464.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc462
+Version: 0.10.1rc464
 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.1rc462.dist-info → qontract_reconcile-0.10.1rc464.dist-info}/RECORD

@@ -159,7 +159,7 @@ reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reconcile/glitchtip/integration.py,sha256=FB1dmwrDs8z6MHfO5Za83fcPkxsVvcaw6sFymIx4C_Q,8116
 reconcile/glitchtip/reconciler.py,sha256=XybVNqXFnrPbNEX_B1B7esqExWdWNsUPXaORMPRUbfk,12333
 reconcile/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_alerts/integration.py,sha256=k9XiGP8faKNQwc_V2DgmnWCG1FS-zV-wDT2uIMZKN4o,11092
+reconcile/glitchtip_project_alerts/integration.py,sha256=Bb4X-oEeBxLQtVJM4TZSerQKgDTknAWO_f-7LZRVGnI,11778
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=NSHW3qVwkeSMv7Anl6fb-UFKRLUh_dh7JfvPQVvg1cA,7946
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -563,7 +563,7 @@ reconcile/utils/state.py,sha256=-a3fOnGZnDRcTXw9Hg3QtGdKePGtnmoCkPeCt-5HgbE,1367
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=V7AMQOEU4tvUOT-LQN2cXLqcphD5L93PMGMfurQQyPY,31753
-reconcile/utils/terrascript_aws_client.py,sha256=aDE2Bx1UT5wPGt6t0JtLEJDRi13tc7Vh9XMKJDZW3zM,260850
+reconcile/utils/terrascript_aws_client.py,sha256=8A-pVZop3uwdKV6FsnppBkBmhyutmKR2_FBYo8PLhoU,261163
 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
@@ -646,8 +646,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 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.1rc462.dist-info/METADATA,sha256=qRVzfT0W_xXmpZhzsTybiJP3k3gWRtWQ0JLikwBmkco,2348
-qontract_reconcile-0.10.1rc462.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc462.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc462.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc462.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc464.dist-info/METADATA,sha256=_spKRy37Hm4dn6vMeiwg6fNOmNbAbhcp4ZeWeeU7Go4,2348
+qontract_reconcile-0.10.1rc464.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc464.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc464.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc464.dist-info/RECORD,,

reconcile/glitchtip_project_alerts/integration.py

@@ -46,6 +46,18 @@ class GlitchtipProjectAlertsIntegrationParams(PydanticRunParams):
     instance: Optional[str] = None
 
 
+def webhook_urls_are_unique(alerts: Iterable[ProjectAlert]) -> bool:
+    """Check that webhook URLs are unique across a project."""
+    urls = []
+    for alert in alerts:
+        for recipient in alert.recipients:
+            if recipient.recipient_type == RecipientType.WEBHOOK:
+                if recipient.url in urls:
+                    return False
+                urls.append(recipient.url)
+    return True
+
+
 class GlitchtipProjectAlertsIntegration(
     QontractReconcileIntegration[GlitchtipProjectAlertsIntegrationParams]
 ):
@@ -137,6 +149,11 @@ class GlitchtipProjectAlertsIntegration(
                         ],
                     )
                 )
+            # check for duplicates
+            if not webhook_urls_are_unique(alerts):
+                raise ValueError(
+                    "Glitchtip project alert webhook URLs must be unique across a project. Do not trigger the same webhook twice."
+                )
             project = Project(
                 name=glitchtip_project.name,
                 platform=None,

reconcile/utils/terrascript_aws_client.py

@@ -6179,6 +6179,12 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                 user["name"]: self.secret_reader.read_all(user["secret"])
                 for user in spec.resource["users"]
             }
+            # validate user objects
+            for user, secret in scram_users.items():
+                if secret.keys() != {"password", "username"}:
+                    raise ValueError(
+                        f"MSK user '{user}' secret must contain only 'username' and 'password' keys!"
+                    )
 
         # resource - msk config
         msk_config = aws_msk_configuration(