Add deprecated parameters

Author: m0dular

Diff for: .fixtures.yml

@@ -9,3 +9,6 @@ fixtures:
     ruby_task_helper: 'https://[email protected]/puppetlabs/puppetlabs-ruby_task_helper'
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib' 
     facts: 'https://github.com/puppetlabs/puppetlabs-facts'
+    puppet_enterprise:
+      repo: [email protected]:puppetlabs/puppetlabs-puppet_enterprise.git
+

Diff for: manifests/init.pp

@@ -4,26 +4,29 @@
 #   Manage the inclusion of the pg_repack class
 # @param disable_maintenance [Boolean] true or false (Default: false)
 #   Disable or enable maintenance mode
-# @param manage_postgresql_settings [Boolean] true or false (Default: true)
-#   Manage PostgreSQL settings
-# @param manage_table_settings [Boolean] true or false (Default: false)
-#   Manage table settings
 # @param install_dir [String] Directory to install module into (Default: "/opt/puppetlabs/pe_databases")
 # @param scripts_dir [String] Directory to install scripts into (Default: "${install_dir}/scripts")
 # @param facts_tables_repack_timer [String] The Systemd timer for the pg_repack job affecting the 'facts' tables
 # @param catalogs_tables_repack_timer [String]The Systemd timer for the pg_repack job affecting the 'catalog' tables
 # @param other_tables_repack_timer [String] The Systemd timer for the pg_repack job affecting the 'other' tables
-# @param reports_tables_repack_timer [String] The Systemd timer for the pg_repack job affecting the 'reports' tables
-# @param resource_events_tables_repack_timer [String] The Systemd timer for the pg_repack job affecting the 'resource_events' tables
 class pe_databases (
   Boolean $manage_database_maintenance           = true,
   Boolean $disable_maintenance                   = false,
+  Optional[Boolean] $manage_postgresql_settings  = undef,
+  Optional[Boolean] $manage_table_settings       = undef,
   String[1] $install_dir                         = '/opt/puppetlabs/pe_databases',
   String[1] $scripts_dir                         = "${install_dir}/scripts",
   String[1] $facts_tables_repack_timer           = 'Tue,Sat *-*-* 04:30:00',
   String[1] $catalogs_tables_repack_timer        = 'Sun,Thu *-*-* 04:30:00',
   String[1] $other_tables_repack_timer           = '*-*-20 05:30:00',
+  Optional[String] $reports_tables_repack_timer         = undef,
+  Optional[String] $resource_events_tables_repack_timer = undef,
 ) {
+  puppet_enterprise::deprecated_parameter{'pe_databases::manage_postgresql_settings': }
+  puppet_enterprise::deprecated_parameter{'pe_databases::manage_table_settings': }
+  puppet_enterprise::deprecated_parameter{'pe_databases::reports_tables_repack_timer': }
+  puppet_enterprise::deprecated_parameter{'pe_databases::resource_events_tables_repack_timer': }
+
   file { [$install_dir, $scripts_dir]:
     ensure => directory,
     mode   => '0755',

Diff for: manifests/pg_repack.pp

@@ -10,12 +10,17 @@
 # @param catalogs_tables_repack_timer [String]The Systemd timer for the pg_repack job affecting the 'catalog' tables
 # @param other_tables_repack_timer [String] The Systemd timer for the pg_repack job affecting the 'other' tables
 class pe_databases::pg_repack (
-  Boolean $disable_maintenance                   = false,
-  Integer $jobs                                  = $facts['processors']['count'] / 4,
-  String[1] $facts_tables_repack_timer           = $pe_databases::facts_tables_repack_timer,
-  String[1] $catalogs_tables_repack_timer        = $pe_databases::catalogs_tables_repack_timer,
-  String[1] $other_tables_repack_timer           = $pe_databases::other_tables_repack_timer,
+  Boolean $disable_maintenance                          = false,
+  Integer $jobs                                         = $facts['processors']['count'] / 4,
+  String[1] $facts_tables_repack_timer                  = $pe_databases::facts_tables_repack_timer,
+  String[1] $catalogs_tables_repack_timer               = $pe_databases::catalogs_tables_repack_timer,
+  String[1] $other_tables_repack_timer                  = $pe_databases::other_tables_repack_timer,
+  Optional[String] $reports_tables_repack_timer         = undef,
+  Optional[String] $resource_events_tables_repack_timer = undef,
 ) {
+  puppet_enterprise::deprecated_parameter{'pe_databases::pg_repack::reports_tables_repack_timer': }
+  puppet_enterprise::deprecated_parameter{'pe_databases::pg_repack::resource_events_tables_repack_timer': }
+
   $postgresql_version = $facts['pe_postgresql_info']['installed_server_version']
   $repack_executable = "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
 

Diff for: spec/classes/init_spec.rb

@@ -27,6 +27,15 @@
         path: ['/bin', '/usr/bin'],
         refreshonly: true,
       )
+
+      [
+        'pe_databases::manage_postgresql_settings',
+        'pe_databases::manage_table_settings',
+        'pe_databases::reports_tables_repack_timer',
+        'pe_databases::resource_events_tables_repack_timer',
+      ].each do |deprecated_param|
+        is_expected.to contain_puppet_enterprise__deprecated_parameter(deprecated_param)
+      end
     }
   end
 

Diff for: spec/classes/pg_repack_spec.rb

@@ -48,6 +48,13 @@
         is_expected.to contain_file("/etc/systemd/system/pe_databases-#{name}.service").with_content(
           %r{ExecStart=#{repack_cmd} #{val[:tables]}},
         )
+
+        [
+          'pe_databases::pg_repack::reports_tables_repack_timer',
+          'pe_databases::pg_repack::resource_events_tables_repack_timer',
+        ].each do |deprecated_param|
+          is_expected.to contain_puppet_enterprise__deprecated_parameter(deprecated_param)
+        end
       end
 
       ['pg_repack facts tables', 'pg_repack catalogs tables', 'pg_repack other tables',