qontract-reconcile 0.10.2.dev101__py3-none-any.whl → 0.10.2.dev103__py3-none-any.whl

{qontract_reconcile-0.10.2.dev101.dist-info → qontract_reconcile-0.10.2.dev103.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev101
+Version: 0.10.2.dev103
 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.dev101.dist-info → qontract_reconcile-0.10.2.dev103.dist-info}/RECORD

@@ -34,7 +34,7 @@ reconcile/gitlab_housekeeping.py,sha256=Gy1mhn33xGp9IyQFqs4VrBmhwJBD6x90XITDR_pU
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=MUIgYDLeJx2-_vMypyq2Pa17cpKdXATYhtVACS2ghpQ,8297
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
-reconcile/gitlab_owners.py,sha256=Y3i-WqXhszLGqGmddt-tJ3OM2b_cViqDs1Ru1P1aQEM,13405
+reconcile/gitlab_owners.py,sha256=qDiCe5So5IaNOQl9i2kbUryzJKMFqEy5nRaEj2sGf6A,13938
 reconcile/gitlab_permissions.py,sha256=gSGH6gAdJbPy5Z0rQGUqiNQSHty_tXQ_3Y4OQP_8nFs,8067
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=CY7cOj5dzt2se4IOg11VQvGQ-eTvLML5Q42Z9SSgeSk,9463
@@ -184,8 +184,8 @@ reconcile/cna/assets/asset.py,sha256=KWgA4fuDAEGsJwmR52WwK_YgSJMW-1cV2la3lmNf4iE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 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=RmptOa5CYrKNMZqCQhmP_AsC3L-BCKhjmM8otj6a7OY,26514
+reconcile/dynatrace_token_provider/dependencies.py,sha256=lvkdwqHMsn_2kgj-tUIJdTUnUNxVoS6z8k4nPkGglnQ,3129
+reconcile/dynatrace_token_provider/integration.py,sha256=d2iAQ_NUUIVN4I0_Y-LQQtWuWuzclJcXGQC8dEWYGvQ,26365
 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=bryaK7xs7ygttUyZuSD9Up4laUhP6OUTr2VBbFiclpA,4298
@@ -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.dev101.dist-info/METADATA,sha256=LKKc1ckXIPdqj9wyVhdMrpGRkeIe_a2YlRPXqrWizQg,24566
-qontract_reconcile-0.10.2.dev101.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev101.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev101.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev103.dist-info/METADATA,sha256=RaKLd8O3Dq4_Ru3Wk8xxxo37BDqOV9kCRcvV6yNtRDI,24566
+qontract_reconcile-0.10.2.dev103.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev103.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev103.dist-info/RECORD,,

reconcile/dynatrace_token_provider/dependencies.py

@@ -1,4 +1,5 @@
 from collections.abc import Mapping
