Skip to content

Update dotEnv.ts #1339

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

Closed
wants to merge 1 commit into from
Closed

Update dotEnv.ts #1339

wants to merge 1 commit into from

Conversation

Mikey-tom
Copy link

@Mikey-tom Mikey-tom commented Sep 20, 2024

Closes #

✅ Checklist

  • I have followed every step in the contributing guide
  • The PR title follows the convention.
  • I ran and tested the code works

Testing

[Describe the steps you took to test this change]


Changelog

[Short description of what has changed]


Screenshots

[Screenshots]

💯

Summary by CodeRabbit

  • New Features

    • Enhanced loading of environment variables from .env files, improving reliability by checking for existing files.
  • Bug Fixes

    • Improved handling of sensitive environment variables to ensure they are not exposed.

Copy link

changeset-bot bot commented Sep 20, 2024

⚠️ No Changeset found

Latest commit: d45426d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Sep 20, 2024

Walkthrough

The changes primarily focus on enhancing the loading mechanism for environment variables from .env files in the dotEnv.ts file. The updated implementation checks if the envFilePath is an array, verifies the existence of the files, and conditionally merges the parsed variables into the result object. Additionally, sensitive environment variables are explicitly removed from the loading process to improve security.

Changes

File Change Summary
packages/cli-v3/src/utilities/dotEnv.ts Updated resolveDotEnvVars and loadDotEnvVars functions to check for existing .env files and conditionally merge variables, while removing sensitive variables like TRIGGER_API_URL, TRIGGER_SECRET_KEY, and OTEL_EXPORTER_OTLP_ENDPOINT.

Possibly related PRs

Suggested reviewers

  • ericallam

Poem

In the garden of code, we hop and play,
Loading secrets safely, come what may.
With checks in our pockets, we dance with glee,
No more hidden worries, just code that's free!
🌼🐇✨


Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 04645e8 and d45426d.

Files selected for processing (1)
  • packages/cli-v3/src/utilities/dotEnv.ts (2 hunks)
Additional context used
Biome
packages/cli-v3/src/utilities/dotEnv.ts

[error] 23-23: The assignment should not be in an expression.

The use of assignments in expressions is confusing.
Expressions are often considered as side-effect free.

(lint/suspicious/noAssignInExpressions)

Additional comments not posted (2)
packages/cli-v3/src/utilities/dotEnv.ts (2)

14-22: LGTM!

The changes to the resolveDotEnvVars function improve the logic for loading environment variables from .env files:

  • Handling the case where envFilePath is an array and finding the first existing file.
  • Conditionally merging the parsed environment variables into the result object only if they exist.

The removal of sensitive environment variables is also a good security practice.


38-40: LGTM!

The changes to the loadDotEnvVars function improve the logic for loading environment variables from .env files by handling the case where envFilePath is an array and finding the first existing file.


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 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.

@ericallam
Copy link
Member

Can you explain the reasoning behind this PR? Because dotenv already searches through the file array, there's no point in checking for their existence, is there?

@ericallam ericallam closed this Sep 21, 2024
@Mikey-tom Mikey-tom deleted the patch-1 branch September 21, 2024 18:53
@Mikey-tom Mikey-tom restored the patch-1 branch September 21, 2024 18:53
@Mikey-tom
Copy link
Author

Can you explain the reasoning behind this PR? Because dotenv already searches through the file array, there's no point in checking for their existence, is there?

Yes, you're correct in thinking that the dotenv library already searches for environment files, so additional checks for their existence may not be necessary. Here's a more detailed explanation:

Reasoning Behind the PR:

  1. Dotenv's Built-In Behavior: The dotenv package typically searches for environment files (like .env, .env.local, etc.) based on the array of file paths provided or its default configuration. If a file in that list doesn't exist, dotenv will skip it without throwing an error, as it's designed to handle missing files gracefully.

  2. Redundant Existence Check: If you're manually checking for the existence of files before passing them to dotenv, this would be redundant. Since dotenv itself already handles missing files internally, there's no need to perform a separate existence check. Removing these checks can simplify the code and avoid unnecessary I/O operations.

  3. Performance and Code Clarity: By eliminating redundant existence checks, you:

    • Improve performance slightly by reducing I/O operations (even though the impact is likely minimal).
    • Enhance code readability and maintainability by reducing clutter and allowing dotenv to do its job without interference.

Thus, if your PR removes these unnecessary checks, it makes the code cleaner and leverages the full capabilities of the dotenv library.

@Mikey-tom Mikey-tom deleted the patch-1 branch September 21, 2024 19:04
@Mikey-tom Mikey-tom restored the patch-1 branch January 31, 2025 10:51
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