qontract-reconcile 0.10.2.dev102__py3-none-any.whl → 0.10.2.dev104__py3-none-any.whl

{qontract_reconcile-0.10.2.dev102.dist-info → qontract_reconcile-0.10.2.dev104.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev102
+Version: 0.10.2.dev104
 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.dev102.dist-info → qontract_reconcile-0.10.2.dev104.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
@@ -197,7 +197,7 @@ reconcile/endpoints_discovery/merge_request_manager.py,sha256=a8zTIQIpRrUwXexZCl
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=q9ub1vI4meG8YzM6A88Q422XkTu6Y3ja12GuMjCwISs,11631
 reconcile/external_resources/factories.py,sha256=C0QHT0soEv6z99-ELAAE19S5MaMHhV0t1fSiQn0Coc4,5970
-reconcile/external_resources/integration.py,sha256=JF38M7R0Z4ADUTx57TZqSZH9k_xpPlbAxQAcGyIISuM,6925
+reconcile/external_resources/integration.py,sha256=WF6O4rT0oUHbNaWEemjLLzCqdNSQIUaymUuj08VsIl8,7034
 reconcile/external_resources/integration_secrets_sync.py,sha256=CImwt_tyS3MMGpkjI_0gZqYt4XgqIw4BtdJiDH2xrCk,1700
 reconcile/external_resources/manager.py,sha256=mvFfcXPzvNqDWDgKTK8eiSe6C_FUvBtben3bSqrqSoc,18246
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
@@ -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.dev102.dist-info/METADATA,sha256=Qg0wsgeMa_DS-6XE_EXPUY0U7j6R8Q1iszdAhkG4Ddw,24566
-qontract_reconcile-0.10.2.dev102.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev102.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev102.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev104.dist-info/METADATA,sha256=9v7ZHcP0L3QPNkpFKt5otqVTbrmy-UdvbWu2r3hFwzM,24566
+qontract_reconcile-0.10.2.dev104.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev104.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev104.dist-info/RECORD,,

reconcile/external_resources/integration.py

@@ -143,6 +143,9 @@ def run(
     workers_cluster: str | None = None,
     workers_namespace: str | None = None,
 ) -> None:
+    if dry_run and not dry_run_job_suffix:
+        raise RuntimeError("dry_run needs a dry_run_job_suffix")
+
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     er_settings = get_settings()

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] = {}