Polish handling of BillingMode #12130

geropl · 2022-08-15T09:47:31Z

Description

This PR includes a couple of alignments around BillingMode. It's reviewable by commit. As all changes share the same context I think it does not make sense to further split this up. 🧘

Improved tests + additional tests (no change in behavior)
Make "workspace classes" usable if either of these are true:
1. You have the "workspace_classes" FF enabled
2. The method BillingMode.canSetWorkspaceClass returns true for your BillingMode
Small fix to BillingModes: Only have paid UBP team memberships override existing Chargebee memberships
Handle bad "CostCenter" error, in case you have not yet set a team spending limit for whatever reason
~~Make moment time offset work on Usage List View~~ removed
Fix wrong usage of findCustomerByUserId and replace with findCustomerByTeamId

Related Issue(s)

Fixes #12098
Fixes #12090
Fixes #12149

How to test

signup
create a Team called Gitpod-heroes or so
check:
- user preferences: no workspace classes selector, yet ✔️
- user billing: no Usage-based stuff, yet ✔️
- user settings menu: still has entries for Plans/Team Subscriptions ✔️
try to start a workspace: shows the "set spending limit" UI ✔️
signup for a Usage-Based team plan
- user preferences: see workspace classes selector, yet ✔️
- user billing: see the UBP attribution selector ✔️
- user settings menu: no entries for Plans/Team Subscriptions ✔️

Release Notes

NONE

Documentation

Werft options:

/werft with-preview
/werft with-payment

geropl · 2022-08-15T09:47:52Z

/werft run

👍 started the job as gitpod-build-gpl-ubp.2
(with .werft/ from main)

werft-gitpod-dev-com · 2022-08-15T15:07:03Z

started the job as gitpod-build-gpl-ubp.3 because the annotations in the pull request description changed
(with .werft/ from main)

components/server/ee/src/billing/billing-mode.ts

jankeromnes · 2022-08-16T14:12:35Z

Thanks! Code looks good, now moving on to (manual) tests.

jankeromnes · 2022-08-16T14:16:46Z

Question:

I have no paid plans, but am by default in Chargebee mode
I create a team called "Gitpod Something", which enables Usage-Based for both myself and my team
In my team, I now see the Usage-Based Billing UI, which is great 👍
However, in my user, I still only see the Chargebee UI

