Merge pull request #112 from m0dular/SUP-3672-spec_tests

(SUP-3672) Remove legacy code and add spec tests

Author: MartyEwings

Diff for: .fixtures.yml

@@ -9,3 +9,4 @@ 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'
+

Diff for: functions/version_based_databases.pp

@@ -4,34 +4,28 @@
 #   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,
-  Boolean $manage_postgresql_settings            = true,
-  Boolean $manage_table_settings                 = 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',
-  String[1] $reports_tables_repack_timer         = '*-*-10 05:30:00',
-  String[1] $resource_events_tables_repack_timer = '*-*-15 05:30:00',
+  Optional[String] $reports_tables_repack_timer         = undef,
+  Optional[String] $resource_events_tables_repack_timer = undef,
 ) {
-  $psql_version = $facts['pe_postgresql_info']['installed_server_version'] ? {
-    undef   => undef,
-    default => String($facts['pe_postgresql_info']['installed_server_version'])
-  }
+  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,
@@ -45,23 +39,9 @@
   }
 
   if $facts.dig('pe_databases', 'have_systemd') {
-    if versioncmp('2019.0.2', $facts['pe_server_version']) <= 0 {
-      if $manage_database_maintenance {
-        class { 'pe_databases::pg_repack':
-          disable_maintenance => $disable_maintenance,
-        }
-        if $manage_table_settings {
-          # This is to provide for situations, like PE XL,
-          # where the pe-puppetdb database does not exist on the PostgreSQL system being tuned.
-          # In PE XL, the Primary and Replica run PostgreSQL for all databases *except* for pe-puppetdb.
-          include pe_databases::postgresql_settings::table_settings
-        }
-      }
-    }
-    else {
-      notify { 'pe_databases_version_warn':
-        message  => 'This module only supports PE 2019.0.2 and later',
-        loglevel => warning,
+    if $manage_database_maintenance {
+      class { 'pe_databases::pg_repack':
+        disable_maintenance => $disable_maintenance,
       }
     }
   }

Diff for: manifests/init.pp

@@ -9,71 +9,45 @@
 # @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::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,
-  String[1] $reports_tables_repack_timer         = $pe_databases::reports_tables_repack_timer,
-  String[1] $resource_events_tables_repack_timer = $pe_databases::resource_events_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,
 ) {
-  # PE 2019.1 starting shipping versioned pe-postgres packages where all paths are versioned.
-  # So, prior to 2019.1 use a non-versioned path, and after use a versioned path.
-  # TODO: Use $pe_databases::psql_version after identifying why it is cast to ${psql_version}00000 in spec tests.
+  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 = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
-    1       => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
-    default => "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
-  }
+  $repack_executable = "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
 
-  $repack          = "${repack_executable} -d pe-puppetdb"
-  $repack_jobs     = "--jobs ${jobs}"
+  $repack_cmd = "${repack_executable} -d pe-puppetdb --jobs ${jobs}"
 
-  $facts_tables    = '-t factsets -t fact_paths'
-  $catalogs_tables = versioncmp($facts['pe_server_version'], '2019.8.1') ? {
-    1       => '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames',
-  default => '-t catalogs -t catalog_resources -t edges -t certnames' }
-  $other_tables    = '-t producers -t resource_params -t resource_params_cache'
-  $reports_table   = '-t reports'
-  $resource_events_table = '-t resource_events'
+  $fact_tables = '-t factsets -t fact_paths'
+  $catalog_tables = '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames'
+  $other_tables = '-t producers -t resource_params -t resource_params_cache'
 
   pe_databases::collect { 'facts':
     disable_maintenance => $disable_maintenance,
-    command             => "${repack} ${repack_jobs} ${facts_tables}",
+    command             => "${repack_cmd} ${fact_tables}",
     on_cal              => $facts_tables_repack_timer,
   }
 
   pe_databases::collect { 'catalogs':
     disable_maintenance => $disable_maintenance,
-    command             => "${repack} ${repack_jobs} ${catalogs_tables}",
+    command             => "${repack_cmd} ${catalog_tables}",
     on_cal              => $catalogs_tables_repack_timer,
   }
 
   pe_databases::collect { 'other':
     disable_maintenance => $disable_maintenance,
-    command             => "${repack} ${repack_jobs} ${other_tables}",
+    command             => "${repack_cmd} ${other_tables}",
     on_cal              => $other_tables_repack_timer,
   }
 
-  if versioncmp($facts['pe_server_version'], '2019.7.0') < 0 {
-    pe_databases::collect { 'reports':
-      disable_maintenance => $disable_maintenance,
-      command             => "${repack} ${repack_jobs} ${reports_table}",
-      on_cal              => $reports_tables_repack_timer,
-    }
-  }
-
-  if versioncmp($facts['pe_server_version'], '2019.3.0') < 0 {
-    pe_databases::collect { 'resource_events':
-      disable_maintenance => $disable_maintenance,
-      command             => "${repack} ${repack_jobs} ${resource_events_table}",
-      on_cal              => $resource_events_tables_repack_timer,
-    }
-  }
-
   # Ensure legacy vaccum and pg_repack crons are purged.
   # If someone upgrades from an ancient v0.x version of the pe_databases module to 2.0 or newer, 
   # the old cron jobs running vaccuum full will not be cleaned up. This can result in a deadlock