Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update custom provider to return valid package resource info #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions lib/puppet/provider/package/te_agent_bin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,41 @@
has_feature :versionable
has_feature :install_options

confine :osfamily => [ :RedHat ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This provider is used for all non-Windows operating systems.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed confines

confine :exists => "/etc/init.d/twdaemon"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't this prevent the provider from working if the agent isn't already installed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed confines


def self.prefetch(packages)
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this changing?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

standardize name before version

end
end

def self.instances
paths = []
versions = []
File.open('/etc/init.d/twdaemon').each_line do |r|
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will error out if the agent isn't installed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed with latest commit : sudodevnull@355c65b

next if r.match(/^#/)
pathn = r.sub(/bin.*/, 'data/version')
npath = pathn.rstrip!
paths.push(npath)
end
paths.each do |path|
vfile = File.open("#{path}")
vfile.each_line do |v|
versionr = /\d.\d.\d/.match(v).to_s
versions.push(versionr)
end
end
versions.each.collect do |version|
new(:name => 'te_agent', :ensure => version, :provider => :te_agent_bin)
end
end


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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this changing?

Copy link
Author

@sudodevnull sudodevnull Sep 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the confines and unnecessary spacing

end

def install
Expand Down Expand Up @@ -82,7 +107,6 @@ def install_options

def join_options(options)
return unless options

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this changing?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove unnecessary spacing

options.collect do |val|
case val
when Hash
Expand Down