json resource (et. al.): allow inspec check to succeed when using command #2317
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
chris-rock
approved these changes
Nov 27, 2017
lib/resources/csv.rb
Outdated
| "Csv #{@path}" | ||
| # used by JsonConfig to build up a full to_s method | ||
| # based on whether a file path, content, or command was supplied. | ||
| def resource_base_name |
There was a problem hiding this comment.
should this be a private function then?
There was a problem hiding this comment.
I've historically had issues with to_s using private methods. Perhaps it's fixed in later Ruby versions. I'll change it and we can see what happens.
There was a problem hiding this comment.
to_s needs to be public, i am just talking about the resource_base_name
…mand When using the `json` resource (or any of the resources that subclass JsonConfig), `inspec check` would fail if the content was supplied with the `command` option. This is because the `command` resource is mocked and an empty string would be returned for `stdout`. That content would be blindly passed to the `parse` method would which raise an exception and cause `inspec check` to fail. This change refactors JsonConfig to be a bit cleaner and use some helper methods. Additionally, we use the new Exceptions to properly raise errors which are naturally caught by Inspec::Profile, etc. Signed-off-by: Adam Leff <adam@leff.co>
Signed-off-by: Adam Leff <adam@leff.co>
adamleff
force-pushed
the
adamleff/json-command-when-empty
branch
from
d6ac380
to
a145f25
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.
When using the
jsonresource (or any of the resources that subclass JsonConfig),inspec checkwould fail if the content was supplied with thecommandoption. This is because thecommandresource is mocked and an empty string would be returned forstdout. That content would be blindly passed to theparsemethod would which raise an exception and causeinspec checkto fail.This change refactors JsonConfig to be a bit cleaner and use some helper methods. Additionally, we use the new Exceptions to properly raise errors which are naturally caught by Inspec::Profile, etc.