Fixes #14158 - Use tailoring file for scan #18
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
ares
reviewed
Nov 22, 2016
| def run(policy_id) | ||
| @policy_id = policy_id | ||
| ensure_policy_exist | ||
| load_config |
There was a problem hiding this comment.
getting following, because ensure_policy_exist on line above requires config to be present already
/usr/local/share/gems/gems/foreman_scap_client-0.3.0/lib/foreman_scap_client/client.rb:131:in `ensure_policy_exist': undefined method `[]' for nil:NilClass (NoMethodError)
from /usr/local/share/gems/gems/foreman_scap_client-0.3.0/lib/foreman_scap_client/client.rb:16:in `run'
from /usr/local/share/gems/gems/foreman_scap_client-0.3.0/bin/foreman_scap_client:10:in `<top (required)>'
from /usr/bin/foreman_scap_client:23:in `load'
from /usr/bin/foreman_scap_client:23:in `<main>'
|
This change should bump the version to 0.3.0, we should remember to bump it after the change. |
xprazak2
force-pushed
the
tailoring
branch
2 times, most recently
from
7e2412e
to
68e5d04
Compare
|
Updated, should be ok now. |
ares
reviewed
Nov 30, 2016
| @config ||= YAML.load_file(CONFIG_FILE) | ||
| @tailored = !@config[policy_id][:tailoring_path].empty? |
There was a problem hiding this comment.
I think we should also handle the case that this option is not there yet (so can be nil) to be compatible with older version of puppet-foreman_scap_client/foreman_openscap or in case the puppet module haven't reconfigured the client yet.
|
I moved the check for existing policy into the method that loads the config. |
|
Works fine now. |
ares
approved these changes
Dec 23, 2016
|
Merging ... |
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.
No description provided.