Skip to content

Make ::contrib a noop on OSes without a contrib package #1309

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 0 additions & 4 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@
$java_package_name = pick($java_package_name, 'postgresql-jdbc')
# Archlinux doesn't have develop packages
$devel_package_name = pick($devel_package_name, 'postgresql-devel')
# Archlinux does have postgresql-contrib but it isn't maintained
$contrib_package_name = pick($contrib_package_name,'undef')
# Archlinux postgresql package provides plperl
$plperl_package_name = pick($plperl_package_name, 'undef')
$plpython_package_name = pick($plpython_package_name, 'undef')
Expand All @@ -163,7 +161,6 @@

$client_package_name = pick($client_package_name, "postgresql-client-${version}")
$server_package_name = pick($server_package_name, "postgresql-${version}")
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
if $postgis_version and versioncmp($postgis_version, '2') < 0 {
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis")
} elsif $postgis_version and versioncmp($postgis_version, '3') >= 0 {
Expand Down Expand Up @@ -203,7 +200,6 @@

$client_package_name = pick($client_package_name, 'UNSET')
$server_package_name = pick($server_package_name, 'postgresql')
$contrib_package_name = pick_default($contrib_package_name, undef)
$devel_package_name = pick_default($devel_package_name, undef)
$java_package_name = pick($java_package_name, 'jdbc-postgresql')
$perl_package_name = pick($perl_package_name, 'DBD-Pg')
Expand Down
28 changes: 13 additions & 15 deletions manifests/server/contrib.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@
# @param package_ensure
# Ensure the contrib package is installed.
class postgresql::server::contrib (
String $package_name = $postgresql::params::contrib_package_name,
String[1] $package_ensure = 'present'
Optional[String[1]] $package_name = $postgresql::params::contrib_package_name,
String[1] $package_ensure = 'present'
) inherits postgresql::params {
if $facts['os']['family'] == 'Gentoo' {
fail('osfamily Gentoo does not have a separate "contrib" package, postgresql::server::contrib is not supported.')
}
if $package_name {
package { 'postgresql-contrib':
ensure => $package_ensure,
name => $package_name,
tag => 'puppetlabs-postgresql',
}

package { 'postgresql-contrib':
ensure => $package_ensure,
name => $package_name,
tag => 'puppetlabs-postgresql',
anchor { 'postgresql::server::contrib::start': }
-> Class['postgresql::server::install']
-> Package['postgresql-contrib']
-> Class['postgresql::server::service']
anchor { 'postgresql::server::contrib::end': }
}

anchor { 'postgresql::server::contrib::start': }
-> Class['postgresql::server::install']
-> Package['postgresql-contrib']
-> Class['postgresql::server::service']
anchor { 'postgresql::server::contrib::end': }
}
33 changes: 26 additions & 7 deletions spec/unit/classes/server/contrib_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
let :facts do
{
os: {
family: 'Debian',
name: 'Debian',
release: { 'full' => '8.0', 'major' => '8' },
family: 'RedHat',
name: 'RedHat',
release: { 'major' => '8' },
selinux: {
enabled: false,
},
},
kernel: 'Linux',
id: 'root',
Expand Down Expand Up @@ -51,10 +54,26 @@
}
end

it 'fails to compile' do
expect {
is_expected.to compile
}.to raise_error(%r{is not supported})
it 'postgresql-contrib should not be installed' do
is_expected.to compile
is_expected.not_to contain_package('postgresql-contrib')
end
end

describe 'on Debian' do
let :facts do
{
os: {
family: 'Debian',
name: 'Debian',
release: { 'full' => '8.0', 'major' => '8' },
},
}
end

it 'postgresql-contrib should not be installed' do
is_expected.to compile
is_expected.not_to contain_package('postgresql-contrib')
end
end
end