qontract-reconcile 0.10.1rc874__py3-none-any.whl → 0.10.1rc876__py3-none-any.whl

{qontract_reconcile-0.10.1rc874.dist-info → qontract_reconcile-0.10.1rc876.dist-info}/METADATA

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

@@ -35,7 +35,7 @@ reconcile/gitlab_labeler.py,sha256=IxE1XM5o4rDOFuR4cM2yAHTy4Uzdg3Nyz2mp7b8Fx1g,4
 reconcile/gitlab_members.py,sha256=M6LwFOrwgvl1NNdOJa1mrQFUon-bEVv1AyhGeLed454,8443
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
 reconcile/gitlab_owners.py,sha256=sn9njaKOtqcvnhi2qtm-faAfAR4zNqflbSuusA9RUuI,13456
-reconcile/gitlab_permissions.py,sha256=1tFZws0-prcJ7vhFF3N7BxKocc16SjJuoqCkzRFESbE,3276
+reconcile/gitlab_permissions.py,sha256=rg0woLsVeKcG36AiK1FM2-TGeEf2A15LOreFPlo1OTk,3668
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=J_VV-HINI7YNav2NPIolePZkll-7VBuBXWAyMNhsM_Q,9535
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
@@ -472,7 +472,7 @@ reconcile/terraform_init/integration.py,sha256=xcFKTc_or3xB3kE_I3OECNkkgbwALIwwd
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
 reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8BedvQHq_MzFkgVJSloBNwOQ,3101
 reconcile/terraform_vpc_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/terraform_vpc_resources/integration.py,sha256=OOi29VUtlAhCgeUV86UlWCK72dNTp8tgXX6SXLpuMr8,8113
+reconcile/terraform_vpc_resources/integration.py,sha256=hQX5JWrC-MSwICs4FMJ_pbTa5eTQP6VrmE58z_XYclg,8204
 reconcile/terraform_vpc_resources/merge_request.py,sha256=loRymUigCIvaaT0s_NzktZchh-DGRQnCICdBSCAcFPY,1503
 reconcile/terraform_vpc_resources/merge_request_manager.py,sha256=Vj2nuQbQyrL4q_il1My-bLxYNh_r3YXqX45P8fwtP6Q,3259
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -502,7 +502,7 @@ reconcile/test/test_github_repo_invites.py,sha256=UVaDlxSxi5iooyUbz8F11d7cvINHLK
 reconcile/test/test_gitlab_housekeeping.py,sha256=Sn5rERCp28sMiBx5vJaQ5yy80y37GouMClejmXocsT8,10068
 reconcile/test/test_gitlab_labeler.py,sha256=vFLUJXSIaCduj6wSqgw7Fg7FhlopaDnYI5SLzNHtLoY,4362
 reconcile/test/test_gitlab_members.py,sha256=kaCOA02eZSrSMkzHmaLwWW3LY6Af0ciLSEP4PlMLvOU,9949
-reconcile/test/test_gitlab_permissions.py,sha256=5QFy6InIHYM7zph5dPsDPo2hobrI5-eSGRTOzHOhF74,2005
+reconcile/test/test_gitlab_permissions.py,sha256=vPFEsdjyP-lO8pc2rN6acMns3Sjz9YJs16msbBR8DZc,2736
 reconcile/test/test_instrumented_wrappers.py,sha256=CZzhnQH0c4i7-Rxjg7-0dfFMvVPegLHL46z5NHOOCwo,608
 reconcile/test/test_integrations_manager.py,sha256=l6KwSFT0NS9VSR-b_9z_ZEGXDWH3EMitUEMC_1h8Xkk,38184
 reconcile/test/test_jenkins_worker_fleets.py,sha256=o1jlT7OBBSgu0M3iI4xMdz_x6SciF7yhNBpLk5gTJfg,2361
@@ -654,7 +654,7 @@ reconcile/utils/filtering.py,sha256=zZnHH0u0SaTDyzuFXZ_mREURGLvjEqQIQy4z-7QBVlc,
 reconcile/utils/git.py,sha256=BdxXFgQ1XOZpS-4qb3qMsKTCFDG8MlE26rv1jAhvCkM,1560
 reconcile/utils/git_secrets.py,sha256=0wGNL5mvDtVPRuu3vEQgld1Am64gIDJHtmu1_ZKxMAI,1973
 reconcile/utils/github_api.py,sha256=_bttNxYKeam_tLVe27L7O4gKqSn6CeyuFnJn8tSaUVY,2488
-reconcile/utils/gitlab_api.py,sha256=thEdQ4AX96R4F3XhpOpugWmbueIgzDc_9b56DW-6ecY,29116
+reconcile/utils/gitlab_api.py,sha256=UGOm0FOzh4O6_DlAThp_Prj2bD9xsLMx5_xLm9Js0ZI,29248
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=o8TLe9zW_zf_vOYC4yAy7mP5UvSR4eq3JKa4rxy1KjI,14277
 reconcile/utils/grouping.py,sha256=kWKivD14eAkiDneH_VIl_XyUdcVVQgiaKA9sLsuD2dw,441
@@ -837,8 +837,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.1rc874.dist-info/METADATA,sha256=nu-twTVjR_c5WOALYublxTDjBa_09VoDhqkvXcgkLnQ,2273
-qontract_reconcile-0.10.1rc874.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc874.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc874.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc874.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc876.dist-info/METADATA,sha256=oxwU_YgBkaunVNYBiF9X_96t_sVTbOp8dDhuBtvZjbc,2273
+qontract_reconcile-0.10.1rc876.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc876.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc876.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc876.dist-info/RECORD,,