Is this expected?
How will I be able to upgrade my user to individual Usage-Based Billing (once that's supported)?

geropl · 2022-08-16T14:16:52Z

/hold Have to remove the usage timestamp fix commit as it clashes with a parallel fix.

…hed"

geropl · 2022-08-16T14:59:29Z

We discussed @jankeromnes comment above: It's very well possible to not have UBP on your user. In this case, because the Team had not paid plan, yet.

geropl · 2022-08-16T16:03:29Z

/unhold

Commit removed.

@jankeromnes PR should be good to review - sorry for the UI glitch 🙇

jankeromnes · 2022-08-17T07:45:24Z

Many thanks for finishing up this PR @geropl! I went through the entire "How to test" process, but found a few possible small problems.

How to test

signup

Right after signup, and a second time later after randomly refreshing once (but it's hard to reproduce), I got this strange error:

I believe this is when a backend service returns an error, but it's missing an HTTP error code (it's supposed to say something like Error 500, but instead it's just Error with a space but no error code).

But maybe it's just a preview problem and not related to this PR?

create a Team called Gitpod-heroes or so

✅

Additionally, this wasn't part of the test flow, but I notice that the Team Billing UI has some unfortunate flickering:

https://youtu.be/v-x4zhj25pA

Instead of briefly showing the Chargebee UI before the Usage-Based UI shows up, I think this initial state should be a loading indicator. Can be done in a follow-up though.

check:

user preferences: no workspace classes selector, yet ✔️

❌ Actually, there is this:

Is this not expected?

user billing: no Usage-based stuff, yet ✔️

✅ (although I think this should change in the future when we implement usage-based billing for individual users)

user settings menu: still has entries for Plans/Team Subscriptions ✔️

✅

try to start a workspace: shows the "set spending limit" UI ✔️

❌ It didn't show the "set spending limit" UI, but started a workspace successfully instead:

signup for a Usage-Based team plan

user preferences: see workspace classes selector, yet ✔️

✅ (selector is still visible)

user billing: see the UBP attribution selector ✔️

❔ basically worked, although I needed to hard-refresh once in order to see the "Billing" menu entry (instead of the "Plans" and "Team Plans" entries which were still there for some reason).

After that single refresh, everything is there, although the "Billing" menu entry now takes a long time before it shows up.

user settings menu: no entries for Plans/Team Subscriptions ✔️

✅ (same as above -- menu is eventually correct, but it takes a long time before the "Billing" menu entry shows up)

geropl · 2022-08-17T07:57:32Z

Thank you for your thorough review, @jankeromnes ! 🚀

Is this not expected?

The value of the workspace_classes FF changed in the meantime: 🙈

So this is expected, yes - but makes it hard to test. 🙄 We could add an exlusion case there... or try again with a non-@gitpod.io user.

Instead of briefly showing the Chargebee UI before the Usage-Based UI shows up, I think this initial state should be a loading indicator. Can be done in a follow-up though.

grey_question basically worked, although I needed to hard-refresh once in order to see the "Billing" menu entry (instead of the "Plans" and "Team Plans" entries which were still there for some reason).

Would you have time after 10:30 to help me fix these? 🙏 Feels like it could be simple, but I'm too unfamiliar with the Dashboard to be confident.

I believe this is when a backend service returns an error, but it's missing an HTTP error code (it's supposed to say something like Error 500, but instead it's just Error with a space but no error code).

Are there any logs on the server pod? 🤔

jankeromnes · 2022-08-17T08:15:35Z

So this is expected, yes - but makes it hard to test. 🙄 We could add an exlusion case there... or try again with a non-@gitpod.io user.

I tried with a non-@gitpod.io user -- same problem:

Initially, preferences has no workspace class selector
After creating a "Gitpod (Something)" team, preferences has a workspace class selector (contrary to test plan)
After upgrading team to usage-based subscription, workspace class selector remains in preferences

Would you have time after 10:30 to help me fix these? 🙏 Feels like it could be simple, but I'm too unfamiliar with the Dashboard to be confident.

Would be more than happy to! 👍 🎨

Are there any logs on the server pod? 🤔

I didn't check for server errors, but I'm pretty sure the /sorry/ redirect happens here:

gitpod/components/proxy/conf/Caddyfile

Lines 277 to 279 in aa2c51c

    
           	handle_errors { 
        
           		redir https://{$GITPOD_DOMAIN}/sorry/#Error%20{http.reverse_proxy.status_text} 302 
        
           	}

geropl · 2022-08-17T09:08:29Z

@jankeromnes and I synced, and created this commit with resulting fixes. 👍

jankeromnes · 2022-08-17T09:48:31Z

Thanks @geropl!

Unfortunately, while doing one last check, I found another problem 🙈 it looks like the Chargebee team billing UI is now gone entirely:

https://youtu.be/oFNoS11vmuM

Notice that I have one team with UB flag enabled, and another team with UB flag disabled.

EDIT: However, when I delete the team with with UB enabled, it fixes the Charbebee UI of the team with UB disabled.

components/dashboard/src/teams/TeamBilling.tsx

jankeromnes

Alright! I think we're there now. 🎉 Thanks for iterating until it works!

Approving to unblock merging, but holding because there is still one problem that I raised in this comment:

❌ It didn't show the "set spending limit" UI, but started a workspace successfully instead:

The testing plan says that, when you create a "Gitpod (Something)" team, and try to start a workspace, you get blocked by a "Spending Limit" modal.

This is not the case.

Instead, it continues to start workspaces with no issues, and I have to upgrade a team to Usage-Based, and then set a Spending Limit to very low (e.g. 0), in order to actually see the "Spending Limit" modal on workspace start.

However, this is likely a bug in the test scenario, and not a bug in the code, right? 😇

/hold

geropl · 2022-08-17T12:56:10Z

The testing plan says that, when you create a "Gitpod (Something)" team, and try to start a workspace, you get blocked by a "Spending Limit" modal.

This is not the case.

However, this is likely a bug in the test scenario, and not a bug in the code, right? innocent

I tested this before the rebase. As it's not critical, and more important that we don't show an arkward error message as before, I'd say let's merge this one (as it's big enough), and I will re-test and take care in a follow up.

Mentioned earlier, but here again: thank you for the through review @jankeromnes ! 🙏

geropl · 2022-08-17T12:56:19Z

/unhold

roboquat added do-not-merge/work-in-progress do-not-merge/release-note-label-needed size/XS labels Aug 15, 2022

roboquat added size/XL and removed size/XS labels Aug 16, 2022

geropl force-pushed the gpl/ubp branch from 4a45788 to 59bca5d Compare August 16, 2022 12:23

roboquat added size/L release-note-none and removed size/XL do-not-merge/release-note-label-needed labels Aug 16, 2022

geropl marked this pull request as ready for review August 16, 2022 12:30

geropl requested a review from a team August 16, 2022 12:30

roboquat removed the do-not-merge/work-in-progress label Aug 16, 2022

github-actions bot added the team: webapp Issue belongs to the WebApp team label Aug 16, 2022

geropl changed the title ~~UBP - dev~~ Polish handling of BillingMode Aug 16, 2022

jankeromnes self-assigned this Aug 16, 2022

jankeromnes reviewed Aug 16, 2022

View reviewed changes

components/server/ee/src/billing/billing-mode.ts Outdated Show resolved Hide resolved

jankeromnes reviewed Aug 16, 2022

View reviewed changes

components/server/ee/src/billing/billing-mode.ts Outdated Show resolved Hide resolved

jankeromnes reviewed Aug 16, 2022

View reviewed changes

components/server/ee/src/billing/billing-mode.ts Show resolved Hide resolved

roboquat added the do-not-merge/hold label Aug 16, 2022

geropl added 5 commits August 16, 2022 14:53

[server] Improved BillingMode tests

ce4ca59

[server] Add test case for cancelled old TeamSubscription

90eb5f5

[dashboard, server] WorkspaceClass: make usable based on BillingMode

e5fec66

[server] BillingMode: Only paid UBP team seats are "greedy"

8f27300

[server] Treat "no CostCenter found" the same as "spending limit reac…

8ce23dc

…hed"

[server] BillingMode: Use findCustomerByTeamId

319c728

geropl force-pushed the gpl/ubp branch from 59bca5d to 319c728 Compare August 16, 2022 16:01

roboquat added size/XL and removed size/L labels Aug 16, 2022

roboquat removed the do-not-merge/hold label Aug 16, 2022

jankeromnes reviewed Aug 17, 2022

View reviewed changes

components/dashboard/src/teams/TeamBilling.tsx Outdated Show resolved Hide resolved

[dashboard] Fix BillingMode UI glitches

6929af6

geropl force-pushed the gpl/ubp branch from 1810ac3 to 6929af6 Compare August 17, 2022 09:54

jankeromnes approved these changes Aug 17, 2022

View reviewed changes

roboquat added the do-not-merge/hold label Aug 17, 2022

roboquat removed the do-not-merge/hold label Aug 17, 2022

roboquat merged commit 4d7695b into main Aug 17, 2022

roboquat deleted the gpl/ubp branch August 17, 2022 12:56

roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Aug 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Polish handling of BillingMode #12130

Polish handling of BillingMode #12130

geropl commented Aug 15, 2022 •

edited

geropl commented Aug 15, 2022 •

edited by werft-gitpod-dev-com bot

werft-gitpod-dev-com bot commented Aug 15, 2022

jankeromnes commented Aug 16, 2022 •

edited

jankeromnes commented Aug 16, 2022 •

edited by werft-gitpod-dev-com bot

geropl commented Aug 16, 2022

geropl commented Aug 16, 2022

geropl commented Aug 16, 2022

jankeromnes commented Aug 17, 2022 •

edited

How to test

geropl commented Aug 17, 2022

jankeromnes commented Aug 17, 2022 •

edited by werft-gitpod-dev-com bot

geropl commented Aug 17, 2022

jankeromnes commented Aug 17, 2022 •

edited

jankeromnes left a comment •

edited

geropl commented Aug 17, 2022

geropl commented Aug 17, 2022

Polish handling of BillingMode #12130

Polish handling of BillingMode #12130

Conversation

geropl commented Aug 15, 2022 • edited

Description

Related Issue(s)

How to test

Release Notes

Documentation

Werft options:

geropl commented Aug 15, 2022 • edited by werft-gitpod-dev-com bot

werft-gitpod-dev-com bot commented Aug 15, 2022

jankeromnes commented Aug 16, 2022 • edited

jankeromnes commented Aug 16, 2022 • edited by werft-gitpod-dev-com bot

geropl commented Aug 16, 2022

geropl commented Aug 16, 2022

geropl commented Aug 16, 2022

jankeromnes commented Aug 17, 2022 • edited

How to test

geropl commented Aug 17, 2022

jankeromnes commented Aug 17, 2022 • edited by werft-gitpod-dev-com bot

geropl commented Aug 17, 2022

jankeromnes commented Aug 17, 2022 • edited

jankeromnes left a comment • edited

Choose a reason for hiding this comment

geropl commented Aug 17, 2022

geropl commented Aug 17, 2022

geropl commented Aug 15, 2022 •

edited

geropl commented Aug 15, 2022 •

edited by werft-gitpod-dev-com bot

jankeromnes commented Aug 16, 2022 •

edited

jankeromnes commented Aug 16, 2022 •

edited by werft-gitpod-dev-com bot

jankeromnes commented Aug 17, 2022 •

edited

jankeromnes commented Aug 17, 2022 •

edited by werft-gitpod-dev-com bot

jankeromnes commented Aug 17, 2022 •

edited

jankeromnes left a comment •

edited