qontract-reconcile 0.10.2.dev97__py3-none-any.whl → 0.10.2.dev99__py3-none-any.whl

{qontract_reconcile-0.10.2.dev97.dist-info → qontract_reconcile-0.10.2.dev99.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev97
+Version: 0.10.2.dev99
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev97.dist-info → qontract_reconcile-0.10.2.dev99.dist-info}/RECORD

@@ -185,10 +185,10 @@ reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_G
 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=FuRUnK18EyJIIgFwQBZSskIG08mN2VQAcAcaJFTf8zc,2812
-reconcile/dynatrace_token_provider/integration.py,sha256=ysPto7wPZW_t3KFXyWOxRNQT140Q4OOe3Eu4BX0p6Uo,26505
+reconcile/dynatrace_token_provider/integration.py,sha256=RmptOa5CYrKNMZqCQhmP_AsC3L-BCKhjmM8otj6a7OY,26514
 reconcile/dynatrace_token_provider/metrics.py,sha256=oP-6NTZENFdvWiS0krnmX6tq3xyOzQ8e6vS0CZWYUuw,1496
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
-reconcile/dynatrace_token_provider/ocm.py,sha256=7P0AoyAhAmvH9ffKMEE3HB9sCmWvrwYcSBscsVt5964,4729
+reconcile/dynatrace_token_provider/ocm.py,sha256=bryaK7xs7ygttUyZuSD9Up4laUhP6OUTr2VBbFiclpA,4298
 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=ecjIZK_h6JO2wUhUmJlZ9pjOh60nS5aenEWGDj6YJdw,14790
@@ -207,13 +207,13 @@ reconcile/external_resources/reconciler.py,sha256=wB8cB5pmqDJ1_t5_Aly4mrULGnI3OQ
 reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/fleet_labeler/dependencies.py,sha256=6vD9dC1pXOztWQpQCZa2ZLbXrTf50kzjtpqewRybuJ4,3169
-reconcile/fleet_labeler/integration.py,sha256=vMvDnQW1NXv2qWeG8ab_gguBq45UtmYErSXy6XR83d8,14149
+reconcile/fleet_labeler/dependencies.py,sha256=MFiSfT25Ks0X3iQxwayNvFX_l6bQi97f3IiaNR1wtHc,3173
+reconcile/fleet_labeler/integration.py,sha256=ckmVga18DgidA2u50mFnp87oDAa2pKpnuORW-PMCKVY,14157
 reconcile/fleet_labeler/merge_request.py,sha256=SfGxXInxeJzVnsTtO0ZC9-PesUJMdpKxKY9eCB6ms-g,1538
 reconcile/fleet_labeler/meta.py,sha256=lWnpH2U0PHCPXu9Ok_CPmO494qQJQ5pOuqo28s0jzIQ,146
 reconcile/fleet_labeler/metrics.py,sha256=zhcp06woGaZywTqWZf3znh6C2S2u7OHBLXalXYKuTzQ,1934
 reconcile/fleet_labeler/ocm.py,sha256=qcg1_p7nKlZG7-MQeOZos3rz6YSPAPh-HKxE3OVJwe0,4165
-reconcile/fleet_labeler/validate.py,sha256=gzc2tt7h9F60h7dcyJfEmsnjnfuux5Jtc_WzrIqr-5k,2541
+reconcile/fleet_labeler/validate.py,sha256=Ch4fe7jXQZKl4pnvl5IxWS-dKSIuuiwdH2B7mivZoco,1654
 reconcile/fleet_labeler/vcs.py,sha256=6UHUQ08AGAHXF7629I6X-T_E1pvx96LxjS66EeOzve4,1108
 reconcile/glitchtip/README.md,sha256=rfXT6jNP9khJW65jL7I2PgoxvxgcGGuJF8NpbzufEQ4,4335
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -224,7 +224,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=xA_cHhSy0wr9PG9y_Nwk75MbnjtHQjOEMd48nLZMK8E,2239784
+reconcile/gql_definitions/introspection.json,sha256=-3s2bAXc064r3TJEHURAQX7_brHpdV72c-BR5_rXzpw,2239798
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -314,7 +314,7 @@ reconcile/gql_definitions/external_resources/external_resources_settings.py,sha2
 reconcile/gql_definitions/external_resources/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py,sha256=T_qWCRtzU8F9frebBXG9TkeQdrKGt3R9YinSngPoFqM,1262
 reconcile/gql_definitions/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/fleet_labeler/fleet_labels.py,sha256=ow9LTm376Y5rCVMWgRtrj2yWKK7_aBC5AM7svLN7pKo,4546
