Skip to content

Conversation

@turip
Copy link
Member

@turip turip commented May 28, 2025

Overview

This ensures that we are not generating new flat fee lines from the user interface.

Notes for reviewer

Summary by CodeRabbit

  • New Features
    • Introduced a feature switch to control the use of usage-based flat fee invoice lines.
  • Bug Fixes
    • Added validation to prevent creation or modification of flat fee invoice lines when the usage-based flat fee feature is enabled, ensuring only usage-based lines are allowed under this setting.

This ensures that we are not generating new flat fee lines from the user interface.
@coderabbitai
Copy link
Contributor

coderabbitai bot commented May 28, 2025

📝 Walkthrough

Walkthrough

This change introduces a feature switch for usage-based flat fee invoice lines by adding a new configuration field and propagating it through the server, router, and billing HTTP handler layers. Validation logic is added to prevent creation or modification of flat fee invoice lines when the relevant feature flag is enabled.

Changes

Files/Paths Change Summary
cmd/server/main.go Passes BillingFeatureSwitches from config to RouterConfig during server setup.
openmeter/server/router/router.go Adds BillingFeatureSwitches field to Config struct; passes it to billing handler initialization.
openmeter/billing/httpdriver/handler.go Adds featureSwitches field to handler struct; updates New constructor to accept and assign it.
openmeter/billing/httpdriver/invoiceline.go Adds validation to disallow flat fee invoice lines when UseUsageBasedFlatFeeLines feature switch is enabled.

Possibly related PRs

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (1.64.8)

Error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2
Failed executing command with error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between deef967 and b321c6a.

📒 Files selected for processing (4)
  • cmd/server/main.go (1 hunks)
  • openmeter/billing/httpdriver/handler.go (4 hunks)
  • openmeter/billing/httpdriver/invoiceline.go (3 hunks)
  • openmeter/server/router/router.go (3 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (3)
openmeter/billing/httpdriver/handler.go (1)
app/config/billing.go (1)
  • BillingFeatureSwitchesConfiguration (35-38)
openmeter/server/router/router.go (1)
app/config/billing.go (1)
  • BillingFeatureSwitchesConfiguration (35-38)
openmeter/billing/httpdriver/invoiceline.go (3)
openmeter/billing/invoiceline.go (2)
  • InvoiceLineTypeFee (31-31)
  • LineChildren (693-695)
openmeter/billing/errors.go (1)
  • ValidationError (119-119)
openmeter/ent/db/ent.go (1)
  • ValidationError (255-258)
⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: Test
  • GitHub Check: Quickstart
  • GitHub Check: Lint
  • GitHub Check: E2E
  • GitHub Check: Developer environment
  • GitHub Check: CI
  • GitHub Check: Analyze (go)
🔇 Additional comments (9)
cmd/server/main.go (1)

164-164: LGTM - Configuration propagation is correct.

The addition of BillingFeatureSwitches to the router configuration properly propagates the billing feature switches from the main configuration through to the router layer.

openmeter/server/router/router.go (3)

15-15: LGTM - Required import for configuration type.

The config package import is necessary for the BillingFeatureSwitchesConfiguration type.


90-90: LGTM - Config struct properly extended.

The addition of the BillingFeatureSwitches field correctly extends the router configuration to support billing feature switches.


349-349: LGTM - Feature switches correctly passed to billing handler.

The billing feature switches are properly passed to the billing HTTP handler during initialization, completing the configuration propagation chain.

openmeter/billing/httpdriver/handler.go (2)

9-9: LGTM - Required import for configuration type.

The config package import is necessary for the BillingFeatureSwitchesConfiguration type used in the handler struct.


56-56: LGTM - Feature switches properly integrated into handler.

The handler struct is correctly extended with the featureSwitches field, the constructor accepts the configuration parameter, and the field is properly assigned. This enables the handler to access feature switch settings for validation logic.

Also applies to: 72-72, 81-81

openmeter/billing/httpdriver/invoiceline.go (3)

72-80: LGTM - Validation correctly prevents flat fee line creation.

The validation logic properly checks the UseUsageBasedFlatFeeLines feature switch and prevents creation of flat fee lines when the feature is enabled. The error message is clear and informative.


955-959: LGTM - Consistent validation for new lines in merge operation.

The validation is correctly applied when creating new lines through the merge operation, maintaining consistency with the direct creation path.


981-985: LGTM - Validation prevents updates to existing flat fee lines.

The validation correctly prevents updates to existing flat fee lines when the feature switch is enabled, ensuring comprehensive protection against flat fee line manipulation.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@turip turip added release-note/misc Miscellaneous changes area/billing labels May 28, 2025
@turip turip marked this pull request as ready for review May 28, 2025 09:07
@turip turip requested a review from a team as a code owner May 28, 2025 09:07
@turip turip requested a review from chrisgacsal May 28, 2025 09:08
@turip turip merged commit 1445385 into main May 28, 2025
27 of 28 checks passed
@turip turip deleted the chore/forbid-api-based-naked-flat-line-manipulation branch May 28, 2025 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants