Update custom provider to return valid package resource info#7
Update custom provider to return valid package resource info#7sudodevnull wants to merge 2 commits intoTripwire:masterfrom
Conversation
Fix puppet package resource and return valid data from the te_agent_bin provider.
sudodevnull
changed the title
bespokebob
left a comment
bespokebob
left a comment
There was a problem hiding this comment.
You don't need to close your pull request and re-submit. You can just push additional commits to the same branch to resolve any issues.
| has_feature :versionable | ||
| has_feature :install_options | ||
|
|
||
| confine :osfamily => [ :RedHat ] |
There was a problem hiding this comment.
This provider is used for all non-Windows operating systems.
| has_feature :install_options | ||
|
|
||
| confine :osfamily => [ :RedHat ] | ||
| confine :exists => "/etc/init.d/twdaemon" |
There was a problem hiding this comment.
Won't this prevent the provider from working if the agent isn't already installed?
| def self.instances | ||
| paths = [] | ||
| versions = [] | ||
| File.open('/etc/init.d/twdaemon').each_line do |r| |
There was a problem hiding this comment.
This will error out if the agent isn't installed.
| packages.each do |name, pkg| | ||
| version = get_version(pkg) | ||
| pkg.provider = new({:ensure => version, :name => name, :provider => :te_agent_bin}) if version | ||
| pkg.provider = new({:name => name, :ensure => version, :provider => :te_agent_bin}) if version |
There was a problem hiding this comment.
standardize name before version
| def query | ||
| version = get_version | ||
| version ? {:ensure => version, :name => resource[:name], :provider => :te_agent_bin} : nil | ||
| version ? {:name => resource[:name], :ensure => version, :provider => :te_agent_bin} : nil |
There was a problem hiding this comment.
Remove the confines and unnecessary spacing
|
|
||
| def join_options(options) | ||
| return unless options | ||
|
|
|
One of your commit comments should also reference the issue that it's resolving. |
|
My commit references issue #8 at the end. |
|
What are the changes still being requested here? |
|
There are still open questions in the discussion of issue #8 |
2 participants
I updated the provider to return valid data and made a few other adjustments. The self.instances validates version and installation by starting in the /etc/init.d/twdaemon file where it grabs the working dir, modifies it to pinpoint the version file, and pull the version from the version file. It also returns the name of the package resource as it is defined in the module. This is to resolve Issue 8.