Add configuration to allow skipping missing template files/keys #48
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
aharpervc
requested review from
sixfeetover,
bvogelzang,
ronnietaylor,
camerenisonfire,
henrythach and
a team
aharpervc
force-pushed
the
mkdir-for-rendered-files
branch
from
46f92e7
to
3d2beb5
Compare
aharpervc
force-pushed
the
skip-missing-template
branch
from
3bfe562
to
2ad7acb
Compare
| end | ||
|
|
||
| def consul_contents(location) | ||
| [@config[location]].compact.flatten.map do |key| | ||
| Diplomat::Kv.get(key, options: {}, not_found: :return, found: :return).force_encoding 'utf-8' |
There was a problem hiding this comment.
I assume you had to remove the not_found and found args here in order to implement the rescue logic?
There was a problem hiding this comment.
Addressed in this commit message: 28220a8
| Diplomat::Kv.get(key, {}, :reject, :return).force_encoding 'utf-8' | ||
| rescue Diplomat::KeyNotFound | ||
| if @config[:skip_missing_template] | ||
| STDERR.puts "Consult: Skipping missing template: #{name}" |
There was a problem hiding this comment.
Suggested change
| STDERR.puts "Consult: Skipping missing template: #{name}" | |
| STDERR.puts "Consult: Skipping missing key: #{name}" |
?
There was a problem hiding this comment.
Hm, currently the thing being skipped is the template. Maybe it'd be better to include the file path or consul key causing the skip, so you know what's missing?
ronnietaylor
approved these changes
Sep 28, 2023
aharpervc
force-pushed
the
mkdir-for-rendered-files
branch
from
3d2beb5
to
c9a299b
Compare
- this method doesn't have keyword arguments, so the parameters were being interpreted as the options hash
- since `contents` is called multiple times and does work, it's now memoized
aharpervc
force-pushed
the
skip-missing-template
branch
from
2ad7acb
to
798b070
Compare
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 PR introduces
skip_missing_template: trueoptional config for templates, which allows configured templates to not exist. This builds in the feature that you'd overwise have to work around with ERB logic in the consult config file itself. Eg, it replaces this: