(PDK-1615) Add validator for environment.conf #866
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
scotje
reviewed
Mar 3, 2020
| env_conf = PDK::ControlRepo.environment_conf_as_config(target) | ||
|
|
||
| env_conf.resolve.each do |setting_name, setting_value| | ||
| setting_name = setting_name.slice(12..-1) |
There was a problem hiding this comment.
I'm guessing this is slicing off an environment. prefix? Adding a comment about that or even using gsub (performance implications should be pretty minor) would help clarify this for future us.
| end | ||
|
|
||
| context 'when a target is provided that has all allowed settings and is valid' do | ||
| let(:target) { { name: 'environment.conf', content: "modulepath=foo\nmanifest=foo\nconfig_version=foo\nenvironment_timeout=0" } } |
There was a problem hiding this comment.
Maybe move content to it's own var/let block and use a heredoc to make it easier to maintain?
There was a problem hiding this comment.
I managed to use a heredoc inside the hash which looks ok e.g.
let(:target) do
{
name: 'environment.conf',
content: <<-EOT
modulepath=foo
manifest=foo
config_version=foo
environment_timeout=0
EOT
}
end
spec/unit/pdk/validate/puppet/puppet_environment_conf_validator_spec.rb
Outdated
Show resolved
Hide resolved
I think this should be in a control repo validator group |
glennsarti
force-pushed
the
pdk-1615-add-environment-validator
branch
from
44ca412
to
1aa7d21
Compare
This commit adds a validator for the environment.conf file when being used inside a control repository. The validator complies with the rules set out in https://puppet.com/docs/puppet/latest/config_file_environment.html. This commit also adds tests for the validator setup, and various example file content and expected validation results.
glennsarti
force-pushed
the
pdk-1615-add-environment-validator
branch
from
1aa7d21
to
7ffa17f
Compare
|
Moved it to it's own validator group e.g.
and |
This commit cleans up the autoloading statements to be an alphabetical order.
rodjek
approved these changes
Mar 4, 2020
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 commit adds a validator for the environment.conf file when being used
inside a control repository. The validator complies with the rules set out in
https://puppet.com/docs/puppet/latest/config_file_environment.html.
This commit also adds tests for the validator setup, and various example file
content and expected validation results.
TODO
puppetvalidator group OR should it be in a separate validator group e.g.controlrepo?