qontract-reconcile 0.10.1rc1049__py3-none-any.whl → 0.10.1rc1051__py3-none-any.whl

{qontract_reconcile-0.10.1rc1049.dist-info → qontract_reconcile-0.10.1rc1051.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=2Qxyuwrp90j9Pox_2px5LZDn8oomwrQuFtdY85xMBOE,107389
+reconcile/cli.py,sha256=JCKHmEpzb1MnjtyBlyRPo27J2z03J1rrQ680Nlu7_m8,106890
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -181,7 +181,7 @@ 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=Il2DIgeeOjaVtI8A7ou4SbWCo7vpiAopwDxhn5geaEo,25691
+reconcile/dynatrace_token_provider/integration.py,sha256=Wgjv6UkMmPa8V0baHt0zk9sv5KENVeaStdIY1j7DKqE,26049
 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=66XfJact_PZoa9c8Wz0t_n8N6aSMRQpfPLgKHYtWf8s,4307
@@ -776,14 +776,14 @@ reconcile/utils/merge_request_manager/parser.py,sha256=5pGoz8Q6EuYXlUc1z-D0FahdR
 reconcile/utils/mr/__init__.py,sha256=hcfHDIIIsJT4C0BnzDnyeZEfZdamrqHzMLcBzIT1ibI,2578
 reconcile/utils/mr/app_interface_reporter.py,sha256=6Kpg93V9FvcOke9Jimkva359MQ-ZyBIkUpf8QIA6-to,1793
 reconcile/utils/mr/aws_access.py,sha256=w-UJutB_OfBJOvr-gsPzhtBPkDfKcNZZWGGuI9cN3HI,2605
-reconcile/utils/mr/base.py,sha256=TP6xaxznxsF_v2KcC_D3ut1cX_4KCcx4pjIC1-4eZUY,7307
+reconcile/utils/mr/base.py,sha256=UwA_jm_2vMlWg-Y3oYlGWoXLgrTLBQGKtwIasJSK9_8,8105
 reconcile/utils/mr/clusters_updates.py,sha256=pcusPAwRUkvyk_-bixsRNTzSvpTLypJ1kflq5UEVgcM,2271
 reconcile/utils/mr/glitchtip_access_reporter.py,sha256=i5vo9jjBifX5wIcLwEMH5_VFVg-NY-pBKe0HysSw4CQ,5031
 reconcile/utils/mr/labels.py,sha256=9QRTRjZAtq45zELd9SwavaraczMjwjn5no3RK1YxFTg,825
 reconcile/utils/mr/notificator.py,sha256=cp80wFzu_ZzrJPye7L1pI0H6JRGb7hOGuNxJYUq4Yr8,2967
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOGBOEgPZLH4nC1hcuef74LWw2Rpk,3004
-reconcile/utils/mr/promote_qontract.py,sha256=8cYAa2zW47ZsqqG8aQ8Akj31NQPc9ARN936_OY7t1pI,7016
+reconcile/utils/mr/promote_qontract.py,sha256=704SOkLBioEwXITEr2mNdqpXA30J7kuUq1kQ4Q_mN8c,6693
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
@@ -867,8 +867,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.1rc1049.dist-info/METADATA,sha256=D5PDDDmCzGGwdJ4MCHf2rBEApxpHBaSAtT97Krh_aWA,2213
-qontract_reconcile-0.10.1rc1049.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1049.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1049.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1049.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1051.dist-info/METADATA,sha256=OCC0UVReNHQheyMr9wl3_gbSoQwD8OkgyIIB5df-Y6c,2213
+qontract_reconcile-0.10.1rc1051.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1051.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1051.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1051.dist-info/RECORD,,

reconcile/cli.py

@@ -3107,26 +3107,14 @@ def cluster_auth_rhidp(ctx):
 @integration.command(
     short_help="Automatically provide dedicated Dynatrace tokens to management clusters"
 )
-@click.option(
-    "--ocm-org-ids",
-    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):
+def dynatrace_token_provider(ctx):
     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=DynatraceTokenProviderIntegration(
-            DynatraceTokenProviderIntegrationParams(
-                ocm_organization_ids=parsed_ocm_org_ids,
-            )
-        ),
+        integration=DynatraceTokenProviderIntegration(),
         ctx=ctx.obj,
     )
 

