CLI: Allow setting secrets path via env var #2426
Merged
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
Adds a new enviroment variable `ENTE_CLI_SECRETS_PATH`, that allows specifying the path to a `secrets.txt` like the one used in the dockerized version. If no path is provided, the old behaviour is maintained.
|
|
ua741
reviewed
Jul 12, 2024
Comment on lines
+33
to
+35
| if secretsFile := os.Getenv("ENTE_CLI_SECRETS_PATH"); secretsFile != "" { | ||
| return GetSecretFromSecretText(secretsFile) | ||
| } |
There was a problem hiding this comment.
Thanks for the change.
Should we put this change inside the else block.
is isRunningContainser() {
} else {
if secretsFile := os.Getenv("ENTE_CLI_SECRETS_PATH"); secretsFile != "" {
return GetSecretFromSecretText(secretsFile)
}
log.Fatal(fmt.Errorf("error getting password from keyring: %w", err))
}
There was a problem hiding this comment.
But then it only works if it is running inside a container. I want to use this env var outside of a container aswell.
ua741
approved these changes
Jul 24, 2024
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
Adds a new enviroment variable
ENTE_CLI_SECRETS_PATH, that allows specifying the path to asecrets.txtlike the one used in the dockerized version. If no path is provided, the old behaviour is maintained.The configuration variable and behaviour is analog to the already present
ENTE_CONFIG_PATHvariable, which allows specifying a configuration.This provides a solution for people running without gnome-keyring (#722 and #1328)