Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server] Fix team deletion for non-UBP enabled teams #13402

Merged
merged 1 commit into from
Sep 28, 2022

Conversation

andrew-farries
Copy link
Contributor

@andrew-farries andrew-farries commented Sep 28, 2022

Description

Team deletion for non-UBP teams is currently broken. This PR fixes the issue by ensuring that we don't check for UBP specific details about the team (such as any currently active Stripe subscription) before ensuring that Stripe payments are enabled.

Related Issue(s)

Fixes #13392

How to test

Create a team in the preview environment and then delete it.

Release Notes

[server] Fix for the inability to delete teams that were not subscribed to usage based pricing

Documentation

Werft options:

  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-integration-tests=all
    Valid options are all, workspace, webapp, ide

@andrew-farries andrew-farries requested a review from a team September 28, 2022 10:42
@github-actions github-actions bot added the team: webapp Issue belongs to the WebApp team label Sep 28, 2022
@werft-gitpod-dev-com
Copy link

started the job as gitpod-build-af-fix-sh-team-deletion.4 because the annotations in the pull request description changed
(with .werft/ from main)

Ensure that payment is enabled before attempting Stripe operations.
Copy link
Contributor

@jankeromnes jankeromnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, many thanks! 👍

Note: the check could technically also cover the above subscription check, but let's not "fix" that if it ain't broke 😁

@roboquat roboquat merged commit 4d694d0 into main Sep 28, 2022
@roboquat roboquat deleted the af/fix-sh-team-deletion branch September 28, 2022 11:31
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Sep 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: webapp Meta team change is running in production deployed Change is completely running in production release-note size/S team: webapp Issue belongs to the WebApp team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot delete teams in self-hosted RC build
3 participants