qontract-reconcile 0.10.1rc934__py3-none-any.whl → 0.10.1rc936__py3-none-any.whl

{qontract_reconcile-0.10.1rc934.dist-info → qontract_reconcile-0.10.1rc936.dist-info}/METADATA

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

@@ -332,7 +332,7 @@ reconcile/gql_definitions/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TIm
 reconcile/gql_definitions/membershipsources/roles.py,sha256=d3nv3GLsj_eKgwB1glsiK6smpC4i16WO3dU5rIdRg94,3678
 reconcile/gql_definitions/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/ocm_labels/clusters.py,sha256=K0DaTnOEdCZAziDbmq3Ktrxzzmzy6sdb3-9kIDk6yao,2932
-reconcile/gql_definitions/ocm_labels/organizations.py,sha256=mmYB5C5Fp_nPzwBDKdKG4qWiLre2VkZ26U_2O-jRKC4,2001
+reconcile/gql_definitions/ocm_labels/organizations.py,sha256=ylNna62pG3XidrLQtMwu0LIOsKh6qyC2QImCbur2tV4,2252
 reconcile/gql_definitions/ocm_oidc_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_cluster_bots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_cluster_bots/clusters.py,sha256=QshhCQeFRu_o0DLpD-4ltT5X_xZHjsCLc5jB3an3UXs,3688
@@ -402,7 +402,7 @@ reconcile/ocm/types.py,sha256=vbHUUnD4CLR4TKFrVjWQtdCjPTI4A3h0Xodt3WlIsEo,2370
 reconcile/ocm_internal_notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm_internal_notifications/integration.py,sha256=FIFHGJSjk_22A32ajJ-W-zsPM0w01kUmGPA8MVYWMPE,4364
 reconcile/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ocm_labels/integration.py,sha256=Pvc6ZNCisJ4Q26V-lAaCJEGkulLHxiHjU4KECAtuci0,15186
+reconcile/ocm_labels/integration.py,sha256=iM1yiapZIlRfCbzf3NJm5eghS_T4jMLZ0VKjTDGHwuc,15285
 reconcile/oum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/oum/base.py,sha256=rkWsPO50fDiAuPjlEY3dvtMlSsSJmpxzXE8AFJB1zJA,13559
 reconcile/oum/labelset.py,sha256=f5kDndbaIT4iNYxTRPSELTUgj_aMlzEJDPzooAkG2mE,2154
@@ -466,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
@@ -842,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.1rc934.dist-info/METADATA,sha256=micYrUXFTKVnAM62FPDfNksiAyTEuVfwUTxRSWnAhKk,2262
-qontract_reconcile-0.10.1rc934.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc934.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc934.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc934.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc936.dist-info/METADATA,sha256=dTP9gHoWKPQXN31AI7YxwkBBy5LrGOf-GDfviQuVNeY,2262
+qontract_reconcile-0.10.1rc936.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc936.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc936.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc936.dist-info/RECORD,,

reconcile/gql_definitions/ocm_labels/organizations.py

@@ -26,6 +26,9 @@ query OcmOrganizations {
     environment {
       name
     }
+    disable {
+      integrations
+    }
   }
 }
 """
@@ -41,10 +44,15 @@ class OpenShiftClusterManagerEnvironmentV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
+class DisableClusterAutomationsV1(ConfiguredBaseModel):
+    integrations: Optional[list[str]] = Field(..., alias="integrations")
+
+
 class OpenShiftClusterManagerV1(ConfiguredBaseModel):
     org_id: str = Field(..., alias="orgId")
     name: str = Field(..., alias="name")
     environment: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="environment")
+    disable: Optional[DisableClusterAutomationsV1] = Field(..., alias="disable")
 
 
 class OcmOrganizationsQueryData(ConfiguredBaseModel):

reconcile/ocm_labels/integration.py

@@ -91,7 +91,11 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
     def get_organizations(
         self, query_func: Callable
     ) -> list[OpenShiftClusterManagerV1]:
-        return organization_query(query_func).organizations or []
+        return [
+            o
+            for o in organization_query(query_func).organizations or []
+            if integration_is_enabled(self.name, o)
+        ]
 
     def get_environments(self, query_func: Callable) -> list[OCMEnvironment]:
         return ocm_environment_query(query_func).environments

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,
             )