qontract-reconcile 0.10.1rc772__py3-none-any.whl → 0.10.1rc774__py3-none-any.whl

{qontract_reconcile-0.10.1rc772.dist-info → qontract_reconcile-0.10.1rc774.dist-info}/METADATA

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

@@ -15,7 +15,7 @@ reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
 reconcile/dashdotdb_cso.py,sha256=FoXrWGpOwXG5jf0eklN84tjJVUAYzKat7rtq_28JMlQ,3672
-reconcile/dashdotdb_dora.py,sha256=n9EJXhxCoMYuldj4Fa5s0TqfiiolSrqDEOCaLBV3uag,17235
+reconcile/dashdotdb_dora.py,sha256=hwGqjRbySKJeP7ekN96fwW5UFUpTWiQ-IZ_tzWQYbKY,17565
 reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,8996
 reconcile/dashdotdb_slo.py,sha256=bf1WSh5JP9obHVQsMy0OO71_VTYZgwAopElFZM6DmRo,6714
 reconcile/database_access_manager.py,sha256=42dBJyihdwx4WjEBjwi3lUiDzQ1t_2ZFViJri2c4_aE,25716
@@ -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=XC7bYHP322EFWrEaR4Orw_sOoMFmuV3o08OC0UE4xLQ,27592
+reconcile/slack_usergroups.py,sha256=6G-KjcqacqqhJDsl-KMC-t5M9oexUpSSUc1yGyt2zvY,27120
 reconcile/sql_query.py,sha256=FAQI9EIHsokZBbGwvGU4vnjg1fHemxpYQE20UtCB1qo,25941
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
@@ -514,7 +514,7 @@ reconcile/test/test_saasherder.py,sha256=1_GyiXxxNqKSKE7PrtFJL7tUFg77d1oQPZzNBZW
 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=UO-OzqbGMSpNsyddu2TbWOzSiVze6Bq95Ph1QIJqLWY,23990
+reconcile/test/test_slack_usergroups.py,sha256=wmS7xgl4U1jx4gu8qIDlljkhZxb_y8F6tR4UteyrlZE,24899
 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
@@ -632,7 +632,7 @@ reconcile/utils/keycloak.py,sha256=UqOsAcHKmmIunroWB5YzC1fUZ3S3aq6L7trn6vLRmXY,3
 reconcile/utils/ldap_client.py,sha256=ho4veSrHqQWs0YhLFyKeD-duCwY8Nc5gUIA5qLENuMY,2502
 reconcile/utils/lean_terraform_client.py,sha256=zReyNPJbr2uOdrdh8Qfe-OZQBoRwxb5Za_ddeoUCYVk,4064
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
-reconcile/utils/metrics.py,sha256=7nXdctmZ0UtGMHPpS3V55sfH4xpMPqdYaJ3JKAUc_sM,18474
+reconcile/utils/metrics.py,sha256=ot4dBO-KLZRowvNozm7jG0RWjcVsH1SL-lQ0jJgBBZM,18645
 reconcile/utils/models.py,sha256=It_Q1WNIvw_EDCsiSWzIgpSPr_X9jMgbJI-DR3N23xY,4677
 reconcile/utils/oauth2_backend_application_session.py,sha256=6W16sMpnWEPFDUX7qi5Cui2yOnmLfpgUxWtB3Ii35D0,4177
 reconcile/utils/oc.py,sha256=ILAlP-AZMtWeyAepLoMnYbDJfyyMs-Z0fOEo9JXQfkE,65490
@@ -657,7 +657,7 @@ reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=2DeYAAQFjUULEKlLw3UDAUoND6gbqvCh9uKPtlc-0us,10403
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,839
-reconcile/utils/slack_api.py,sha256=C-VThgYRtrRWraq9ZE6hEf1bXrwzRDCDK0uRw3DP6ew,16425
+reconcile/utils/slack_api.py,sha256=2t9jeCS7V3sHSMk-ByRcjmh-2uVvGELCfJqm1nu_hKI,17395
 reconcile/utils/smtp_client.py,sha256=gJNbBQJpAt5PX4t_TaeNHsXM8vt50bFgndml6yK2b5o,2800
 reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4dA,2287
 reconcile/utils/state.py,sha256=FK8NLT1xyumuXpYRm0Nk6pWpOE_U6-NovGn6zKCw8vw,16298
@@ -785,8 +785,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc772.dist-info/METADATA,sha256=ggkGwJEVc2hcdi_OZpg-AGRT0hX8-c-5bD6NTbwG6ro,2382
-qontract_reconcile-0.10.1rc772.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc772.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc772.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc772.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc774.dist-info/METADATA,sha256=I9lXAkituklwaEp2VxZU_rBUp1jOMlcGDN7XisBfH28,2382
+qontract_reconcile-0.10.1rc774.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc774.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc774.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc774.dist-info/RECORD,,

reconcile/dashdotdb_dora.py

@@ -17,6 +17,7 @@ from typing import (
 
 import requests
 import yaml
+from github import GithubException
 from psycopg2 import (
     connect,
     sql,
@@ -418,7 +419,14 @@ class DashdotdbDORA(DashdotdbBase):
 
         LOG.info("Fetching commits %s", rc)
         if rc.repo_url.startswith("https://github.com"):
-            commits = self._github_compare_commits(rc)
+            try:
+                commits = self._github_compare_commits(rc)
+            except GithubException as e:
+                if e.status == 404:
+                    LOG.info(
+                        f"Ignoring RepoChanges for {rc} because could not calculate them: {e.data['message']}"
+                    )
+                    return rc, []
         elif rc.repo_url.startswith(self.gl.server):
             commits = self._gitlab_compare_commits(rc)
         else:

reconcile/slack_usergroups.py

@@ -110,8 +110,9 @@ class State(BaseModel):
     usergroup: str = ""
     description: str = ""
     users: set[SlackObject] = set()
+    user_names: set[str] = set()
     channels: set[SlackObject] = set()
-    usergroup_id: Optional[str] = None
+    channel_names: set[str] = set()
 
     def __bool__(self) -> bool:
         return self.workspace != ""  # noqa: PLC1901
@@ -392,7 +393,6 @@ def include_user_to_cluster_usergroup(
 
 
 def get_desired_state(
-    slack_map: SlackMap,
     pagerduty_map: PagerDutyMap,
     permissions: Iterable[PermissionSlackUsergroupV1],
     users: Iterable[User],
@@ -418,9 +418,6 @@ def get_desired_state(
                     not in managed usergroups {p.workspace.managed_usergroups}"
             )
 
-        slack = slack_map[p.workspace.name].slack
-        ugid = slack.get_usergroup_id(usergroup)
-
         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 [],
@@ -442,27 +439,16 @@ def get_desired_state(
             )
             all_user_names.extend(slack_usernames_schedule)
 
-        user_names = list(set(all_user_names))
-        slack_users = {
-            SlackObject(pk=pk, name=name)
-            for pk, name in slack.get_users_by_names(sorted(user_names)).items()
-        }
-        slack_channels = {
-            SlackObject(pk=pk, name=name)
-            for pk, name in slack.get_channels_by_names(
-                sorted(p.channels or [])
-            ).items()
-        }
+        user_names = set(all_user_names)
 
         try:
-            desired_state[p.workspace.name][usergroup].users.update(slack_users)
+            desired_state[p.workspace.name][usergroup].user_names.update(user_names)
         except KeyError:
             desired_state.setdefault(p.workspace.name, {})[usergroup] = State(
                 workspace=p.workspace.name,
                 usergroup=usergroup,
-                usergroup_id=ugid,
-                users=slack_users,
-                channels=slack_channels,
+                user_names=user_names,
+                channel_names=sorted(p.channels or []),
                 description=p.description,
             )
     return desired_state
@@ -492,7 +478,7 @@ def get_desired_state_cluster_usergroups(
             for u in openshift_users_desired_state
             if u["cluster"] == cluster.name
         ]
-        cluster_usernames = list({
+        cluster_usernames = set({
             get_slack_username(u)
             for u in users
             if include_user_to_cluster_usergroup(u, cluster, desired_cluster_users)
@@ -509,29 +495,16 @@ def get_desired_state_cluster_usergroups(
             if desired_workspace_name and desired_workspace_name != workspace:
                 continue
 
-            ugid = spec.slack.get_usergroup_id(cluster_user_group)
-            slack_users = {
-                SlackObject(pk=pk, name=name)
-                for pk, name in spec.slack.get_users_by_names(
-                    sorted(cluster_usernames)
-                ).items()
-            }
-            slack_channels = {
-                SlackObject(pk=pk, name=name)
-                for pk, name in spec.slack.get_channels_by_names([
-                    spec.slack.channel
-                ]).items()
-            }
-
             try:
-                desired_state[workspace][cluster_user_group].users.update(slack_users)
+                desired_state[workspace][cluster_user_group].user_names.update(
+                    cluster_usernames
+                )
             except KeyError:
                 desired_state.setdefault(workspace, {})[cluster_user_group] = State(
                     workspace=workspace,
                     usergroup=cluster_user_group,
-                    usergroup_id=ugid,
-                    users=slack_users,
-                    channels=slack_channels,
+                    user_names=cluster_usernames,
+                    channel_names=set([spec.slack.channel]),
                     description=f"Users with access to the {cluster.name} cluster",
                 )
     return desired_state
@@ -558,8 +531,7 @@ def _create_usergroups(
     ])
     if not dry_run:
         try:
-            usergroup_id = slack_client.create_usergroup(desired_ug_state.usergroup)
-            desired_ug_state.usergroup_id = usergroup_id
+            slack_client.create_usergroup(desired_ug_state.usergroup)
         except SlackApiError as error:
             logging.error(error)
             error_occurred = True
@@ -597,13 +569,14 @@ def _update_usergroup_users_from_state(
 
     if not dry_run:
         try:
-            if not desired_ug_state.usergroup_id:
+            ugid = slack_client.get_usergroup_id(desired_ug_state.usergroup)
+            if not ugid:
                 logging.info(
                     f"Usergroup {desired_ug_state.usergroup} does not exist yet. Skipping for now."
                 )
                 return
             slack_client.update_usergroup_users(
-                id=desired_ug_state.usergroup_id,
+                id=ugid,
                 users_list=sorted([user.pk for user in desired_ug_state.users]),
             )
         except SlackApiError as error:
@@ -658,13 +631,14 @@ def _update_usergroup_from_state(
 
     if not dry_run:
         try:
-            if not desired_ug_state.usergroup_id:
+            ugid = slack_client.get_usergroup_id(desired_ug_state.usergroup)
+            if not ugid:
                 logging.info(
                     f"Usergroup {desired_ug_state.usergroup} does not exist yet. Skipping for now."
                 )
                 return
             slack_client.update_usergroup(
-                id=desired_ug_state.usergroup_id,
+                id=ugid,
                 channels_list=sorted([
                     channel.pk for channel in desired_ug_state.channels
                 ]),
@@ -689,24 +663,40 @@ def act(
                 usergroup, State()
             )
 
+            slack_client = slack_map[workspace].slack
+
+            desired_ug_state.users = {
+                SlackObject(pk=pk, name=name)
+                for pk, name in slack_client.get_users_by_names(
+                    sorted(desired_ug_state.user_names)
+                ).items()
+            }
+
+            desired_ug_state.channels = {
+                SlackObject(pk=pk, name=name)
+                for pk, name in slack_client.get_channels_by_names(
+                    sorted(desired_ug_state.channel_names or [])
+                ).items()
+            }
+
             _create_usergroups(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_map[workspace].slack,
+                slack_client=slack_client,
                 dry_run=dry_run,
             )
 
             _update_usergroup_users_from_state(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_map[workspace].slack,
+                slack_client=slack_client,
                 dry_run=dry_run,
             )
 
             _update_usergroup_from_state(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_map[workspace].slack,
+                slack_client=slack_client,
                 dry_run=dry_run,
             )
 
@@ -760,7 +750,6 @@ def run(
 
     # run
     desired_state = get_desired_state(
-        slack_map=slack_map,
         pagerduty_map=pagerduty_map,
         permissions=permissions,
         users=users,
@@ -776,6 +765,7 @@ def run(
     )
     # merge the two desired states recursively
     desired_state = deep_update(desired_state, desired_state_cluster_usergroups)
+
     current_state = get_current_state(
         slack_map=slack_map,
         desired_workspace_name=workspace_name,

reconcile/test/test_slack_usergroups.py

@@ -62,7 +62,9 @@ def base_state():
                 usergroup="usergroup-1",
                 usergroup_id="USERGA",
                 users={SlackObject(name="username", pk="USERA")},
+                user_names={"username"},
                 channels={SlackObject(name="channelname", pk="CHANA")},
+                channel_names={"channelname"},
                 description="Some description",
             )
         }
@@ -402,8 +404,6 @@ def test_include_user_to_cluster_usergroup(mocker: MockerFixture, user: UserV1)
 def test_get_desired_state(
     mocker: MockerFixture,
     permissions: Sequence[PermissionSlackUsergroupV1],
-    slack_map: SlackMap,
-    slack_client_mock: Mock,
     user: UserV1,
 ) -> None:
     mocker.patch(
@@ -413,21 +413,13 @@ def test_get_desired_state(
         "reconcile.slack_usergroups.get_slack_usernames_from_owners"
     ).return_value = ["repo-user"]
     mock_pagerduty_map = create_autospec(PagerDutyMap)
-    slack_client_mock.get_usergroup_id.return_value = "ugid"
     result = integ.get_desired_state(
-        slack_map,
         mock_pagerduty_map,
         permissions[1:],
         [user],
         desired_workspace_name=None,
         desired_usergroup_name=None,
     )
-    assert slack_client_mock.get_users_by_names.call_args_list == [
-        call(["repo-user", "slack_username", "user1"]),
-    ]
-    assert slack_client_mock.get_channels_by_names.call_args_list == [
-        call(["sd-sre-platform", "sre-operators"])
-    ]
 
     assert result == {
         "coreos": {
@@ -436,7 +428,9 @@ def test_get_desired_state(
                 usergroup="saas-osd-operators",
                 description="SREP managed-cluster-config owners (managed via app-interface)",
                 users=set(),
+                user_names={"repo-user", "user1", "slack_username"},
                 channels=set(),
+                channel_names={"sre-operators", "sd-sre-platform"},
                 usergroup_id="ugid",
             )
         }
@@ -444,26 +438,18 @@ def test_get_desired_state(
 
 
 def test_get_desired_state_cluster_usergroups(
-    mocker: MockerFixture, slack_map: SlackMap, slack_client_mock: Mock, user: UserV1
+    mocker: MockerFixture, slack_map: SlackMap, user: UserV1
 ) -> None:
     mocker.patch("reconcile.openshift_users.fetch_desired_state", autospec=True)
     mocker.patch(
         "reconcile.slack_usergroups.include_user_to_cluster_usergroup"
     ).return_value = True
-    slack_client_mock.get_usergroup_id.return_value = "ugid"
 
     cluster = ClusterV1(name="cluster1", auth=[], disable={"integrations": []})
     result = integ.get_desired_state_cluster_usergroups(
         slack_map, [cluster], [user], None, None
     )
-    assert slack_client_mock.get_users_by_names.call_args_list == [
-        call(["slack"]),
-        call(["slack"]),
-    ]
-    assert slack_client_mock.get_channels_by_names.call_args_list == [
-        call(["channel"]),
-        call(["channel"]),
-    ]
+
     assert result == {
         "coreos": {
             "cluster1-cluster": State(
@@ -471,7 +457,9 @@ def test_get_desired_state_cluster_usergroups(
                 usergroup="cluster1-cluster",
                 description="Users with access to the cluster1 cluster",
                 users=set(),
+                user_names={"slack"},
                 channels=set(),
+                channel_names={"channel"},
                 usergroup_id="ugid",
             )
         },
@@ -481,7 +469,9 @@ def test_get_desired_state_cluster_usergroups(
                 usergroup="cluster1-cluster",
                 description="Users with access to the cluster1 cluster",
                 users=set(),
+                user_names={"slack"},
                 channels=set(),
+                channel_names={"channel"},
                 usergroup_id="ugid",
             )
         },
@@ -489,26 +479,18 @@ def test_get_desired_state_cluster_usergroups(
 
 
 def test_get_desired_state_non_existing_usergroup(
-    mocker: MockerFixture, slack_map: SlackMap, slack_client_mock: Mock, user: UserV1
+    mocker: MockerFixture, slack_map: SlackMap, user: UserV1
 ) -> None:
     mocker.patch("reconcile.openshift_users.fetch_desired_state", autospec=True)
     mocker.patch(
         "reconcile.slack_usergroups.include_user_to_cluster_usergroup"
     ).return_value = True
-    slack_client_mock.get_usergroup_id.return_value = None
 
     cluster = ClusterV1(name="cluster1", auth=[], disable={"integrations": []})
     result = integ.get_desired_state_cluster_usergroups(
         slack_map, [cluster], [user], None, None
     )
-    assert slack_client_mock.get_users_by_names.call_args_list == [
-        call(["slack"]),
-        call(["slack"]),
-    ]
-    assert slack_client_mock.get_channels_by_names.call_args_list == [
-        call(["channel"]),
-        call(["channel"]),
-    ]
+
     assert result == {
         "coreos": {
             "cluster1-cluster": State(
@@ -516,7 +498,9 @@ def test_get_desired_state_non_existing_usergroup(
                 usergroup="cluster1-cluster",
                 description="Users with access to the cluster1 cluster",
                 users=set(),
+                user_names={"slack"},
                 channels=set(),
+                channel_names={"channel"},
                 usergroup_id=None,
             )
         },
@@ -526,7 +510,9 @@ def test_get_desired_state_non_existing_usergroup(
                 usergroup="cluster1-cluster",
                 description="Users with access to the cluster1 cluster",
                 users=set(),
+                user_names={"slack"},
                 channels=set(),
+                channel_names={"channel"},
                 usergroup_id=None,
             )
         },
@@ -597,6 +583,9 @@ def test_act_empty_current_state(
     desired_state = base_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_channels_by_names.return_value = {"CHANA": "someotherchannel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
 
@@ -615,10 +604,12 @@ def test_act_update_usergroup_users(
     current_state = base_state
     desired_state = copy.deepcopy(base_state)
 
-    desired_state["slack-workspace"]["usergroup-1"].users = {
-        SlackObject(name="someotherusername", pk="USERB"),
-        SlackObject(name="anotheruser", pk="USERC"),
+    slack_client_mock.get_usergroup_id.return_value = "USERGA"
+    slack_client_mock.get_users_by_names.return_value = {
+        "USERB": "someotherusername",
+        "USERC": "anotheruser",
     }
+    slack_client_mock.get_channels_by_names.return_value = {"CHANA": "channelname"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
 
@@ -634,9 +625,11 @@ def test_act_update_usergroup_channels(
     current_state = base_state
     desired_state = copy.deepcopy(base_state)
 
-    desired_state["slack-workspace"]["usergroup-1"].channels = {
-        SlackObject(pk="CHANB", name="someotherchannel")
-    }
+    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_channels_by_names.return_value = {"CHANB": "channel"}
 
     act(current_state, desired_state, slack_map, dry_run=False)
 
@@ -656,6 +649,10 @@ def test_act_update_usergroup_description(
         "usergroup-1"
     ].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_channels_by_names.return_value = {"CHANA": "channel"}
+
     act(current_state, desired_state, slack_map, dry_run=False)
 
     assert slack_client_mock.update_usergroup.call_args_list == [
@@ -675,9 +672,10 @@ def test_act_update_usergroup_desc_and_channels(
     desired_state["slack-workspace"][
         "usergroup-1"
     ].description = "A different description"
-    desired_state["slack-workspace"]["usergroup-1"].channels = {
-        SlackObject(pk="CHANB", name="someotherchannel")
-    }
+
+    slack_client_mock.get_usergroup_id.return_value = "USERGA"
+    slack_client_mock.get_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)
 
@@ -692,21 +690,40 @@ def test_act_update_usergroup_desc_and_channels(
 def test_act_add_new_usergroups(
     base_state: SlackState, slack_map: SlackMap, slack_client_mock: Mock
 ) -> None:
+    def get_users(users: set[str]) -> dict[str, str]:
+        if "username" in users:
+            return {"USERA": "username"}
+        if "userb" in users:
+            return {"USERB": "userb", "USERC": "userc"}
+        return {"USERF": "userf", "USERG": "userg"}
+
+    def get_channels(channels: set[str]) -> dict[str, str]:
+        if "channelname" in channels:
+            return {"CHANA": "channelname"}
+        if "channelb" in channels:
+            return {"CHANB": "channelb", "CHANC": "channelc"}
+        return {"CHANF": "channelf", "CHANG": "channelg"}
+
+    def get_ugid(usergroup: str) -> str:
+        if usergroup == "usergroup-1":
+            return "USERGA"
+        if usergroup == "usergroup-2":
+            return "USERGB"
+        return "USERGC"
+
     current_state = base_state
     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_channels_by_names.side_effect = get_channels
+
     desired_state["slack-workspace"]["usergroup-2"] = State(
         workspace="slack-workspace",
         usergroup="usergroup-2",
         usergroup_id="USERGB",
-        users=[
-            SlackObject(pk="USERB", name="userb"),
-            SlackObject(pk="USERC", name="userc"),
-        ],
-        channels=[
-            SlackObject(pk="CHANB", name="channelb"),
-            SlackObject(pk="CHANC", name="channelc"),
-        ],
+        user_names={"userb", "userc"},
+        channel_names={"channelb", "channelc"},
         description="A new usergroup",
     )
 
@@ -714,14 +731,8 @@ def test_act_add_new_usergroups(
         workspace="slack-workspace",
         usergroup="usergroup-3",
         usergroup_id="USERGC",
-        users=[
-            SlackObject(pk="USERF", name="userf"),
-            SlackObject(pk="USERG", name="userg"),
-        ],
-        channels=[
-            SlackObject(pk="CHANF", name="channelf"),
-            SlackObject(pk="CHANG", name="channelg"),
-        ],
+        user_names={"userf", "userg"},
+        channel_names={"channelf", "channelg"},
         description="Another new usergroup",
     )
     slack_client_mock.create_usergroup.side_effect = ["USERGB", "USERGC"]

reconcile/utils/metrics.py

@@ -115,6 +115,12 @@ ocm_request = Counter(
     labelnames=["verb", "client_id"],
 )
 
+slack_request = Counter(
+    name="qontract_reconcile_slack_request_total",
+    documentation="Number of calls made to Slack API",
+    labelnames=["resource", "verb"],
+)
+
 
 #
 # Class based metrics

reconcile/utils/slack_api.py

@@ -24,6 +24,8 @@ from slack_sdk.http_retry import (
     RetryState,
 )
 
+from reconcile.utils.metrics import slack_request
+
 MAX_RETRIES = 5
 TIMEOUT = 30
 
@@ -201,6 +203,9 @@ class SlackApi:
         self.channel = channel
         self.chat_kwargs = chat_kwargs
 
+        self._user_groups_initialized = False
+        self.usergroups: list[dict] = []
+
         if init_usergroups:
             self._initiate_usergroups()
 
@@ -235,6 +240,7 @@ class SlackApi:
             )
 
         def do_send(c: str, t: str) -> None:
+            slack_request.labels("chat.postMessage", "POST").inc()
             self._sc.chat_postMessage(channel=c, text=t, **self.chat_kwargs)
 
         try:
@@ -283,6 +289,8 @@ class SlackApi:
 
         channels_found = self.get_channels_by_names(self.channel)
         [channel_id] = [k for k in channels_found if channels_found[k] == self.channel]
+        slack_request.labels("conversations.info", "GET").inc()
+
         info = self._sc.conversations_info(channel=channel_id)
         if not info.data["channel"]["is_member"]:  # type: ignore[call-overload]
             self._sc.conversations_join(channel=channel_id)
@@ -300,17 +308,26 @@ class SlackApi:
         :raises slack_sdk.errors.SlackApiError: if unsuccessful response from
         Slack API
         """
+        slack_request.labels("usergroups.list", "GET").inc()
+
         result = self._sc.usergroups_list(include_users=True)
         self.usergroups = result["usergroups"]
+        self._user_groups_initialized = True
 
     def get_usergroup(self, handle: str) -> dict[str, Any]:
+        if not self._user_groups_initialized:
+            self._initiate_usergroups()
         usergroup = [g for g in self.usergroups if g["handle"] == handle]
         if len(usergroup) != 1:
             raise UsergroupNotFoundException(handle)
         return usergroup[0]
 
     def create_usergroup(self, handle: str) -> str:
+        slack_request.labels("usergroups.create", "POST").inc()
+
         response = self._sc.usergroups_create(name=handle, handle=handle)
+        # Invalidate the usergroups list cache
+        self._user_groups_initialized = False
         return response["usergroup"]["id"]
 
     def update_usergroup(
@@ -326,6 +343,8 @@ class SlackApi:
         :raises slack_sdk.errors.SlackApiError: if unsuccessful response from
         Slack API
         """
+        slack_request.labels("usergroups.update", "POST").inc()
+
         self._sc.usergroups_update(
             usergroup=id, channels=channels_list, description=description
         )
@@ -346,6 +365,8 @@ class SlackApi:
             users_list = [self.get_random_deleted_user()]
 
         try:
+            slack_request.labels("usergroups.users.update", "POST").inc()
+
             self._sc.usergroups_users_update(usergroup=id, users=users_list)
         except SlackApiError as e:
             # Slack can throw an invalid_users error when emptying groups, but
@@ -374,6 +395,8 @@ class SlackApi:
         :raises UserNotFoundException: if the Slack user is not found
         """
         try:
+            slack_request.labels("users.lookupByEmail", "GET").inc()
+
             result = self._sc.users_lookupByEmail(email=f"{user_name}@{mail_address}")
         except SlackApiError as e:
             if e.response["error"] == "users_not_found":
@@ -433,6 +456,8 @@ class SlackApi:
             additional_kwargs.update(method_config)
 
         while True:
+            slack_request.labels(f"{api_key}.list", "GET").inc()
+
             result = self._sc.api_call(
                 "{}.list".format(api_key), http_verb="GET", params=additional_kwargs
             )
@@ -473,6 +498,8 @@ class SlackApi:
         responses = []
         keep_fetching = True
         while True:
+            slack_request.labels("conversations.history", "GET").inc()
+
             response = self._sc.conversations_history(
                 cursor=cursor, channel=self.channel, **self.chat_kwargs
             )