reconcile/dynatrace_token_provider/integration.py

@@ -38,7 +38,7 @@ from reconcile.utils.ocm.base import (
 )
 from reconcile.utils.ocm.labels import subscription_label_filter
 from reconcile.utils.runtime.integration import (
-    PydanticRunParams,
+    NoParams,
     QontractReconcileIntegration,
 )
 
@@ -46,10 +46,6 @@ QONTRACT_INTEGRATION = "dynatrace-token-provider"
 SYNCSET_AND_MANIFEST_ID = "ext-dynatrace-tokens-dtp"
 
 
-class DynatraceTokenProviderIntegrationParams(PydanticRunParams):
-    ocm_organization_ids: set[str] | None = None
-
-
 class ReconcileErrorSummary(Exception):
     def __init__(self, exceptions: Iterable[str]) -> None:
         self.exceptions = exceptions
@@ -59,11 +55,9 @@ class ReconcileErrorSummary(Exception):
         return f"Reconcile exceptions:\n{formatted_exceptions}"
 
 
-class DynatraceTokenProviderIntegration(
-    QontractReconcileIntegration[DynatraceTokenProviderIntegrationParams]
-):
-    def __init__(self, params: DynatraceTokenProviderIntegrationParams) -> None:
-        super().__init__(params=params)
+class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
+    def __init__(self) -> None:
+        super().__init__(NoParams())
         self._lock = Lock()
         self._managed_tokens_cnt: dict[str, Counter[str]] = defaultdict(Counter)
 
@@ -106,6 +100,27 @@ class DynatraceTokenProviderIntegration(
                     cnt,
                 )
 
+    def _filter_clusters(
+        self,
+        clusters: Iterable[Cluster],
+        token_spec_by_name: Mapping[str, DynatraceTokenProviderTokenSpecV1],
+    ) -> list[Cluster]:
+        filtered_clusters = []
+        for cluster in clusters:
+            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."
+                )
+                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=}."
+                )
+        return filtered_clusters
+
     def reconcile(self, dry_run: bool, dependencies: Dependencies) -> None:
         token_specs = list(dependencies.token_spec_by_name.values())
         validate_token_specs(specs=token_specs)
@@ -124,12 +139,10 @@ class DynatraceTokenProviderIntegration(
                     unhandled_exceptions.append(f"{ocm_env_name}: {e}")
                 if not clusters:
                     continue
-                if self.params.ocm_organization_ids:
-                    clusters = [
-                        cluster
-                        for cluster in clusters
-                        if cluster.organization_id in self.params.ocm_organization_ids
-                    ]
+                filtered_clusters = self._filter_clusters(
+                    clusters=clusters,
+                    token_spec_by_name=dependencies.token_spec_by_name,
+                )
 
                 existing_dtp_tokens: dict[str, dict[str, str]] = {}
 
@@ -140,7 +153,7 @@ class DynatraceTokenProviderIntegration(
                     ),
                     len(clusters),
                 )
