qontract-reconcile 0.10.1rc866__py3-none-any.whl → 0.10.1rc868__py3-none-any.whl

{qontract_reconcile-0.10.1rc866.dist-info → qontract_reconcile-0.10.1rc868.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc866
+Version: 0.10.1rc868
 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.1rc866.dist-info → qontract_reconcile-0.10.1rc868.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=YaLiMqrn9YOM5e7o2NJVg6vtILyBXTryTScA4RhTyPo,3279
+reconcile/gitlab_permissions.py,sha256=1tFZws0-prcJ7vhFF3N7BxKocc16SjJuoqCkzRFESbE,3276
 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
@@ -104,7 +104,7 @@ reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9
 reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWpBLAM,4470
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
 reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
-reconcile/slack_usergroups.py,sha256=vYecHCeJMZhxy1l0bIahTRN6ja0vxTSTXN2UfOkYXOo,29727
+reconcile/slack_usergroups.py,sha256=XnSw6K9-qaYu01vaFRV9ovIxzB8HfycLFyyIzJa-TRA,29708
 reconcile/sql_query.py,sha256=FAQI9EIHsokZBbGwvGU4vnjg1fHemxpYQE20UtCB1qo,25941
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
@@ -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=FAKT7UuNAjxmke90P2cA-924_CGZ7Kp3JLTb6rmTseM,1965
+reconcile/test/test_gitlab_permissions.py,sha256=5QFy6InIHYM7zph5dPsDPo2hobrI5-eSGRTOzHOhF74,2005
 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
@@ -539,7 +539,7 @@ reconcile/test/test_saasherder.py,sha256=QFX6JrPCpB9jS-K_VleIjTf6NaF8NDa4UwddXXo
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
-reconcile/test/test_slack_usergroups.py,sha256=Yj7SetVzdVsl0mzPakVil3Fb_4R_3r9lC32gnw_CwiA,24899
+reconcile/test/test_slack_usergroups.py,sha256=16mQar9Ar0GqwpOJBZ5nc7v1UzfXDd-9WCOEgT4cBKU,24941
 reconcile/test/test_sql_query.py,sha256=rC-lf1_isT9i2ZIV9W0hkUkLi2oBIjZMRMhk-6mV-34,11029
 reconcile/test/test_status_board.py,sha256=go3YSWo03OLIdK95SuiDJa1Nqk-eN_9QtS7dfmu9__8,7875
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
@@ -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=kGYNyx6pbF43rd6R3a3wcIGmATiqNUFJUUHP4sELgNI,29027
+reconcile/utils/gitlab_api.py,sha256=thEdQ4AX96R4F3XhpOpugWmbueIgzDc_9b56DW-6ecY,29116
 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
@@ -696,7 +696,7 @@ reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=7g4TuBxkOl2NgsuZUCRcdI_hKLP3JhXlY1byBSxWU3A,10305
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,839
-reconcile/utils/slack_api.py,sha256=2t9jeCS7V3sHSMk-ByRcjmh-2uVvGELCfJqm1nu_hKI,17395
+reconcile/utils/slack_api.py,sha256=NT8NjhpBMBWOhqgHnvBuP2NlZKm8H_oGY_LHdVu_F_c,17423
 reconcile/utils/smtp_client.py,sha256=gJNbBQJpAt5PX4t_TaeNHsXM8vt50bFgndml6yK2b5o,2800
 reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4dA,2287
 reconcile/utils/state.py,sha256=DRxzuOw3Iha-b2esBMjZTZ5K-OxfrGbkyEvpTT5xHTs,16369
@@ -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.1rc866.dist-info/METADATA,sha256=CsI337jZEYjkwbikEt0gEukWr3NK-k5bJXpgXcw3xmw,2273
-qontract_reconcile-0.10.1rc866.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc866.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc866.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc866.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc868.dist-info/METADATA,sha256=2Ic4FAzZN1tZWidUXUc0YXjGK1fFGxGkQa2rdANjHZ8,2273
+qontract_reconcile-0.10.1rc868.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc868.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc868.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc868.dist-info/RECORD,,

reconcile/gitlab_permissions.py

@@ -80,7 +80,7 @@ def share_project_with_group(gl: GitLabApi, repos: list[str], dry_run: bool) ->
     # get repos not owned by app-sre
     non_app_sre_projects = {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}
+    shared_project_repos = {project.web_url for project in shared_projects}
     repos_to_share = non_app_sre_projects - shared_project_repos
     for repo in repos_to_share:
         gl.share_project_with_group(repo_url=repo, group_id=group_id, dry_run=dry_run)

reconcile/slack_usergroups.py

@@ -557,19 +557,18 @@ def _update_usergroup_users_from_state(
 
     slack_user_objects = [
         SlackObject(pk=pk, name=name)
-        for pk, name in slack_client.get_users_by_names(
+        for pk, name in slack_client.get_active_users_by_names(
             desired_ug_state.user_names
         ).items()
     ]
+    active_user_names = set(s.name for s in slack_user_objects)
 
-    if len(slack_user_objects) != len(desired_ug_state.user_names):
+    if len(active_user_names) != len(desired_ug_state.user_names):
         logging.info(
-            f"Following usernames are incorrect for usergroup {desired_ug_state.usergroup} and could not be matched with slack users {desired_ug_state.user_names - set(s.name for s in slack_user_objects)}"
+            f"Following usernames are incorrect for usergroup {desired_ug_state.usergroup} and could not be matched with slack users {desired_ug_state.user_names - active_user_names}"
         )
-        error_occurred = True
-        return 0
 
-    for user in desired_ug_state.user_names - current_ug_state.user_names:
+    for user in active_user_names - current_ug_state.user_names:
         logging.info([
             "add_user_to_usergroup",
             desired_ug_state.workspace,
@@ -577,7 +576,7 @@ def _update_usergroup_users_from_state(
             user,
         ])
 
-    for user in current_ug_state.user_names - desired_ug_state.user_names:
+    for user in current_ug_state.user_names - active_user_names:
         logging.info([
             "del_user_from_usergroup",
             desired_ug_state.workspace,

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
+from gitlab.v4.objects import CurrentUser, GroupMember, GroupProject
 from pytest_mock import MockerFixture
 
 from reconcile import gitlab_permissions
@@ -51,7 +51,7 @@ def test_run_share_with_group(
     ).return_value = True
     mocked_gl.get_group_id_and_shared_projects.return_value = (
         1234,
-        [{"web_url": "https://test.com"}],
+        [create_autospec(GroupProject, web_url="https://test.com")],
     )
     gitlab_permissions.run(False, thread_pool_size=1)
     mocked_gl.share_project_with_group.assert_called_once()

reconcile/test/test_slack_usergroups.py

@@ -579,7 +579,7 @@ def test_act_empty_current_state(
 
     slack_client_mock.create_usergroup.return_value = "USERGA"
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
-    slack_client_mock.get_users_by_names.return_value = {"USERA": "username"}
+    slack_client_mock.get_active_users_by_names.return_value = {"USERA": "username"}
     slack_client_mock.get_channels_by_names.return_value = {"CHANA": "someotherchannel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
@@ -605,7 +605,7 @@ def test_act_update_usergroup_users(
     }
 
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
-    slack_client_mock.get_users_by_names.return_value = {
+    slack_client_mock.get_active_users_by_names.return_value = {
         "USERB": "someotherusername",
         "USERC": "anotheruser",
     }
@@ -629,7 +629,7 @@ def test_act_update_usergroup_channels(
     desired_state["slack-workspace"]["usergroup-1"].channel_names = {"CHANB"}
 
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
-    slack_client_mock.get_users_by_names.return_value = {"USERA": "username"}
+    slack_client_mock.get_active_users_by_names.return_value = {"USERA": "username"}
     slack_client_mock.get_channels_by_names.return_value = {"CHANB": "channel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
@@ -651,7 +651,7 @@ def test_act_update_usergroup_description(
     ].description = "A different description"
 
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
-    slack_client_mock.get_users_by_names.return_value = {"USERA": "username"}
+    slack_client_mock.get_active_users_by_names.return_value = {"USERA": "username"}
     slack_client_mock.get_channels_by_names.return_value = {"CHANA": "channel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
@@ -675,7 +675,7 @@ def test_act_update_usergroup_desc_and_channels(
     ].description = "A different description"
 
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
-    slack_client_mock.get_users_by_names.return_value = {"USERA": "username"}
+    slack_client_mock.get_active_users_by_names.return_value = {"USERA": "username"}
     slack_client_mock.get_channels_by_names.return_value = {"CHANB": "someotherchannel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
@@ -716,7 +716,7 @@ def test_act_add_new_usergroups(
     desired_state = copy.deepcopy(base_state)
 
     slack_client_mock.get_usergroup_id.side_effect = get_ugid
-    slack_client_mock.get_users_by_names.side_effect = get_users
+    slack_client_mock.get_active_users_by_names.side_effect = get_users
     slack_client_mock.get_channels_by_names.side_effect = get_channels
 
     desired_state["slack-workspace"]["usergroup-2"] = State(

reconcile/utils/gitlab_api.py

@@ -29,6 +29,7 @@ from gitlab.const import (
 from gitlab.v4.objects import (
     CurrentUser,
     Group,
+    GroupProject,
     Project,
     ProjectIssue,
     ProjectMergeRequest,
@@ -286,13 +287,14 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
 
     def get_group_id_and_shared_projects(
         self, group_name: str
-    ) -> tuple[int, list[dict]]:
+    ) -> tuple[int, list[GroupProject]]:
         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
-            for project in group.shared_projects
-            for shared_group in project["shared_with_groups"]
+            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
         ]

reconcile/utils/slack_api.py

@@ -417,11 +417,11 @@ class SlackApi:
             k: v["name"] for k, v in self._get("channels").items() if k in channels_ids
         }
 
-    def get_users_by_names(self, user_names: Iterable[str]) -> dict[str, str]:
+    def get_active_users_by_names(self, user_names: Iterable[str]) -> dict[str, str]:
         return {
             k: v["name"]
             for k, v in self._get("users").items()
-            if v["name"] in user_names
+            if v["name"] in user_names and not v["deleted"]
         }
 
     def get_users_by_ids(self, users_ids: Iterable[str]) -> dict[str, str]: