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

Allow DB override via hidden parameter #482

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Conversation

mkysel
Copy link
Collaborator

@mkysel mkysel commented Feb 12, 2025

This is required to upgrade testing to create a separate DB that is only being used by the test.

Will get backported into a 0.1.3 stream.

Summary by CodeRabbit

  • New Features
    • Added a configuration option that allows you to override the default naming for your database setup, offering enhanced flexibility and customization of your database namespace.

@mkysel mkysel requested a review from a team as a code owner February 12, 2025 18:15
Copy link

coderabbitai bot commented Feb 12, 2025

Walkthrough

The changes add a new configuration option for specifying the database namespace. In cmd/replication/main.go, a new variable namespace is introduced that either uses options.DB.NameOverride or falls back to the result of utils.BuildNamespace(options) if the override is empty. Additionally, the pkg/config/options.go file is updated with a new NameOverride field in the DbOptions struct, allowing users to override the automatically generated database name.

Changes

File(s) Change Summary
cmd/replication/main.go Introduced a new variable namespace that conditionally assigns options.DB.NameOverride (if provided) or the result of utils.BuildNamespace(options), used in the call to db.NewNamespacedDB.
pkg/config/options.go Added a new string field NameOverride to the DbOptions struct with tags for long and environment variable specifications, enabling the override of the default database name.

Sequence Diagram(s)

sequenceDiagram
    participant Main
    participant Options
    participant Utils
    participant DB

    Main->>Options: Retrieve DB configuration
    alt NameOverride provided
        Main->>DB: Call NewNamespacedDB with NameOverride as namespace
    else NameOverride not provided
        Main->>Utils: Execute BuildNamespace(options)
        Utils-->>Main: Return computed namespace
        Main->>DB: Call NewNamespacedDB with computed namespace
    end
Loading

Possibly related PRs

  • Use namespace in DB #295: Involves modifications to the database namespace handling logic, aligning with the introduction of the namespace variable in this pull request.

Suggested reviewers

  • richardhuaaa
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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. (Beta)
  • @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.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
cmd/replication/main.go (1)

76-79: Consider adding debug log when override is used.

The override logic is correct and maintains backward compatibility. Consider adding a debug log when the override is used to help with debugging.

 namespace := options.DB.NameOverride
 if namespace == "" {
   namespace = utils.BuildNamespace(options)
+} else {
+  logger.Debug("using overridden database name", zap.String("namespace", namespace))
 }
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 69568d3 and 8d07a57.

📒 Files selected for processing (2)
  • cmd/replication/main.go (1 hunks)
  • pkg/config/options.go (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Test (Node)
🔇 Additional comments (2)
pkg/config/options.go (1)

28-28: LGTM! Well-structured configuration option.

The new NameOverride field is properly configured with appropriate tags and follows the established patterns. The hidden flag aligns with its intended use as a testing parameter.

cmd/replication/main.go (1)

76-84: Verify environment variable usage.

Let's verify that the environment variable XMTPD_DB_NAME_OVERRIDE is properly handled by the configuration parser.

✅ Verification successful

🏁 Script executed:

#!/bin/bash
# Description: Verify that the environment variable is properly handled.

# Test: Search for environment variable usage
rg -A 5 'XMTPD_DB_NAME_OVERRIDE'

# Test: Search for any tests that verify environment variable handling
rg -A 5 'TestDbOptions|TestServerOptions'

Length of output: 532


Environment variable XMTPD_DB_NAME_OVERRIDE is correctly handled.

  • The configuration file pkg/config/options.go properly defines the NameOverride field with the env:"XMTPD_DB_NAME_OVERRIDE" tag.
  • In cmd/replication/main.go, if options.DB.NameOverride is empty, a fallback (utils.BuildNamespace(options)) is used, confirming that the environment variable, when set, will override the default behavior.

@mkysel mkysel mentioned this pull request Feb 12, 2025
5 tasks
Copy link
Collaborator

@fbac fbac left a comment

Choose a reason for hiding this comment

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

LGTM. This can also be useful for reorg tests.

@mkysel mkysel merged commit edfcdd3 into main Feb 13, 2025
7 checks passed
@mkysel mkysel deleted the mkysel/db-name-override branch February 13, 2025 14:41
mkysel added a commit that referenced this pull request Feb 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants