Add support for templating environment variables. #20
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
SamSaffron
reviewed
Apr 12, 2021
lib/pups/config.rb
Outdated
| @config["env_template"]&.each do |k,v| | ||
| ENV.each do |key, val| | ||
| if val =~ /\{\{#{k}\}\}/ | ||
| transformed_env_vars[key] = val.gsub("{{#{k}}}", v) |
There was a problem hiding this comment.
v.to_s ... cause it could be a number.
SamSaffron
reviewed
Apr 12, 2021
lib/pups/config.rb
Outdated
| transformed_env_vars = {} | ||
| @config["env_template"]&.each do |k,v| | ||
| ENV.each do |key, val| | ||
| if val =~ /\{\{#{k}\}\}/ |
There was a problem hiding this comment.
val.include?("{{#{k}}}") ... no need for a regex here.
SamSaffron
reviewed
Apr 12, 2021
lib/pups/config.rb
Outdated
| transformed_env_vars[key] = val.gsub("{{#{k}}}", v) | ||
| end | ||
| end | ||
| ENV.replace(ENV.to_hash.merge(transformed_env_vars)) |
There was a problem hiding this comment.
full replace may be a bit too much I would just fix ENV as we go ?
|
@SamSaffron I've pushed up a change to fix based on your comments |
fitzy101
changed the title
This reverts commit 05db637.
Templated variables can be used to parameterise container creation. This will ensure any ENV variables are templated during config initialisation prior to any use.
There are situations where we want to provide and config template at runtime rather than ahead-of-time. This adds support for specifying such a variable via the process environment, prefixed with env_template_<name>=value.
fitzy101
force-pushed
the
revert-revert-app-env-support
branch
from
3b7f09f
to
91d27ed
Compare
SamSaffron
reviewed
May 20, 2021
test/config_test.rb
Outdated
| @@ -10,16 +10,74 @@ def test_config_from_env | |||
| assert_equal("world", config.params["$ENV_HELLO"]) | |||
| end | |||
|
|
|||
| def test_env_param | |||
| ENV["FOO"] = "BAR" | |||
| config = <<YAML | |||
There was a problem hiding this comment.
minor... use <<~ then you don't need the odd indenting.
|
Change looks great, just clean up the indenting and we are good to go. |
SamSaffron
approved these changes
May 20, 2021
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.
This adds support for enabling environment variable templating into pups. The PR is for initial thoughts, let me know what you think.