+reconcile/gql_definitions/fleet_labeler/fleet_labels.py,sha256=XPk1YFmiCtGlwrldxdABwYaT-wgZdTjpDFHmUnq6xcM,4349
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/fragments/aus_organization.py,sha256=uBKbTuBa3CZmTXR5HOcGhRcu2U9kM93KbYmoWTxcpB0,4767
 reconcile/gql_definitions/fragments/aws_account_common.py,sha256=3-7ZAP6GSff7Z2Syz2VQCLY4IySqBOSVmceaRiVNQpw,2385
@@ -786,7 +786,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev97.dist-info/METADATA,sha256=KiU0I9ajpxPWox3p0C64xeanHOSJ1CxNhJjgBDfTcrA,24565
-qontract_reconcile-0.10.2.dev97.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev97.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev97.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev99.dist-info/METADATA,sha256=DAqORQ1nXWb46jLn2koRabedQbqn4-T2-nb3KzCNClM,24565
+qontract_reconcile-0.10.2.dev99.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev99.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev99.dist-info/RECORD,,

reconcile/dynatrace_token_provider/integration.py

@@ -16,7 +16,7 @@ from reconcile.dynatrace_token_provider.metrics import (
 from reconcile.dynatrace_token_provider.model import DynatraceAPIToken, K8sSecret
 from reconcile.dynatrace_token_provider.ocm import (
     DTP_LABEL_SEARCH,
-    DTP_TENANT_LABEL,
+    DTP_TENANT_V2_LABEL,
     Cluster,
     OCMClient,
 )
@@ -172,10 +172,10 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                                 _expose_errors_as_service_log(
                                     ocm_client,
                                     cluster_uuid=cluster.external_id,
-                                    error=f"Missing label {DTP_TENANT_LABEL}",
+                                    error=f"Missing label {DTP_TENANT_V2_LABEL}",
                                 )
                                 logging.warn(
-                                    f"[{cluster.id=}] Missing value for label {DTP_TENANT_LABEL}"
+                                    f"[{cluster.id=}] Missing value for label {DTP_TENANT_V2_LABEL}"
                                 )
                                 continue
                             if (

reconcile/dynatrace_token_provider/ocm.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 from collections.abc import Mapping
 from datetime import timedelta
 from typing import Any
@@ -34,10 +35,7 @@ from reconcile.utils.ocm_base_client import (
 Thin abstractions of reconcile.ocm module to reduce coupling.
 """
 
-DTP_TENANT_LABEL = sre_capability_label_key("dtp", "tenant")
-DTP_SPEC_LABEL = sre_capability_label_key("dtp", "token-spec")
 DTP_LABEL_SEARCH = sre_capability_label_key("dtp", "%")
-
 DTP_TENANT_V2_LABEL = sre_capability_label_key("dtp.v2", "tenant")
 DTP_SPEC_V2_LABEL = sre_capability_label_key("dtp.v2", "token-spec")
 
@@ -51,24 +49,14 @@ class Cluster(BaseModel):
     is_hcp: bool
 
     @staticmethod
-    def from_cluster_details(cluster: ClusterDetails) -> Cluster:
+    def from_cluster_details(cluster: ClusterDetails) -> Cluster | None:
         dt_tenant = cluster.labels.get_label_value(DTP_TENANT_V2_LABEL)
         token_spec_name = cluster.labels.get_label_value(DTP_SPEC_V2_LABEL)
-
-        # TODO: remove these fallbacks APPSRE-11584
-        if not dt_tenant:
-            dt_tenant = cluster.labels.get_label_value(DTP_TENANT_LABEL)
-        if not token_spec_name:
-            token_spec_name = cluster.labels.get_label_value(DTP_SPEC_LABEL)
-        if not token_spec_name:
-            """
-            We want to stay backwards compatible.
-            Earlier version of DTP did not set a value for the label.
-            We fall back to a default token in that case.
-
-            Long-term, we want to remove this behavior.
-            """
-            token_spec_name = "hypershift-management-cluster-v1"
+        if not dt_tenant or not token_spec_name:
+            logging.warning(
+                f"[Missing DTP labels] {cluster.ocm_cluster.id=} {cluster.ocm_cluster.subscription.id=} {dt_tenant=} {token_spec_name=}"
+            )
+            return None
         return Cluster(
             id=cluster.ocm_cluster.id,
             external_id=cluster.ocm_cluster.external_id,
@@ -131,10 +119,11 @@ class OCMClient:
 
     def discover_clusters_by_labels(self, label_filter: Filter) -> list[Cluster]:
         return [
-            Cluster.from_cluster_details(cluster)
-            for cluster in discover_clusters_by_labels(
+            cluster
+            for ocm_cluster in discover_clusters_by_labels(
                 ocm_api=self._ocm_client, label_filter=label_filter
             )
+            if (cluster := Cluster.from_cluster_details(ocm_cluster))
         ]
 
     def create_service_log(

reconcile/fleet_labeler/dependencies.py

@@ -61,10 +61,10 @@ def _ocm_clients(secret_reader: SecretReaderBase) -> dict[str, OCMClient]:
     for spec in get_fleet_label_specs():
         ocm_base_client = init_ocm_base_client(
             cfg=OCMClientConfig(
-                url=spec.ocm.environment.url,
-                access_token_client_id=spec.ocm.access_token_client_id,
-                access_token_url=spec.ocm.access_token_url,
-                access_token_client_secret=spec.ocm.access_token_client_secret,
+                url=spec.ocm_env.url,
+                access_token_client_id=spec.ocm_env.access_token_client_id,
+                access_token_url=spec.ocm_env.access_token_url,
+                access_token_client_secret=spec.ocm_env.access_token_client_secret,
             ),
             secret_reader=secret_reader,
         )

reconcile/fleet_labeler/integration.py

@@ -257,7 +257,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                 f"[{spec.name}] Cluster ID {cluster_id} is matched multiple times by different label matchers:\n{label_matches}"
             )
         metrics.set_duplicate_cluster_matches_gauge(
-            ocm_name=spec.ocm.name,
+            ocm_name=spec.ocm_env.name,
             spec_name=spec.name,
             value=len(clusters_with_duplicate_matches),
         )
@@ -291,7 +291,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                     )
                 )
         metrics.set_label_rendering_error_gauge(
-            ocm_name=spec.ocm.name,
+            ocm_name=spec.ocm_env.name,
             spec_name=spec.name,
             value=label_rendering_errors_cnt,
         )

reconcile/fleet_labeler/validate.py

@@ -3,22 +3,9 @@ from collections.abc import Mapping
 
 from reconcile.gql_definitions.fleet_labeler.fleet_labels import (
     FleetLabelsSpecV1,
-    OpenShiftClusterManagerV1,
 )
 
 
-class OCMAccessTokenClientIdMissing(Exception):
-    pass
-
-
-class OCMAccessTokenClientSecretMissing(Exception):
-    pass
-
-
-class OCMAccessTokenUrlMissing(Exception):
-    pass
-
-
 class MatchLabelsNotUniqueError(Exception):
     pass
 
@@ -28,7 +15,6 @@ def validate_label_specs(specs: Mapping[str, FleetLabelsSpecV1]) -> None:
     We cannot catch all potential errors through json schema definition.
     """
     for spec in specs.values():
-        _validate_ocm_token_spec(spec.ocm)
         _validate_match_labels(spec)
         _validate_unique_ocm_managed_label_combo(spec)
 
@@ -63,21 +49,3 @@ def _validate_match_labels(spec: FleetLabelsSpecV1) -> None:
             raise MatchLabelsNotUniqueError(
                 f"The 'matchSubscriptionLabels' combinations must be unique within a spec. Found duplicates in spec {spec.name} for matchers: {duplicates}"
             )
-
-
-def _validate_ocm_token_spec(ocm: OpenShiftClusterManagerV1) -> None:
-    """
-    OCM tokens are optional in the schema. Lets verify they exist.
-    """
-    if not ocm.access_token_client_id:
-        raise OCMAccessTokenClientIdMissing(
-            f"accessTokenClientId missing in ocm spec '{ocm.name}'"
-        )
-    if not ocm.access_token_client_secret:
-        raise OCMAccessTokenClientSecretMissing(
-            f"accessTokenClientSecret missing in ocm spec '{ocm.name}'"
-        )
-    if not ocm.access_token_url:
-        raise OCMAccessTokenUrlMissing(
-            f"accessTokenUrl missing in ocm spec '{ocm.name}'"
-        )

reconcile/gql_definitions/fleet_labeler/fleet_labels.py

@@ -34,11 +34,9 @@ query FleetLabelSpecs {
         path
         managedSubscriptionLabelPrefix
         dryRunLabelSynchronization
-        ocm {
+        ocmEnv {
             name
-            environment {
-                url
-            }
+            url
             accessTokenClientId
             accessTokenClientSecret {
                 ... VaultSecret
@@ -75,15 +73,11 @@ class ConfiguredBaseModel(BaseModel):
 
 
 class OpenShiftClusterManagerEnvironmentV1(ConfiguredBaseModel):
-    url: str = Field(..., alias="url")
-
-
-class OpenShiftClusterManagerV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
-    environment: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="environment")
-    access_token_client_id: Optional[str] = Field(..., alias="accessTokenClientId")
-    access_token_client_secret: Optional[VaultSecret] = Field(..., alias="accessTokenClientSecret")
-    access_token_url: Optional[str] = Field(..., alias="accessTokenUrl")
+    url: str = Field(..., alias="url")
+    access_token_client_id: str = Field(..., alias="accessTokenClientId")
+    access_token_client_secret: VaultSecret = Field(..., alias="accessTokenClientSecret")
+    access_token_url: str = Field(..., alias="accessTokenUrl")
 
 
 class ResourceV1(ConfiguredBaseModel):
@@ -115,7 +109,7 @@ class FleetLabelsSpecV1(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
     managed_subscription_label_prefix: str = Field(..., alias="managedSubscriptionLabelPrefix")
     dry_run_label_synchronization: Optional[bool] = Field(..., alias="dryRunLabelSynchronization")
-    ocm: OpenShiftClusterManagerV1 = Field(..., alias="ocm")
+    ocm_env: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="ocmEnv")
     label_defaults: list[FleetLabelDefaultV1] = Field(..., alias="labelDefaults")
     clusters: list[FleetClusterV1] = Field(..., alias="clusters")
 

reconcile/gql_definitions/introspection.json

@@ -34382,7 +34382,7 @@
                             "deprecationReason": null
                         },
                         {
-                            "name": "ocm",
+                            "name": "ocmEnv",
                             "description": null,
                             "args": [],
                             "type": {
@@ -34390,7 +34390,7 @@
                                 "name": null,
                                 "ofType": {
                                     "kind": "OBJECT",
-                                    "name": "OpenShiftClusterManager_v1",
+                                    "name": "OpenShiftClusterManagerEnvironment_v1",
                                     "ofType": null
                                 }
                             },