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

feat: support Litestream age encryption #8526

Merged
merged 3 commits into from
May 22, 2024
Merged

Conversation

salim-b
Copy link
Contributor

@salim-b salim-b commented May 19, 2024

Change Summary

Follow-up to #8494 that allows users to opt in to Litestream's integrated age encryption by simply setting the environment variables LITESTREAM_AGE_PUBLIC_KEY and LITESTREAM_AGE_SECRET_KEY.

Additionally, the second commit fixes variable names to match the documentation.

Change type

  • feat: (new feature for the user, not a new feature for build script)
  • fix: (bug fix for the user, not a fix to a build script)
  • docs: (changes to the documentation)
  • style: (formatting, missing semi colons, etc; no production code change)
  • refactor: (refactoring production code, eg. renaming a variable)
  • test: (adding missing tests, refactoring tests; no production code change)
  • chore: (updating grunt tasks etc; no production code change)

Test/ Verification

Successfully tested in own cloud deployment.

Additional information / screenshots (optional)

The CLI tool dasel is used to query and update the Litestream YAML config file before Litestream is started. This should be a robust solution that doesn't interfere should users still want to use a custom container build replacing the default litestream.yaml config for some reason.

Copy link
Contributor

coderabbitai bot commented May 19, 2024

Walkthrough

Walkthrough

The recent updates enhance security and streamline the setup for self-hosted NocoDB instances. New environment variables for encrypting Litestream replication using age encryption or SSH keys have been introduced. The Dockerfile now includes dasel for improved package installation, and the Litestream startup script has been updated to handle age encryption and enhance the database restoration process.

Changes

File Path Change Summary
.../020.environment-variables.md Added LITESTREAM_AGE_PUBLIC_KEY and LITESTREAM_AGE_SECRET_KEY for encrypting Litestream replication.
packages/nocodb/Dockerfile Modified package installation to include dasel before dumb-init and nodejs.
packages/nocodb/docker/start-litestream.sh Updated Litestream S3 credentials, added logic for age encryption, improved DB restoration steps, and ensured NocoDB starts after Litestream setup.

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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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
Contributor

@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

Out of diff range and nitpick comments (1)
packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1)

Line range hint 25-25: Correct the unpaired symbol in the list of special characters for NC_ADMIN_PASSWORD.

- Allowed special characters include `$&+,:;=?@#\|'.^*()%!_-"`.
+ Allowed special characters include `$&+,:;=?@#\\|'.^*()%!_-"`.
Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between d0657a5 and ad3967b.
Files selected for processing (3)
  • packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1 hunks)
  • packages/nocodb/Dockerfile (1 hunks)
  • packages/nocodb/docker/start-litestream.sh (1 hunks)
Files skipped from review due to trivial changes (1)
  • packages/nocodb/Dockerfile
Additional Context Used
LanguageTool (1)
packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1)

Near line 25: Unpaired symbol: ‘'’ seems to be missing
Context: ...ter. Allowed special characters include $&+,:;=?@#\|'.^*()%!_-". | | | PORT | Network port...

Additional comments not posted (5)
packages/nocodb/docker/start-litestream.sh (4)

16-17: Ensure that the updated environment variable names are reflected in all relevant parts of the system.


25-34: The implementation for enabling age encryption in the Litestream configuration is correct. However, ensure that the dasel command is properly tested in the deployment environment as it relies on external tooling.


36-36: The steps for handling the local database (removal of leftovers, restoration, creation of an empty file, and starting replication) are well-implemented. Ensure that these operations are atomic and handle potential race conditions, especially in a cloud environment.

Also applies to: 43-43, 46-46, 51-51


55-55: Starting NocoDB after Litestream setup is a logical step. Ensure that error handling is robust, especially for startup failures.

packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1)

81-82: The documentation for the new Litestream age encryption environment variables is clear and informative. Ensure that the links to external documentation are kept up-to-date to avoid confusion.

@dstala dstala requested a review from mertmit May 20, 2024 07:28
Copy link
Contributor

@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

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between ad3967b and 2480c08.
Files selected for processing (2)
  • packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1 hunks)
  • packages/nocodb/docker/start-litestream.sh (2 hunks)
Files skipped from review as they are similar to previous changes (1)
  • packages/nocodb/docker/start-litestream.sh
Additional Context Used
LanguageTool (1)
packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1)

Near line 25: Unpaired symbol: ‘'’ seems to be missing
Context: ...ter. Allowed special characters include $&+,:;=?@#\|'.^*()%!_-". | | | PORT | Network port...

Additional comments not posted (1)
packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md (1)

81-82: Excellent addition of environment variables for Litestream age encryption.

The documentation clearly explains the purpose and usage of LITESTREAM_AGE_PUBLIC_KEY and LITESTREAM_AGE_SECRET_KEY. This will help users in configuring age encryption effectively.

@mertmit mertmit merged commit 0ea94d6 into nocodb:develop May 22, 2024
23 checks passed
@salim-b salim-b deleted the litestream-age branch May 22, 2024 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Closed
Development

Successfully merging this pull request may close these issues.

None yet

3 participants