Skip to content

(MODULES-10675) enable facts-blacklist parameter in database.ini #305

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.

Sign up for GitHub

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
austb merged 2 commits into from
Jun 1, 2020
Merged

(MODULES-10675) enable facts-blacklist parameter in database.ini #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
896bb2e
enable facts-blacklist parameter in database.ini
maxadamo May 20, 2020
e109e62
add further test
maxadamo May 21, 2020
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
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
$node_ttl = $puppetdb::params::node_ttl,
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
$report_ttl = $puppetdb::params::report_ttl,
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
$gc_interval = $puppetdb::params::gc_interval,
$log_slow_statements = $puppetdb::params::log_slow_statements,
$conn_max_age = $puppetdb::params::conn_max_age,
Expand Down Expand Up @@ -111,6 +112,7 @@
node_ttl => $node_ttl,
node_purge_ttl => $node_purge_ttl,
report_ttl => $report_ttl,
facts_blacklist => $facts_blacklist,
gc_interval => $gc_interval,
log_slow_statements => $log_slow_statements,
conn_max_age => $conn_max_age,
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
$node_purge_ttl = '14d'
$report_ttl = '14d'

$facts_blacklist = undef

$gc_interval = '60'

$log_slow_statements = '10'
Expand Down
2 changes: 2 additions & 0 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
$node_ttl = $puppetdb::params::node_ttl,
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
$report_ttl = $puppetdb::params::report_ttl,
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
$gc_interval = $puppetdb::params::gc_interval,
$log_slow_statements = $puppetdb::params::log_slow_statements,
$conn_max_age = $puppetdb::params::conn_max_age,
Expand Down Expand Up @@ -168,6 +169,7 @@
node_ttl => $node_ttl,
node_purge_ttl => $node_purge_ttl,
report_ttl => $report_ttl,
facts_blacklist => $facts_blacklist,
gc_interval => $gc_interval,
log_slow_statements => $log_slow_statements,
conn_max_age => $conn_max_age,
Expand Down
15 changes: 15 additions & 0 deletions manifests/server/database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
$node_ttl = $puppetdb::params::node_ttl,
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
$report_ttl = $puppetdb::params::report_ttl,
$facts_blacklist = $puppetdb::params::facts_blacklist,
$gc_interval = $puppetdb::params::gc_interval,
$log_slow_statements = $puppetdb::params::log_slow_statements,
$conn_max_age = $puppetdb::params::conn_max_age,
Expand Down Expand Up @@ -170,4 +171,18 @@
}
}
}

if ($facts_blacklist) and length($facts_blacklist) != 0 {
$joined_facts_blacklist = join($facts_blacklist, ', ')
ini_setting { 'puppetdb_facts_blacklist':
setting => 'facts-blacklist',
value => $joined_facts_blacklist,
}
} else {
ini_setting { 'puppetdb_facts_blacklist':
ensure => absent,
setting => 'facts-blacklist',
}
}

}
31 changes: 31 additions & 0 deletions spec/unit/classes/server/database_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,37 @@
)
}
it { is_expected.not_to contain_ini_setting('puppetdb_database_max_pool_size') }
it {
is_expected.to contain_ini_setting('puppetdb_facts_blacklist')
.with(
'ensure' => 'absent',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'facts-blacklist',
)
}
end

describe 'when using facts_blacklist' do
let(:params) do
{
'facts_blacklist' => [
'one_fact',
'another_fact',
],
}
end

it {
is_expected.to contain_ini_setting('puppetdb_facts_blacklist')
.with(
'ensure' => 'present',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'facts-blacklist',
'value' => 'one_fact, another_fact',
)
}
end

describe 'when using a legacy PuppetDB version' do
Expand Down
⚡