Skip to content

Commit

Permalink
Don't check chatops gateway link in OSS deployment (#3893)
Browse files Browse the repository at this point in the history
# What this PR does
Prevents checking ability to connect instance with chatops gateway when
running in OSS deployment.

## Which issue(s) this PR fixes
#3834 

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
  • Loading branch information
mderynck authored Feb 14, 2024
1 parent 3839922 commit 07916d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Quotes in templates not rendering results correctly ([#3884](https://github.com/grafana/oncall/pull/3884))
- Unblock slack install by skipping check chatops gateway link in OSS deployment @mderynck ([#3893](https://github.com/grafana/oncall/pull/3893))

## v1.3.104 (2024-02-12)

Expand Down
7 changes: 4 additions & 3 deletions engine/apps/social_auth/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ def populate_slack_identities(response, backend, user, organization, **kwargs):
return HttpResponse(status=status.HTTP_400_BAD_REQUEST)

slack_team_id = response["team"]["id"]
can_link = can_link_slack_team_wrapper(str(organization.uuid), slack_team_id, settings.ONCALL_BACKEND_REGION)
if settings.FEATURE_MULTIREGION_ENABLED and not can_link:
raise InstallMultiRegionSlackException
if settings.LICENSE == settings.CLOUD_LICENSE_NAME:
can_link = can_link_slack_team_wrapper(str(organization.uuid), slack_team_id, settings.ONCALL_BACKEND_REGION)
if settings.FEATURE_MULTIREGION_ENABLED and not can_link:
raise InstallMultiRegionSlackException

slack_team_identity, is_slack_team_identity_created = SlackTeamIdentity.objects.get_or_create(
slack_id=slack_team_id,
Expand Down

0 comments on commit 07916d0

Please sign in to comment.