-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Billing fixes #3976
Merged
Merged
Billing fixes #3976
+546
−233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
rkuo-danswer
approved these changes
Feb 13, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did my best to review this, seems OK. This seems like a good candidate to add to Chris's testing bash document.
3152b51
to
932db92
Compare
932db92
to
75ea486
Compare
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 13, 2025
* misct billing_fixes g * various billing updates * improvements * quick nit * k * update * k * k * k
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Brief background
Should go in in tandem with https://github.com/onyx-dot-app/danswer-control-plane/pull/26
When it comes to billing, we have a few pieces of relevant information to store:
The ground truth is always Stripe, so we use the Stripe customer /subscription IDs to be able to reference the Stripe API as often as possible. That being said, we have two mechanisms for keeping subscription details up to date in the control plane:
How do we make sure that the data plane always has accurate and up-to-date information on a given user's billing information (considering we don't want to add unnecessary complexity to the data plane)?
What this PR does
How Has This Been Tested?
Test various billing flows with local multi tenant setup,
with both and only one of each of background processes and webhooks enabled
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.