qontract-reconcile 0.10.1rc810__py3-none-any.whl → 0.10.1rc812__py3-none-any.whl

{qontract_reconcile-0.10.1rc810.dist-info → qontract_reconcile-0.10.1rc812.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
-reconcile/cli.py,sha256=q0DYN65kPT_4GmnE4tb-VczkNwEDqfAQq7d9lJ6AM-I,101474
+reconcile/cli.py,sha256=laiCfiVjXsDnT5z18q_XGkH6tZdBSxKVva7nF4B0OQw,101452
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
@@ -20,7 +20,6 @@ reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,89
 reconcile/dashdotdb_slo.py,sha256=bf1WSh5JP9obHVQsMy0OO71_VTYZgwAopElFZM6DmRo,6714
 reconcile/database_access_manager.py,sha256=42dBJyihdwx4WjEBjwi3lUiDzQ1t_2ZFViJri2c4_aE,25716
 reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7491
-reconcile/dynatrace_token_provider.py,sha256=P5jvMavremWp64LVknz1kCZI4aagwLrDDfXkmJ9diwY,17212
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
 reconcile/gabi_authorized_users.py,sha256=4jJNtmEwLqg2-keuWZ3sjKV-OMn7C9pfXWWdssVua8Y,4883
 reconcile/gcr_mirror.py,sha256=PAMnIL7tRTwt8KMZf-wM2k0r_et3LBgyJCEeyuqEM5E,8827
@@ -178,6 +177,9 @@ reconcile/cna/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 reconcile/cna/assets/asset.py,sha256=1v51uYSaD1NOc9cI_YxG7h0NOcR1ng-mkmD2UzQ8PXE,866
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
+reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+reconcile/dynatrace_token_provider/integration.py,sha256=d13ulyEYD9U32D6s641o_Oibx1g4f6jr1vHQL_KbZts,16257
+reconcile/dynatrace_token_provider/metrics.py,sha256=F92Vh8CQBFs-bCF3pNpd8ZqsBwqgyK-A6pOCu_eAI1s,1074
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=JvjKaABy2Pg8u8Lq82Acv4zMvpE3_qGKes7OG-zlHOM,2956
 reconcile/external_resources/factories.py,sha256=bLboXX5Dq0xN60mtDGNjCOLC6HlKofXMWQxVbRwMMwo,4485
@@ -804,8 +806,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc810.dist-info/METADATA,sha256=n3ZgO9W7tKyfp-kEiwn2DFEtQk3bFNAt8_po8tfA-_k,2314
-qontract_reconcile-0.10.1rc810.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc810.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc810.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc810.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc812.dist-info/METADATA,sha256=QXU980PcvIHdOFuelv2B6GonzS6eVILVn804A1venVA,2314
+qontract_reconcile-0.10.1rc812.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc812.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc812.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc812.dist-info/RECORD,,

reconcile/cli.py

@@ -2953,20 +2953,20 @@ def cluster_auth_rhidp(ctx):
 )
 @click.option(
     "--ocm-org-ids",
-    help="A comma seperated list of OCM organization IDs DTP should operator on. If none is specified, all organizations are considered.",
+    help="A comma seperated list of OCM organization IDs DTP should operate on. If none is specified, all organizations are considered.",
     required=False,
     envvar="DTP_OCM_ORG_IDS",
 )
 @click.pass_context
 def dynatrace_token_provider(ctx, ocm_org_ids):