reconcile/gitlab_permissions.py

@@ -2,6 +2,7 @@ import itertools
 import logging
 from typing import Any
 
+from gitlab.const import MAINTAINER_ACCESS
 from sretoolbox.utils import threaded
 
 from reconcile import queries
@@ -78,12 +79,22 @@ def share_project_with_group_members(
 
 def share_project_with_group(gl: GitLabApi, repos: list[str], dry_run: bool) -> None:
     # get repos not owned by app-sre
-    non_app_sre_projects = {repo for repo in repos if "/app-sre/" not in repo}
+    non_app_sre_project_repos = {repo for repo in repos if "/app-sre/" not in repo}
     group_id, shared_projects = gl.get_group_id_and_shared_projects(APP_SRE_GROUP_NAME)
-    shared_project_repos = {project.web_url for project in shared_projects}
-    repos_to_share = non_app_sre_projects - shared_project_repos
+    shared_project_repos = shared_projects.keys()
+    repos_to_share = non_app_sre_project_repos - shared_project_repos
+    repos_to_reshare = {
+        repo
+        for repo in non_app_sre_project_repos
+        if (group_data := shared_projects.get(repo))
+        and group_data["group_access_level"] < MAINTAINER_ACCESS
+    }
     for repo in repos_to_share:
         gl.share_project_with_group(repo_url=repo, group_id=group_id, dry_run=dry_run)
+    for repo in repos_to_reshare:
+        gl.share_project_with_group(
+            repo_url=repo, group_id=group_id, dry_run=dry_run, reshare=True
+        )
 
 
 def early_exit_desired_state(*args, **kwargs) -> dict[str, Any]:

reconcile/terraform_vpc_resources/integration.py

@@ -72,8 +72,9 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
         for request in requests:
             # Skiping requests that don't have outputs,
             # this happens because we are not filtering the requests
-            # when running the integration for a single account with --account-name
-            if request.account.name not in outputs.keys():
+            # when running the integration for a single account with --account-name.
+            # We also don't want to create outputs for deleted requets.
+            if request.account.name not in outputs.keys() or request.delete:
                 continue
 
             outputs_per_request[request.identifier] = []

reconcile/test/test_gitlab_permissions.py

@@ -1,7 +1,7 @@
 from unittest.mock import MagicMock, create_autospec
 
 import pytest
-from gitlab.v4.objects import CurrentUser, GroupMember, GroupProject
+from gitlab.v4.objects import CurrentUser, GroupMember
 from pytest_mock import MockerFixture
 
 from reconcile import gitlab_permissions
@@ -51,7 +51,26 @@ def test_run_share_with_group(
     ).return_value = True
     mocked_gl.get_group_id_and_shared_projects.return_value = (
         1234,
-        [create_autospec(GroupProject, web_url="https://test.com")],
+        {"https://test.com": {"group_access_level": 30}},
     )
     gitlab_permissions.run(False, thread_pool_size=1)
-    mocked_gl.share_project_with_group.assert_called_once()
+    mocked_gl.share_project_with_group.assert_called_once_with(
+        repo_url="https://test-gitlab.com", group_id=1234, dry_run=False
+    )
+
+
+def test_run_reshare_with_group(
+    mocked_queries: MagicMock, mocker: MockerFixture, mocked_gl: MagicMock
+) -> None:
+    mocker.patch("reconcile.gitlab_permissions.GitLabApi").return_value = mocked_gl
+    mocker.patch(
+        "reconcile.gitlab_permissions.get_feature_toggle_state"
+    ).return_value = True
+    mocked_gl.get_group_id_and_shared_projects.return_value = (
+        1234,
+        {"https://test-gitlab.com": {"group_access_level": 30}},
+    )
+    gitlab_permissions.run(False, thread_pool_size=1)
+    mocked_gl.share_project_with_group.assert_called_once_with(
+        repo_url="https://test-gitlab.com", group_id=1234, dry_run=False, reshare=True
+    )

reconcile/utils/gitlab_api.py

@@ -29,7 +29,6 @@ from gitlab.const import (
 from gitlab.v4.objects import (
     CurrentUser,
     Group,
-    GroupProject,
     Project,
     ProjectIssue,
     ProjectMergeRequest,
@@ -259,7 +258,12 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
             return None
 
     def share_project_with_group(
-        self, repo_url: str, group_id: int, dry_run: bool, access: str = "maintainer"
+        self,
+        repo_url: str,
+        group_id: int,
+        dry_run: bool,
+        access: str = "maintainer",
+        reshare: bool = False,
     ) -> None:
         project = self.get_project(repo_url)
         if project is None:
@@ -282,22 +286,24 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
             return None
         logging.info(["add_group_as_maintainer", repo_url, group_id])
         if not dry_run:
+            if reshare:
+                gitlab_request.labels(integration=INTEGRATION_NAME).inc()
+                project.unshare(group_id)
             gitlab_request.labels(integration=INTEGRATION_NAME).inc()
             project.share(group_id, access_level)
 
     def get_group_id_and_shared_projects(
         self, group_name: str
-    ) -> tuple[int, list[GroupProject]]:
+    ) -> tuple[int, dict[str, Any]]:
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
         group = self.gl.groups.get(group_name)
         shared_projects = self.get_items(group.projects.list, all=True)
-        return group.id, [
-            project
+        return group.id, {
+            project.web_url: shared_group
             for project in shared_projects
             for shared_group in project.shared_with_groups
             if shared_group["group_id"] == group.id
-            and shared_group["group_access_level"] >= MAINTAINER_ACCESS
-        ]
+        }
 
     @staticmethod
     def _is_bot_username(username: str) -> bool: