qontract-reconcile 0.10.1rc933__py3-none-any.whl → 0.10.1rc935__py3-none-any.whl

{qontract_reconcile-0.10.1rc933.dist-info → qontract_reconcile-0.10.1rc935.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=Cd_Oq-izWc-NJ1jRCPbkhADTrOsYprhVUip-mz2uyp8,106043
+reconcile/cli.py,sha256=rcy5rudCBXog_WSWGnHoTo8xZDeP-VHVXzF4sdpdrbU,105520
 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
@@ -179,9 +179,7 @@ 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/integration.py,sha256=Q7XCnlqoXb4uRsatLciEQlbTSU-HjCRmTd0AHhkxagU,16541
-reconcile/dynatrace_token_provider/integration_v2.py,sha256=Si-hwvGSnC4kVF33-QBZ9FTc4Jfsl_PcESbfl_XmVL8,558
-reconcile/dynatrace_token_provider/meta.py,sha256=f1EdgTS-fuQMUnBmzQFNwvo3Rr9mzNO2R5aOH44oCYg,50
+reconcile/dynatrace_token_provider/integration.py,sha256=Tt3Nayf1TOdizBStXdEaJKfKqlOkJljw22lWlN2GB2s,16518
 reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=JvjKaABy2Pg8u8Lq82Acv4zMvpE3_qGKes7OG-zlHOM,2956
@@ -468,7 +466,7 @@ reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutS
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=P4IbblzXbubjlaxAYoahHFADUNIXLepfqwzdnHPs8OY,5608
 reconcile/templating/lib/model.py,sha256=Y1PeEP-koHKiH46JSwv4-PGRGQtcxZa9VmjTiuI6Lxs,889
-reconcile/templating/lib/rendering.py,sha256=6kt8NCCwB4vLKYal7KtRmBDguIC1p_PIQCRr-vL7p5w,5504
+reconcile/templating/lib/rendering.py,sha256=pbZv8uYlNtgzTjYMl5qSIW94vDS4CfE47aSjX4HpL-k,6210
 reconcile/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/terraform_init/integration.py,sha256=glQ9uy8Kj2aTQXCAupwSFeih7reX_xMX_UuWW_ywBMU,6100
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
@@ -844,8 +842,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.1rc933.dist-info/METADATA,sha256=g1Et8aAb9vUomuEd6ZdF6INhXma7-0Q5qqXBR6U8IG0,2262
-qontract_reconcile-0.10.1rc933.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc933.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc933.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc933.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc935.dist-info/METADATA,sha256=nG4Alh2q6Ov9z5xVFf0kauA15MoWAQNm-Cc-C8bNA1Y,2262
+qontract_reconcile-0.10.1rc935.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc935.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc935.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc935.dist-info/RECORD,,

reconcile/cli.py

@@ -3057,25 +3057,8 @@ def dynatrace_token_provider(ctx, ocm_org_ids):
         DynatraceTokenProviderIntegration,
         DynatraceTokenProviderIntegrationParams,
     )
-    from reconcile.dynatrace_token_provider.integration_v2 import (
-        DynatraceTokenProviderIntegrationParamsV2,
-        DynatraceTokenProviderIntegrationV2,
-    )
 
     parsed_ocm_org_ids = set(ocm_org_ids.split(",")) if ocm_org_ids else None
-
-    # We will remove V1 once migrations towards new token declaration is done
-    # Run V2
-    run_class_integration(
-        integration=DynatraceTokenProviderIntegrationV2(
-            DynatraceTokenProviderIntegrationParamsV2(
-                ocm_organization_ids=parsed_ocm_org_ids
-            )
-        ),
-        ctx=ctx.obj,
-    )
-
-    # Run V1
     run_class_integration(
         integration=DynatraceTokenProviderIntegration(
             DynatraceTokenProviderIntegrationParams(

reconcile/dynatrace_token_provider/integration.py

@@ -8,7 +8,6 @@ from typing import Any
 from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenCreated
 
-from reconcile.dynatrace_token_provider.meta import QONTRACT_INTEGRATION
 from reconcile.dynatrace_token_provider.metrics import (
     DTPClustersManagedGauge,
     DTPOrganizationErrorRate,
@@ -53,6 +52,7 @@ from reconcile.utils.runtime.integration import (
 )
 from reconcile.utils.secret_reader import SecretReaderBase
 
+QONTRACT_INTEGRATION = "dynatrace-token-provider"
 SYNCSET_ID = "ext-dynatrace-tokens-dtp"
 SECRET_NAME = "dynatrace-token-dtp"
 SECRET_NAMESPACE = "dynatrace"

reconcile/templating/lib/rendering.py

@@ -123,11 +123,28 @@ class PatchRenderer(Renderer):
         )
 
         if isinstance(matched_value, list):
-            if not self.template.patch.identifier:
-                raise ValueError(
-                    f"Expected identifier in patch for list at {self.template}"
-                )
-            dta_identifier = data_to_add.get(self.template.patch.identifier)
+
+            def get_identifier(data: dict[str, Any]) -> Any:
+                assert self.template.patch is not None  # mypy
+                if not self.template.patch.identifier:
+                    raise ValueError(
+                        f"Expected identifier in patch for list at {self.template}"
+                    )
+                if self.template.patch.identifier.startswith(
+                    "$"
+                ) and not self.template.patch.identifier.startswith("$ref"):
+                    # jsonpath and list of strings support
+                    if matches := [
+                        match.value
+                        for match in parse_jsonpath(
+                            self.template.patch.identifier
+                        ).find(data)
+                    ]:
+                        return matches[0]
+                    return None
+                return data.get(self.template.patch.identifier)
+
+            dta_identifier = get_identifier(data_to_add)
             if not dta_identifier:
                 raise ValueError(
                     f"Expected identifier {self.template.patch.identifier} in data to add"
@@ -137,7 +154,7 @@ class PatchRenderer(Renderer):
                 (
                     index
                     for index, data in enumerate(matched_value)
-                    if data.get(self.template.patch.identifier) == dta_identifier
+                    if get_identifier(data) == dta_identifier
                 ),
                 None,
             )

reconcile/dynatrace_token_provider/integration_v2.py

@@ -1,20 +0,0 @@
-from reconcile.dynatrace_token_provider.meta import QONTRACT_INTEGRATION
-from reconcile.utils.runtime.integration import (
-    PydanticRunParams,
-    QontractReconcileIntegration,
-)
-
-
-class DynatraceTokenProviderIntegrationParamsV2(PydanticRunParams):
-    ocm_organization_ids: set[str] | None = None
-
-
-class DynatraceTokenProviderIntegrationV2(
-    QontractReconcileIntegration[DynatraceTokenProviderIntegrationParamsV2]
-):
-    @property
-    def name(self) -> str:
-        return QONTRACT_INTEGRATION
-
-    def run(self, dry_run: bool) -> None:
-        pass

reconcile/dynatrace_token_provider/meta.py

@@ -1 +0,0 @@
-QONTRACT_INTEGRATION = "dynatrace-token-provider"