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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev97
+Version: 0.10.2.dev98
 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.dev98.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
@@ -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.dev98.dist-info/METADATA,sha256=MejCD_NtyQK68CSmDQ5laTsLKIDzMVDVp_YkPtbRvMs,24565
+qontract_reconcile-0.10.2.dev98.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev98.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev98.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(