Merge #305 into master

Author: austb

manifests/init.pp

@@ -38,6 +38,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,
@@ -114,6 +115,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,

manifests/params.pp

@@ -42,6 +42,8 @@
   $node_purge_ttl         = '14d'
   $report_ttl             = '14d'
 
+  $facts_blacklist        = undef
+
   $gc_interval            = '60'
 
   $log_slow_statements    = '10'

manifests/server.pp

@@ -32,6 +32,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,
@@ -171,6 +172,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,

manifests/server/database.pp

@@ -13,6 +13,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,
@@ -171,4 +172,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',
+    }
+  }
+
 }

spec/unit/classes/server/database_ini_spec.rb

@@ -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