centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Organization Deleted/Moved Precedence (#1402)

Browse source 
# What this PR does
When an organization is migrated to a different cluster it has it's
`migration_destination_slug` set for redirection purposes but it also
needs to be deleted so scheduled tasks for it do not run in the old
cluster. By changing the order so moved has precedence over deleted API
calls will be correctly redirected for moved organizations while the
organization is still considered deleted to suppress tasks that are no
longer needed in the old cluster.

## Which issue(s) this PR fixes

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated
This commit is contained in:
Michael Derynck 2023-02-24 04:45:21 -07:00 • committed by GitHub
parent 12a04db2ed
commit 49946e6a4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/apps/auth_token/auth.py
View file

@ -46,10 +46,10 @@ class ApiTokenAuthentication(BaseAuthentication):
except InvalidToken:
raise exceptions.AuthenticationFailed("Invalid token.")
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
if auth_token.organization.is_moved:
raise OrganizationMovedException(auth_token.organization)
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
return auth_token.user, auth_token
@ -180,10 +180,10 @@ class ScheduleExportAuthentication(BaseAuthentication):
except InvalidToken:
raise exceptions.AuthenticationFailed("Invalid token.")
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
if auth_token.organization.is_moved:
raise OrganizationMovedException(auth_token.organization)
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
if auth_token.schedule.public_primary_key != public_primary_key:
raise exceptions.AuthenticationFailed("Invalid schedule export token for schedule")
@ -215,10 +215,10 @@ class UserScheduleExportAuthentication(BaseAuthentication):
except InvalidToken:
raise exceptions.AuthenticationFailed("Invalid token")
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
if auth_token.organization.is_moved:
raise OrganizationMovedException(auth_token.organization)
if auth_token.organization.deleted_at:
raise OrganizationDeletedException(auth_token.organization)
if auth_token.user.public_primary_key != public_primary_key:
raise exceptions.AuthenticationFailed("Invalid schedule export token for user")

4
engine/apps/integrations/mixins/alert_channel_defining_mixin.py
View file

@ -66,12 +66,12 @@ class AlertChannelDefiningMixin(object):
logger.info("Cache is empty!")
raise
if alert_receive_channel.organization.is_moved:
raise OrganizationMovedException(alert_receive_channel.organization)
if alert_receive_channel.organization.deleted_at:
# It's better to raise OrganizarionDeletedException, but in legacy code PermissionDenied is returned when integration key not found.
# So, keep it consistent.
raise PermissionDenied("Integration key was not found. Permission denied.")
if alert_receive_channel.organization.is_moved:
raise OrganizationMovedException(alert_receive_channel.organization)
del kwargs["alert_channel_key"]
kwargs["alert_receive_channel"] = alert_receive_channel