qontract-reconcile 0.10.1rc1035__py3-none-any.whl → 0.10.1rc1037__py3-none-any.whl

{qontract_reconcile-0.10.1rc1035.dist-info → qontract_reconcile-0.10.1rc1037.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=2hjHLQED4DR41EHoov3uHiURb8dfAbDpaTwxnEvrVhk,107388
+reconcile/cli.py,sha256=2Qxyuwrp90j9Pox_2px5LZDn8oomwrQuFtdY85xMBOE,107389
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -180,11 +180,12 @@ reconcile/cna/assets/asset.py,sha256=KWgA4fuDAEGsJwmR52WwK_YgSJMW-1cV2la3lmNf4iE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=85mVh97atCoC0aLuX47poTZiyOthmziJeBsUw0c924w,1658
 reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/dynatrace_token_provider/dependencies.py,sha256=41q05A4C_eS3E8-MR4veeMxtQNsPoGdxmEa3d-OKxq4,2814
-reconcile/dynatrace_token_provider/integration.py,sha256=-oAZ40IHLbY99PZB9THtH2FnS5LHCKpQMIYFdy1bp4Q,22997
+reconcile/dynatrace_token_provider/dependencies.py,sha256=FuRUnK18EyJIIgFwQBZSskIG08mN2VQAcAcaJFTf8zc,2812
+reconcile/dynatrace_token_provider/integration.py,sha256=OaRX5B8KiBvXQ57U8dLchlY2pqep5OM1p8HUNJGKGkc,23196
 reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
 reconcile/dynatrace_token_provider/ocm.py,sha256=iHMsgbsLs-dlrB9UXmWNDF7E4UDe49JOsLa9rnowKfo,4282
+reconcile/dynatrace_token_provider/validate.py,sha256=40_9QmHoB3-KBc0k_0D4QO00PpNNPS-gU9Z6cIcWga8,1920
 reconcile/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/endpoints_discovery/integration.py,sha256=q01DJgCv1YiDY-VUWDfQ5kfGm67BUhP-YP7c0JQObj8,12333
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
@@ -446,7 +447,7 @@ reconcile/saas_auto_promotions_manager/publisher.py,sha256=IZGu-PMffyk3fNL8QcZ2V
 reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=kIJKT1Xg5FF7EGT5ayK5ROyu_S7FbsYK91WBqrtYjfA,10030
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=CP392gq0yntzEkqpMJl2j-N4CGfFDFbBfK77J7Oo5Pg,7817
+reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=R2CRtjdOggY5lSqt-A5qz2ymqomx4opVeVV_oqBAW0A,7804
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=-zWK-cqr_8o9ZEnNfD3cfkv3hrrU4HJ4UMzi4J2Hjhw,6223
@@ -866,8 +867,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1035.dist-info/METADATA,sha256=RiJA91vmFrk9nRO6TwYbz5-vOJcviyMBW3QeS4nOjTc,2213
-qontract_reconcile-0.10.1rc1035.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1035.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1035.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1035.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1037.dist-info/METADATA,sha256=6F_72A6-bCXEcMeL8AmkvcyhzIc8L2tYbszCURoyl8w,2213
+qontract_reconcile-0.10.1rc1037.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1037.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1037.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1037.dist-info/RECORD,,

reconcile/cli.py

@@ -3124,7 +3124,7 @@ def dynatrace_token_provider(ctx, ocm_org_ids):
     run_class_integration(
         integration=DynatraceTokenProviderIntegration(
             DynatraceTokenProviderIntegrationParams(
-                ocm_organization_ids=parsed_ocm_org_ids
+                ocm_organization_ids=parsed_ocm_org_ids,
             )
         ),
         ctx=ctx.obj,

reconcile/dynatrace_token_provider/dependencies.py

@@ -36,16 +36,16 @@ class Dependencies:
         self.ocm_client_by_env_name: dict[str, OCMClient] = dict(ocm_client_by_env_name)
         self.token_spec_by_name = dict(token_spec_by_name)
 
-    def populate(self) -> None:
-        self._populate_dynatrace_client_map()
-        self._populate_ocm_clients()
-        self._populate_token_specs()
+    def populate_all(self) -> None:
+        self.populate_dynatrace_client_map()
+        self.populate_ocm_clients()
+        self.populate_token_specs()
 
-    def _populate_token_specs(self) -> None:
+    def populate_token_specs(self) -> None:
         token_specs = get_dynatrace_token_provider_token_specs()
         self.token_spec_by_name = {spec.name: spec for spec in token_specs}
 
-    def _populate_dynatrace_client_map(self) -> None:
+    def populate_dynatrace_client_map(self) -> None:
         dynatrace_environments = get_dynatrace_environments()
         if not dynatrace_environments:
             raise RuntimeError("No Dynatrace environment defined.")
@@ -59,7 +59,7 @@ class Dependencies:
             tenant_id = tenant.environment_url.split(".")[0].removeprefix("https://")
             self.dynatrace_client_by_tenant_id[tenant_id] = dt_client
 
-    def _populate_ocm_clients(self) -> None:
+    def populate_ocm_clients(self) -> None:
         ocm_environments = get_ocm_environments()
         self.ocm_client_by_env_name = {
             env.name: OCMClient(

reconcile/dynatrace_token_provider/integration.py

@@ -17,6 +17,7 @@ from reconcile.dynatrace_token_provider.ocm import (
     Cluster,
     OCMClient,
 )
+from reconcile.dynatrace_token_provider.validate import validate_token_specs
 from reconcile.gql_definitions.dynatrace_token_provider.token_specs import (
     DynatraceAPITokenV1,
     DynatraceTokenProviderTokenSpecV1,
@@ -66,10 +67,13 @@ class DynatraceTokenProviderIntegration(
             ocm_client_by_env_name={},
             token_spec_by_name={},
         )
-        dependencies.populate()
+        dependencies.populate_all()
         self.reconcile(dry_run=dry_run, dependencies=dependencies)
 
     def reconcile(self, dry_run: bool, dependencies: Dependencies) -> None:
+        token_specs = list(dependencies.token_spec_by_name.values())
+        validate_token_specs(specs=token_specs)
+
         with metrics.transactional_metrics(self.name):
             unhandled_exceptions = []
             for ocm_env_name, ocm_client in dependencies.ocm_client_by_env_name.items():

reconcile/dynatrace_token_provider/validate.py

@@ -0,0 +1,48 @@
+from collections.abc import Iterable
+
+from reconcile.gql_definitions.dynatrace_token_provider.token_specs import (
+    DynatraceTokenProviderTokenSpecV1,
+)
+
+
+class SecretNotUniqueError(Exception):
+    pass
+
+
+class TokenNameNotUniqueInSecretError(Exception):
+    pass
+
+
+class KeyNameNotUniqueInSecretError(Exception):
+    pass
+
+
+def validate_token_specs(specs: Iterable[DynatraceTokenProviderTokenSpecV1]) -> None:
+    """
+    We cannot catch all potential errors through json schema definition.
+    """
+    for spec in specs:
+        seen_secrets: set[str] = set()
+        for secret in spec.secrets:
+            secret_definition_key = f"{secret.namespace}/{secret.name}"
+            if secret_definition_key in seen_secrets:
+                raise SecretNotUniqueError(
+                    f"A secret cannot be re-defined and must be unique per spec. Secret '{secret.name}' in namespace '{secret.namespace}' is defined multiple times in spec '{spec.name}'."
+                )
+            seen_secrets.add(secret_definition_key)
+
+            seen_tokens: set[str] = set()
+            seen_key_names: set[str] = set()
+            for token in secret.tokens:
+                if token.name in seen_tokens:
+                    raise TokenNameNotUniqueInSecretError(
+                        f"A token name must be unique within a secret. Token name '{token.name}' is used more than once in secret '{secret.name}' in token spec '{spec.name}'."
+                    )
+                seen_tokens.add(token.name)
+
+                secret_key = token.key_name_in_secret or token.name
+                if secret_key in seen_key_names:
+                    raise KeyNameNotUniqueInSecretError(
+                        f"A key name must be unique within a secret. Key name '{secret_key}' is used more than once in secret '{secret.name}' in token spec '{spec.name}'."
+                    )
+                seen_key_names.add(secret_key)

reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py

@@ -8,7 +8,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_req
 
 
 class Reason(Enum):
-    MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet. cc @kfischer"
+    MISSING_UNBATCHING = "Closing this MR because it failed MR check and isn't marked as un-batchable yet."
     OUTDATED_CONTENT = "Closing this MR because it has out-dated content."
     NEW_BATCH = "Closing this MR in favor of a new batch MR."