Yum resource fix for non-existent repos and repo info #1593
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
shoekstra
reviewed
Mar 24, 2017
lib/resources/yum.rb
Outdated
| @@ -33,7 +32,7 @@ | |||
| module Inspec::Resources | |||
| class Yum < Inspec.resource(1) | |||
| name 'yum' | |||
| desc 'Use the yum InSpec audit resource to test packages in the Yum repository.' | |||
| desc 'Use the yum InSpec audit resource to the configuration of Yum repositories.' | |||
There was a problem hiding this comment.
This is missing the word "test" and should be:
desc 'Use the yum InSpec audit resource to test the configuration of Yum repositories.'
Sorry for being pedantic :)
There was a problem hiding this comment.
Pedants welcome. I'm the club president.
adamleff
force-pushed
the
adamleff/yum-fix
branch
from
a5ade36
to
3b7332f
Compare
chris-rock
reviewed
Mar 25, 2017
lib/resources/yum.rb
Outdated
| info['status'] == 'enabled' | ||
| end | ||
|
|
||
| def method_missing(name) |
There was a problem hiding this comment.
We try to avoid method_missing whenever possible. Do we know all possible properties? Maybe we use something like:
%w{
baseurl
}.each do |m|
define_method m.to_sym do |*args|
info[m.to_s]
end
end
| @@ -22,6 +20,7 @@ | |||
| # describe yum.repo('epel') do | |||
| # it { should exist } | |||
| # it { should be_enabled } | |||
| # its('baseurl') { should include 'mycompany.biz' } | |||
There was a problem hiding this comment.
should this be baseurl or ruby style base_url?
There was a problem hiding this comment.
The key in the yum output and in the *.repo files is baseurl so I vote for keeping it consistent.
| def to_s | ||
| "YumRepo #{shortname(info['id'])}" | ||
| "YumRepo #{@reponame}" |
If a repo did not exist, running matchers against it (such as `exist`) were failing due to a bug in `#to_s` when fetching the repo name. The `info` method would return nil and we'd still try to treat it as a hash. This change ensures that info is always a hash, possibly empty if the repo doesn't exist, and uses the repo name provided by the user rather than shortening it to be consistent with our other resources which don't manipulate the user input in the formatter. Also added a method_missing to allow users to interrogate repo options, such as baseurl or gpgcheck. Signed-off-by: Adam Leff <adam@leff.co>
Instead of method_missing, methods for each output item from `yum repolist` are provided. Signed-off-by: Adam Leff <adam@leff.co>
arlimus
force-pushed
the
adamleff/yum-fix
branch
from
b120a57
to
7df9674
Compare
arlimus
approved these changes
Mar 29, 2017
| end | ||
|
|
||
| def enabled? | ||
| repo = info | ||
| return false if repo.nil? | ||
| return false unless exist? |
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.
If a repo did not exist, running matchers against it (such as
exist)were failing due to a bug in
#to_swhen fetching the repo name. Theinfomethod would return nil and we'd still try to treat it as a hash.This change ensures that info is always a hash, possibly empty if the
repo doesn't exist, and uses the repo name provided by the user rather
than shortening it to be consistent with our other resources which don't
manipulate the user input in the formatter.
Also added a method_missing to allow users to interrogate repo options,
such as baseurl or gpgcheck.
Fixes #1553