qontract-reconcile 0.10.2.dev92__py3-none-any.whl → 0.10.2.dev93__py3-none-any.whl

{qontract_reconcile-0.10.2.dev92.dist-info → qontract_reconcile-0.10.2.dev93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev92
+Version: 0.10.2.dev93
 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.dev92.dist-info → qontract_reconcile-0.10.2.dev93.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=usNTif2yrzWp7V24QHmMI1bd4QxwObYbxsqfJAYREXc,26576
+reconcile/dynatrace_token_provider/integration.py,sha256=ysPto7wPZW_t3KFXyWOxRNQT140Q4OOe3Eu4BX0p6Uo,26505
 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=MwYCZIxW4f-1jzFTxxN__sity6S8O7bbKUdyTFEVO7U,4325
+reconcile/dynatrace_token_provider/ocm.py,sha256=7P0AoyAhAmvH9ffKMEE3HB9sCmWvrwYcSBscsVt5964,4729
 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.dev92.dist-info/METADATA,sha256=jLJhRpJR82Z3TVBJRPKXiwDJF_rs9_Vz9L9aaajBipo,24565
-qontract_reconcile-0.10.2.dev92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev92.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev92.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev93.dist-info/METADATA,sha256=OCfp9-cXH8VsKHhK1x5598Kh2bXedhZ9huHZ0qp59U8,24565
+qontract_reconcile-0.10.2.dev93.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev93.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev93.dist-info/RECORD,,

reconcile/dynatrace_token_provider/integration.py

@@ -117,14 +117,14 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
             token_spec = token_spec_by_name.get(cluster.token_spec_name)
             if not token_spec:
                 logging.debug(
-                    f"[{cluster.external_id=}] Skipping cluster. {cluster.token_spec_name=} does not exist."
+                    f"[{cluster.id=}] Skipping cluster. {cluster.token_spec_name=} does not exist."
                 )
                 continue
             if cluster.organization_id in token_spec.ocm_org_ids:
                 filtered_clusters.append(cluster)
             else:
                 logging.debug(
-                    f"[{cluster.external_id=}] Skipping cluster for {token_spec.name=}. {cluster.organization_id=} is not defined in {token_spec.ocm_org_ids=}."
+                    f"[{cluster.id=}] Skipping cluster for {token_spec.name=}. {cluster.organization_id=} is not defined in {token_spec.ocm_org_ids=}."
                 )
         return filtered_clusters
 
@@ -175,7 +175,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                                     error=f"Missing label {DTP_TENANT_LABEL}",
                                 )
                                 logging.warn(
-                                    f"[{cluster.external_id=}] Missing value for label {DTP_TENANT_LABEL}"
+                                    f"[{cluster.id=}] Missing value for label {DTP_TENANT_LABEL}"
                                 )
                                 continue
                             if (
@@ -188,7 +188,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                                     error=f"Dynatrace tenant {tenant_id} does not exist",
                                 )
                                 logging.warn(
-                                    f"[{cluster.external_id=}] Dynatrace {tenant_id=} does not exist"
+                                    f"[{cluster.id=}] Dynatrace {tenant_id=} does not exist"
                                 )
                                 continue
                             dt_client = dependencies.dynatrace_client_by_tenant_id[
@@ -205,7 +205,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                                     error=f"Token spec {cluster.token_spec_name} does not exist",
                                 )
                                 logging.warn(
-                                    f"[{cluster.external_id=}] Token spec '{cluster.token_spec_name}' does not exist"
+                                    f"[{cluster.id=}] Token spec '{cluster.token_spec_name}' does not exist"
                                 )
                                 continue
                             if tenant_id not in existing_dtp_tokens:
@@ -232,7 +232,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                             )
                     except Exception as e:
                         unhandled_exceptions.append(
-                            f"{ocm_env_name}/{cluster.organization_id}/{cluster.external_id}: {e}"
+                            f"{ocm_env_name}/{cluster.organization_id}/{cluster.id}: {e}"
                         )
                 self._expose_token_metrics()
 
@@ -289,11 +289,9 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                         f"DTP can't create {token_spec.name=} {e.args!s}",
                     )
             logging.info(
-                f"{token_spec.name=} created in {dt_api_url} for {cluster.external_id=}."
-            )
-            logging.info(
-                f"{SYNCSET_AND_MANIFEST_ID} created for {cluster.external_id=}."
+                f"{token_spec.name=} created in {dt_api_url} for {cluster.id=}."
             )
+            logging.info(f"{SYNCSET_AND_MANIFEST_ID} created for {cluster.id=}.")
         else:
             current_k8s_secrets: list[K8sSecret] = []
             if cluster.is_hcp:
@@ -344,7 +342,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                             f"DTP can't patch {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} due to {e.args!s}",
                         )
                 logging.info(
-                    f"Patched {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} in {cluster.external_id=}."
+                    f"Patched {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} in {cluster.id=}."
                 )
 
     def scopes_hash(self, scopes: Iterable[str], length: int) -> str:
@@ -425,7 +423,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                             dt_client, cluster_uuid, desired_token
                         )
                         existing_dtp_tokens[cur_token.id] = cur_token.name
-                if cur_token:
+                if cur_token and cur_token.id in existing_dtp_tokens:
                     self.sync_token_in_dynatrace(
                         token_id=cur_token.id,
                         spec=desired_token,

reconcile/dynatrace_token_provider/ocm.py

@@ -38,6 +38,9 @@ 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")
+
 
 class Cluster(BaseModel):
     id: str
@@ -49,8 +52,14 @@ class Cluster(BaseModel):
 
     @staticmethod
     def from_cluster_details(cluster: ClusterDetails) -> Cluster:
-        dt_tenant = cluster.labels.get_label_value(DTP_TENANT_LABEL)
-        token_spec_name = cluster.labels.get_label_value(DTP_SPEC_LABEL)
+        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.