Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Support more file name and output what is decrypted #129

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support more file name and output what is decrypted #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions secrets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,11 +438,11 @@ EOF
if [[ $yml =~ ^=.*$ ]]; then
yml="${yml/=/}"
fi
if [[ $yml =~ ^(.*/)?secrets(\.[^.]+)*\.yaml$ ]]
if [[ $yml =~ ^(.*/)?secrets([_.-][^.]+)*\.yaml$ ]]
Copy link
Contributor

@kaarolch kaarolch Jul 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

The only problem with this change is that it allowed us to have something like secrets_-.yaml. IMHO it should be ^(.*/)?secrets([_.-][^_.-]+)*\.yaml$

Copy link
Author

Choose a reason for hiding this comment

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

I think as long as it's a valid file name and it does not cause problem downstream, you should leave it up to the user to decide. You should not be deciding on naming "style", all you need is a reasonable way of identifying secrets files. I vote to leave the fix as-is.

then
decrypt_helper $yml ymldec decrypted
cmdopts+=("$ymldec")
[[ $decrypted -eq 1 ]] && decfiles+=("$ymldec")
[[ $decrypted -eq 1 ]] && decfiles+=("$ymldec") && echo "DECRYPTED $yml temporarily"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add flag to enable disable this print?

Copy link
Author

Choose a reason for hiding this comment

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

Sure. I imagine this is for backward compat, basically by default you don't want the output? I can add a flag --verbose-decrypt or --secrets-verbose or similar. I don't think it is a good idea to use the verbosity setting of helm command itself, because that would turn on way more output than typically desired. Let me know what you think.

else
cmdopts+=("$yml")
fi
Expand Down