-                for cluster in clusters:
+                for cluster in filtered_clusters:
                     try:
                         with DTPOrganizationErrorRate(
                             integration=self.name,
@@ -230,11 +243,6 @@ class DynatraceTokenProviderIntegration(
         token_spec: DynatraceTokenProviderTokenSpecV1,
         ocm_env_name: str,
     ) -> None:
-        if cluster.organization_id not in token_spec.ocm_org_ids:
-            logging.info(
-                f"[{token_spec.name=}] Cluster {cluster.external_id} is not part of ocm orgs defined in {token_spec.ocm_org_ids=}"
-            )
-            return
         existing_data = {}
         if cluster.is_hcp:
             existing_data = self.get_manifest(ocm_client=ocm_client, cluster=cluster)

reconcile/utils/mr/base.py

@@ -4,12 +4,15 @@ from abc import (
     ABC,
     abstractmethod,
 )
+from collections.abc import Iterable
 from typing import Any
 from uuid import uuid4
 
 from gitlab.exceptions import GitlabError
 from jinja2 import Template
 
+from reconcile import typed_queries
+from reconcile.gql_definitions.fragments.user import User
 from reconcile.utils.constants import PROJ_ROOT
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.labels import DO_NOT_MERGE_HOLD
@@ -108,6 +111,26 @@ class MergeRequestBase(ABC):
             **self.sqs_msg_data,
         }
 
+    def infer_author(
+        self, author_email: str | None, all_users: Iterable[User] | None = None
+    ) -> str | None:
+        if not author_email:
+            return None
+        if not all_users:
+            return None
+
+        username = author_email.split("@")[0]
+        users = None
+        if author_email.endswith(typed_queries.smtp.settings().mail_address):
+            users = [u for u in all_users if username == u.org_username]
+        elif author_email.endswith("users.noreply.github.com"):
+            users = [u for u in all_users if username == u.github_username]
+
+        if users:
+            return users[0].org_username
+
+        return None
+
     def submit_to_sqs(self, sqs_cli: SQSGateway) -> None:
         """
         Sends the MR message to SQS.

reconcile/utils/mr/promote_qontract.py

@@ -1,8 +1,6 @@
 from jsonpath_ng.ext import parser
 from ruamel.yaml.compat import StringIO
 
-from reconcile import typed_queries
-from reconcile.gql_definitions.fragments.user import User
 from reconcile.typed_queries.users import get_users
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.base import MergeRequestBase
@@ -12,9 +10,10 @@ from reconcile.utils.ruamel import create_ruamel_instance
 class PromoteQontractSchemas(MergeRequestBase):
     name = "promote_qontract_schemas"
 
-    def __init__(self, version: str):
+    def __init__(self, version: str, author_email: str | None = None):
         self.path = ".env"
         self.version = version
+        self.author_email = author_email
 
         super().__init__()
 
@@ -22,7 +21,16 @@ class PromoteQontractSchemas(MergeRequestBase):
 
     @property
     def title(self) -> str:
-        return f"[{self.name}] promote qontract-schemas to version {self.version}"
+        author = self.infer_author(
+            author_email=self.author_email, all_users=get_users()
+        )
+        return f"[{self.name}] promote qontract-schemas to version {self.version}" + (
+            f" by @{author}"
+            if author
+            else f" by {self.author_email}"
+            if self.author_email
+            else ""
+        )
 
     @property
     def description(self) -> str:
@@ -60,27 +68,11 @@ class PromoteQontractReconcileCommercial(MergeRequestBase):
 
         self.labels = []
 
-    def author(self, all_users: list[User] | None = None) -> str | None:
-        if not self.author_email:
-            return None
-        if not all_users:
-            return None
-
-        username = self.author_email.split("@")[0]
-        users = None
-        if self.author_email.endswith(typed_queries.smtp.settings().mail_address):
-            users = [u for u in all_users if username == u.org_username]
-        elif self.author_email.endswith("users.noreply.github.com"):
-            users = [u for u in all_users if username == u.github_username]
-
-        if users:
-            return users[0].org_username
-
-        return None
-
     @property
     def title(self) -> str:
-        author = self.author(all_users=get_users())
+        author = self.infer_author(
+            author_email=self.author_email, all_users=get_users()
+        )
         return f"[{self.name}] promote qontract-reconcile to version {self.version}" + (
             f" by @{author}"
             if author