From a6680e5ac1a8f4c0199ff5572be2eab446500adf Mon Sep 17 00:00:00 2001 From: Ildar Iskhakov Date: Tue, 30 Jan 2024 18:33:22 +0800 Subject: [PATCH] Merge hotfix 1.3.94 (#3784) # What this PR does ## Which issue(s) this PR fixes ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --------- Co-authored-by: Joey Orlando Co-authored-by: GitHub Actions Co-authored-by: Joey Orlando Co-authored-by: Vadim Stepanov --- engine/common/oncall_gateway/utils.py | 8 ++++---- helm/oncall/Chart.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/common/oncall_gateway/utils.py b/engine/common/oncall_gateway/utils.py index 60258ad2..a11bab3f 100644 --- a/engine/common/oncall_gateway/utils.py +++ b/engine/common/oncall_gateway/utils.py @@ -54,7 +54,7 @@ def check_slack_installation_possible(oncall_org_id: str, slack_id: str, backend def create_slack_connector(oncall_org_id: str, slack_id: str, backend: str): - client = ChatopsProxyAPIClient(settings.ONCALL_GATEWAY_URL, settings.ONCALL_GATEWAY_API_TOKEN) + client = OnCallGatewayAPIClient(settings.ONCALL_GATEWAY_URL, settings.ONCALL_GATEWAY_API_TOKEN) try: client.post_slack_connector(oncall_org_id, slack_id, backend) except Exception as e: @@ -175,11 +175,11 @@ def unregister_oncall_tenant_wrapper(service_tenant_id: str, cluster_slug: str): delete_oncall_connector(service_tenant_id) -def can_link_slack_team_wrapper(service_tenant_id: str, slack_team_id, cluster_slug: str): +def can_link_slack_team_wrapper(service_tenant_id: str, slack_team_id, cluster_slug: str) -> bool: if settings.CHATOPS_V3: - can_link_slack_team(service_tenant_id, slack_team_id, cluster_slug) + return can_link_slack_team(service_tenant_id, slack_team_id, cluster_slug) else: - check_slack_installation_possible(service_tenant_id, slack_team_id, cluster_slug) + return check_slack_installation_possible(service_tenant_id, slack_team_id, cluster_slug) def link_slack_team_wrapper(service_tenant_id: str, slack_team_id: str): diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml index 4ce76359..c3b81883 100644 --- a/helm/oncall/Chart.yaml +++ b/helm/oncall/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: oncall description: Developer-friendly incident response with brilliant Slack integration type: application -version: 1.3.90 -appVersion: v1.3.90 +version: 1.3.92 +appVersion: v1.3.92 dependencies: - name: cert-manager version: v1.8.0