+from typing import Self
 
 from reconcile.dynatrace_token_provider.ocm import OCMClient
 from reconcile.gql_definitions.dynatrace_token_provider.token_specs import (
@@ -36,34 +37,45 @@ class Dependencies:
         self.ocm_client_by_env_name: dict[str, OCMClient] = dict(ocm_client_by_env_name)
         self.token_spec_by_name = dict(token_spec_by_name)
 
-    def populate_all(self) -> None:
-        self.populate_dynatrace_client_map()
-        self.populate_ocm_clients()
-        self.populate_token_specs()
+    @classmethod
+    def create(cls, secret_reader: SecretReaderBase) -> Self:
+        return cls(
+            secret_reader=secret_reader,
+            dynatrace_client_by_tenant_id=_dynatrace_client_map(
+                secret_reader=secret_reader
+            ),
+            ocm_client_by_env_name=_ocm_clients(secret_reader=secret_reader),
+            token_spec_by_name=_token_specs(),
+        )
+
+
+def _token_specs() -> dict[str, DynatraceTokenProviderTokenSpecV1]:
+    token_specs = get_dynatrace_token_provider_token_specs()
+    return {spec.name: spec for spec in token_specs}
 
-    def populate_token_specs(self) -> None:
-        token_specs = get_dynatrace_token_provider_token_specs()
-        self.token_spec_by_name = {spec.name: spec for spec in token_specs}
 
-    def populate_dynatrace_client_map(self) -> None:
-        dynatrace_environments = get_dynatrace_environments()
-        if not dynatrace_environments:
-            raise RuntimeError("No Dynatrace environment defined.")
-        for tenant in dynatrace_environments:
-            dt_api_token = self.secret_reader.read_secret(tenant.bootstrap_token)
-            dt_client = DynatraceClient.create(
-                environment_url=tenant.environment_url,
-                token=dt_api_token,
-                api=None,
-            )
-            tenant_id = tenant.environment_url.split(".")[0].removeprefix("https://")
-            self.dynatrace_client_by_tenant_id[tenant_id] = dt_client
+def _dynatrace_client_map(
+    secret_reader: SecretReaderBase,
+) -> dict[str, DynatraceClient]:
+    dynatrace_client_by_tenant_id: dict[str, DynatraceClient] = {}
+    dynatrace_environments = get_dynatrace_environments()
+    if not dynatrace_environments:
+        raise RuntimeError("No Dynatrace environment defined.")
+    for tenant in dynatrace_environments:
+        dt_api_token = secret_reader.read_secret(tenant.bootstrap_token)
+        dt_client = DynatraceClient.create(
+            environment_url=tenant.environment_url,
+            token=dt_api_token,
+            api=None,
+        )
+        tenant_id = tenant.environment_url.split(".")[0].removeprefix("https://")
+        dynatrace_client_by_tenant_id[tenant_id] = dt_client
+    return dynatrace_client_by_tenant_id
+
 
-    def populate_ocm_clients(self) -> None:
-        ocm_environments = get_ocm_environments()
-        self.ocm_client_by_env_name = {
-            env.name: OCMClient(
-                ocm_client=init_ocm_base_client(env, self.secret_reader)
-            )
-            for env in ocm_environments
-        }
+def _ocm_clients(secret_reader: SecretReaderBase) -> dict[str, OCMClient]:
+    ocm_environments = get_ocm_environments()
+    return {
+        env.name: OCMClient(ocm_client=init_ocm_base_client(env, secret_reader))
+        for env in ocm_environments
+    }

reconcile/dynatrace_token_provider/integration.py

@@ -82,13 +82,9 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
         return QONTRACT_INTEGRATION
 
     def run(self, dry_run: bool) -> None:
-        dependencies = Dependencies(
+        dependencies = Dependencies.create(
             secret_reader=self.secret_reader,
-            dynatrace_client_by_tenant_id={},
-            ocm_client_by_env_name={},
-            token_spec_by_name={},
         )
-        dependencies.populate_all()
         self.reconcile(dry_run=dry_run, dependencies=dependencies)
 
     def _token_cnt(self, dt_tenant_id: str, ocm_env_name: str) -> None:

reconcile/gitlab_owners.py

@@ -94,6 +94,13 @@ class MRApproval:
             lgtms.append(comment["username"])
         return lgtms
 
+    def expand_groups(self, owners: list[str]) -> set[str]:
+        members: set[str] = set()
+        for name in owners:
+            if group := self.gitlab.get_group_if_exists(name):
+                members.update(m.username for m in self.gitlab.get_group_members(group))
+        return members.union(owners)
+
     def get_approval_status(self):
         approval_status = {"approved": False, "report": None}
 
@@ -117,6 +124,13 @@ class MRApproval:
                 if approver in lgtms:
                     change_approved = True
 
+            if (
+                not change_approved
+                and lgtms
+                and self.expand_groups(change_owners["approvers"]).intersection(lgtms)
+            ):
+                change_approved = True
+
             # Each change that was not yet approved will generate
             # a report message
             report[change_path] = {}