-    from reconcile import dynatrace_token_provider
-    from reconcile.dynatrace_token_provider import (
+    from reconcile.dynatrace_token_provider.integration import (
+        DynatraceTokenProviderIntegration,
         DynatraceTokenProviderIntegrationParams,
     )
 
     parsed_ocm_org_ids = set(ocm_org_ids.split(",")) if ocm_org_ids else None
     run_class_integration(
-        integration=dynatrace_token_provider.DynatraceTokenProviderIntegration(
+        integration=DynatraceTokenProviderIntegration(
             DynatraceTokenProviderIntegrationParams(
                 ocm_organization_ids=parsed_ocm_org_ids
             )

reconcile/{dynatrace_token_provider.py → dynatrace_token_provider/integration.py}

@@ -1,18 +1,19 @@
 import base64
 import logging
 import sys
+from collections.abc import Iterable
 from datetime import timedelta
 from typing import (
     Any,
     Mapping,
-    Optional,
-    Union,
 )
 
 from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenCreated
-from pydantic import BaseModel
 
+from reconcile.dynatrace_token_provider.metrics import (
+    DTPOrganizationErrorRate,
+)
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
 )
@@ -27,10 +28,6 @@ from reconcile.utils import (
     gql,
     metrics,
 )
-from reconcile.utils.metrics import (
-    CounterMetric,
-    ErrorRateMetricSet,
-)
 from reconcile.utils.ocm.base import (
     OCMClusterServiceLogCreateModel,
     OCMServiceLogSeverity,
@@ -66,11 +63,11 @@ DYNATRACE_OPERATOR_TOKEN_NAME = "dynatrace-operator-token"
 
 
 class DynatraceTokenProviderIntegrationParams(PydanticRunParams):
-    ocm_organization_ids: Optional[set[str]] = None
+    ocm_organization_ids: set[str] | None = None
 
 
 class ReconcileErrorSummary(Exception):
-    def __init__(self, exceptions: list[str]) -> None:
+    def __init__(self, exceptions: Iterable[str]) -> None:
         self.exceptions = exceptions
 
     def __str__(self) -> str:
@@ -78,43 +75,6 @@ class ReconcileErrorSummary(Exception):
         return f"Reconcile exceptions:\n{formatted_exceptions}"
 
 
-class DTPBaseMetric(BaseModel):
-    integration: str
-    ocm_env: str
-
-
-class DTPOrganizationReconcileCounter(DTPBaseMetric, CounterMetric):
-    org_id: str
-
-    @classmethod
-    def name(cls) -> str:
-        return "dtp_organization_reconciled"
-
-
-class DTPOrganizationReconcileErrorCounter(DTPBaseMetric, CounterMetric):
-    org_id: str
-
-    @classmethod
-    def name(cls) -> str:
-        return "dtp_organization_reconcile_errors"
-
-
-class DTPOrganizationErrorRate(ErrorRateMetricSet):
-    def __init__(self, integration: str, org_id: str, ocm_env: str) -> None:
-        super().__init__(
-            counter=DTPOrganizationReconcileCounter(
-                integration=integration,
-                ocm_env=ocm_env,
-                org_id=org_id,
-            ),
-            error_counter=DTPOrganizationReconcileErrorCounter(
-                integration=integration,
-                ocm_env=ocm_env,
-                org_id=org_id,
-            ),
-        )
-
-
 class DynatraceTokenProviderIntegration(
     QontractReconcileIntegration[DynatraceTokenProviderIntegrationParams]
 ):
@@ -201,7 +161,7 @@ class DynatraceTokenProviderIntegration(
 
     def get_all_dynatrace_clients(
         self, secret_reader: SecretReaderBase
-    ) -> Mapping[str, Dynatrace]:
+    ) -> dict[str, Dynatrace]:
         dt_tenants = self.get_all_dynatrace_tenants()
         dynatrace_clients = {}
         if not dt_tenants.environments:
@@ -230,7 +190,7 @@ class DynatraceTokenProviderIntegration(
         cluster: ClusterDetails,
         dt_client: Dynatrace,
         ocm_client: OCMBaseClient,
-        existing_dtp_tokens: list[str],
+        existing_dtp_tokens: Iterable[str],
         tenant_id: str,
     ) -> None:
         existing_syncset = self.get_syncset(ocm_client, cluster)
@@ -316,7 +276,7 @@ class DynatraceTokenProviderIntegration(
 
     def get_syncset(
         self, ocm_client: OCMBaseClient, cluster: ClusterDetails
-    ) -> Mapping:
+    ) -> dict[str, Any]:
         try:
             syncset = get_syncset(ocm_client, cluster.ocm_cluster.id, SYNCSET_ID)
         except Exception as e:
@@ -326,8 +286,8 @@ class DynatraceTokenProviderIntegration(
                 raise e
         return syncset
 
-    def get_tokens_from_syncset(self, syncset: Mapping) -> Mapping:
-        tokens = {}
+    def get_tokens_from_syncset(self, syncset: Mapping[str, Any]) -> dict:
+        tokens: dict[str, Any] = {}
         for resource in syncset["resources"]:
             if resource["kind"] == "Secret":
                 operator_token_id = self.base64_decode(resource["data"]["apiTokenId"])
@@ -424,7 +384,7 @@ class DynatraceTokenProviderIntegration(
         return (ingestion_token, operation_token)
 
 
-def dtp_label_key(config_atom: Union[str, None]) -> str:
+def dtp_label_key(config_atom: str | None) -> str:
     return sre_capability_label_key("dtp", config_atom)
 
 
@@ -436,7 +396,7 @@ def _expose_errors_as_service_log(
         service_log=OCMClusterServiceLogCreateModel(
             cluster_uuid=cluster_uuid,
             severity=OCMServiceLogSeverity.Warning,
-            summary="Cluster upgrade policy validation errors",
+            summary="Dynatrace Token Provider Errors",
             description=f"\n {error}",
             service_name=QONTRACT_INTEGRATION,
         ),

reconcile/dynatrace_token_provider/metrics.py

@@ -0,0 +1,43 @@
+from pydantic import BaseModel
+
+from reconcile.utils.metrics import (
+    CounterMetric,
+    ErrorRateMetricSet,
+)
+
+
+class DTPBaseMetric(BaseModel):
+    integration: str
+    ocm_env: str
+
+
+class DTPOrganizationReconcileCounter(DTPBaseMetric, CounterMetric):
+    org_id: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "dtp_organization_reconciled"
+
+
+class DTPOrganizationReconcileErrorCounter(DTPBaseMetric, CounterMetric):
+    org_id: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "dtp_organization_reconcile_errors"
+
+
+class DTPOrganizationErrorRate(ErrorRateMetricSet):
+    def __init__(self, integration: str, org_id: str, ocm_env: str) -> None:
+        super().__init__(
+            counter=DTPOrganizationReconcileCounter(
+                integration=integration,
+                ocm_env=ocm_env,
+                org_id=org_id,
+            ),
+            error_counter=DTPOrganizationReconcileErrorCounter(
+                integration=integration,
+                ocm_env=ocm_env,
+                org_id=org_id,
+            ),
+        )