qontract-reconcile 0.10.1rc1060__py3-none-any.whl → 0.10.1rc1061__py3-none-any.whl

{qontract_reconcile-0.10.1rc1060.dist-info → qontract_reconcile-0.10.1rc1061.dist-info}/METADATA

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

@@ -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=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
 reconcile/slack_base.py,sha256=8FqwMJ5SkoRyDJ9iPfZogWkC9QRoTouMCnGUevV_GME,3447
-reconcile/slack_usergroups.py,sha256=tZIpxbCmS8M4A15tYdtgCMEJ1Q6hcrkF9j_5-CZ6Yjs,29691
+reconcile/slack_usergroups.py,sha256=ebCMtgpap6i_IUFFTuXU52MdkAXxSRG1bAcDPj64OIg,30083
 reconcile/sql_query.py,sha256=pH-EHkXiDknn8ZNXVqRZeqFc3sKhu2nhsaykgSytbS8,25895
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=YeoE7kLf1YKpOdN32u3vqhuSI46ep5N_qcVWC1CBCf8,8635
@@ -557,7 +557,7 @@ reconcile/test/test_saasherder.py,sha256=-WGgAsrTm_SJ0OQDLXd4JwEu1Mc6i4AePJqjZQT
 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=pTUGvJ2S2wF3PhJyGWmiNXG52QtXKy2cbu-G8Ymrv6I,5019
-reconcile/test/test_slack_usergroups.py,sha256=YU7O7WseOGKWGZXLqlqZgXn99iVagWePDBH7cYVF3tg,24977
+reconcile/test/test_slack_usergroups.py,sha256=OkD2sgTwUp6kahzL0oQM37Q7YNZHsS04hD2yV9skXhQ,25642
 reconcile/test/test_sql_query.py,sha256=4EfcLH0y3B4d11IEoue5dgA-h6f9pP5xiMCIdILSJaE,11022
 reconcile/test/test_status_board.py,sha256=o4jTZLtBFJN9FBmaHHkVGGPFSONLoB-P1xCX8giIBLw,7852
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
@@ -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.1rc1060.dist-info/METADATA,sha256=ewa9djSX09Y1dcH9t7GKZd-f33LlllFTkgUSU-p1i38,2213
-qontract_reconcile-0.10.1rc1060.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1060.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1060.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1060.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1061.dist-info/METADATA,sha256=h9WxXliU1mlCQK_rTCcdKt6xDFcUTN2z9AdiP-QeRzU,2213
+qontract_reconcile-0.10.1rc1061.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1061.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1061.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1061.dist-info/RECORD,,

reconcile/slack_usergroups.py

@@ -420,28 +420,13 @@ def get_desired_state(
                     not in managed usergroups {p.workspace.managed_usergroups}"
             )
 
-        all_user_names = [get_slack_username(u) for r in p.roles or [] for u in r.users]
-        slack_usernames_pagerduty = get_usernames_from_pagerduty(
-            pagerduties=p.pagerduty or [],
-            users=users,
-            usergroup=usergroup,
-            pagerduty_map=pagerduty_map,
-        )
-        all_user_names.extend(slack_usernames_pagerduty)
-
-        if p.owners_from_repos:
-            slack_usernames_repo = get_slack_usernames_from_owners(
-                p.owners_from_repos, users, usergroup
-            )
-            all_user_names.extend(slack_usernames_repo)
-
-        if p.schedule:
-            slack_usernames_schedule = get_slack_usernames_from_schedule(
-                p.schedule.schedule
+        try:
+            user_names = _get_user_names(p, pagerduty_map, usergroup, users)
+        except Exception:
+            logging.exception(
+                f"Error getting user names for {p.workspace.name} #{usergroup}, skipping"
             )
-            all_user_names.extend(slack_usernames_schedule)
-
-        user_names = set(all_user_names)
+            continue
 
         try:
             desired_state[p.workspace.name][usergroup].user_names.update(user_names)
@@ -456,6 +441,35 @@ def get_desired_state(
     return desired_state
 
 
+def _get_user_names(
+    permission: PermissionSlackUsergroupV1,
+    pagerduty_map: PagerDutyMap,
+    usergroup: str,
+    users: Iterable[User],
+) -> set[str]:
+    user_names = {
+        get_slack_username(u) for r in permission.roles or [] for u in r.users
+    }
+    slack_usernames_pagerduty = get_usernames_from_pagerduty(
+        pagerduties=permission.pagerduty or [],
+        users=users,
+        usergroup=usergroup,
+        pagerduty_map=pagerduty_map,
+    )
+    user_names.update(slack_usernames_pagerduty)
+    if permission.owners_from_repos:
+        slack_usernames_repo = get_slack_usernames_from_owners(
+            permission.owners_from_repos, users, usergroup
+        )
+        user_names.update(slack_usernames_repo)
+    if permission.schedule:
+        slack_usernames_schedule = get_slack_usernames_from_schedule(
+            permission.schedule.schedule
+        )
+        user_names.update(slack_usernames_schedule)
+    return user_names
+
+
 def get_desired_state_cluster_usergroups(
     slack_map: SlackMap,
     clusters: Iterable[ClusterV1],

reconcile/test/test_slack_usergroups.py

@@ -435,6 +435,29 @@ def test_get_desired_state(
     }
 
 
+def test_get_desired_state_with_error(
+    mocker: MockerFixture,
+    permissions: Sequence[PermissionSlackUsergroupV1],
+    user: UserV1,
+) -> None:
+    mocker.patch(
+        "reconcile.slack_usergroups.get_usernames_from_pagerduty"
+    ).return_value = ["user1"]
+    mocker.patch(
+        "reconcile.slack_usergroups.get_slack_usernames_from_owners"
+    ).side_effect = Exception("some error")
+    mock_pagerduty_map = create_autospec(PagerDutyMap)
+    result = integ.get_desired_state(
+        mock_pagerduty_map,
+        permissions[1:],
+        [user],
+        desired_workspace_name=None,
+        desired_usergroup_name=None,
+    )
+
+    assert result == {}
+
+
 def test_get_desired_state_cluster_usergroups(
     mocker: MockerFixture, slack_map: SlackMap, user: UserV1
 ) -> None: