v1.3.4

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v1.3.34 (2023-09-05)
+
+### Fixed
+
+- Fix issue in `apps.slack.tasks.populate_slack_channels_for_team` task by @joeyorlando ([#2969](https://github.com/grafana/oncall/pull/2969))
+
 ## v1.3.33 (2023-09-05)
 
 ### Fixed

engine/apps/alerts/escalation_snapshot/snapshot_classes/escalation_policy_snapshot.py

@@ -411,11 +411,11 @@ class EscalationPolicySnapshot:
 
         last_alert = alert_group.alerts.last()
 
-        time_delta = datetime.timedelta(minutes=self.escalation_policy.num_minutes_in_window)
+        time_delta = datetime.timedelta(minutes=self.num_minutes_in_window)
         num_alerts_in_window = alert_group.alerts.filter(created_at__gte=last_alert.created_at - time_delta).count()
 
         # pause escalation if there are not enough alerts in time window
-        if num_alerts_in_window <= self.escalation_policy.num_alerts_in_window:
+        if num_alerts_in_window <= self.num_alerts_in_window:
             self.pause_escalation = True
             return self._get_result_tuple(pause_escalation=True)
         return None

engine/apps/alerts/tests/test_escalation_policy_snapshot.py

@@ -408,6 +408,46 @@ def test_escalation_step_notify_if_num_alerts_in_window(
     assert not mocked_execute_tasks.called
 
 
+@pytest.mark.django_db
+def test_escalation_step_notify_if_num_alerts_in_window_deleted_escalation_policy(
+    escalation_step_test_setup, make_escalation_policy, make_alert
+):
+    _, _, _, channel_filter, alert_group, reason = escalation_step_test_setup
+
+    make_alert(alert_group=alert_group, raw_request_data={})
+
+    notify_if_2_alerts_per_1_minute = make_escalation_policy(
+        escalation_chain=channel_filter.escalation_chain,
+        escalation_policy_step=EscalationPolicy.STEP_NOTIFY_IF_NUM_ALERTS_IN_TIME_WINDOW,
+        num_alerts_in_window=2,
+        num_minutes_in_window=1,
+    )
+
+    escalation_policy_snapshot = get_escalation_policy_snapshot_from_model(notify_if_2_alerts_per_1_minute)
+    notify_if_2_alerts_per_1_minute.delete()
+
+    with pytest.raises(EscalationPolicy.DoesNotExist):
+        notify_if_2_alerts_per_1_minute.refresh_from_db()
+
+    assert not alert_group.log_records.filter(
+        type=AlertGroupLogRecord.TYPE_ESCALATION_TRIGGERED,
+        escalation_policy_step=EscalationPolicy.STEP_NOTIFY_IF_NUM_ALERTS_IN_TIME_WINDOW,
+    ).exists()
+
+    result = escalation_policy_snapshot.execute(alert_group, reason)
+    expected_result = EscalationPolicySnapshot.StepExecutionResultData(
+        eta=None,
+        stop_escalation=False,
+        pause_escalation=True,
+        start_from_beginning=False,
+    )
+    assert result == expected_result
+    assert alert_group.log_records.filter(
+        type=AlertGroupLogRecord.TYPE_ESCALATION_TRIGGERED,
+        escalation_policy_step=EscalationPolicy.STEP_NOTIFY_IF_NUM_ALERTS_IN_TIME_WINDOW,
+    ).exists()
+
+
 @patch("apps.alerts.escalation_snapshot.snapshot_classes.EscalationPolicySnapshot._execute_tasks", return_value=None)
 @pytest.mark.django_db
 def test_escalation_step_trigger_custom_button(

engine/apps/slack/tasks.py

@@ -540,11 +540,9 @@ def populate_slack_channels_for_team(slack_team_identity_id: int, cursor: Option
         response, cursor, rate_limited = sc.paginated_api_call_with_ratelimit(
             "conversations_list",
             paginated_key="channels",
-            json={
-                "types": "public_channel,private_channel",
-                "limit": 1000,
-                "cursor": cursor,
-            },
+            types="public_channel,private_channel",
+            limit=1000,
+            cursor=cursor,
         )
     except SlackAPITokenException as e:
         logger.info(f"token revoked\n{e}")