output parameters used in plans upgrade, install and migrate to aid in debugging. hosts, pe version,

B00885424 · B00885424 · commit bbda40d3129f · 2025-05-06T10:53:56.000+01:00
include logs as allowed in 'basic functionality' expect the out message PE-40508) Add infra-assistant to add_database plan (#580) Co-authored-by: Neil Anderson <neil.anderson@perforce.com> Co-authored-by: ragingra <2486474+ragingra@users.noreply.github.com> add XL with and without DR to test migration and migrate plans (#581)
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -32,7 +32,9 @@
 * [`peadm::generate_pe_conf`](#peadm--generate_pe_conf): Generate a pe.conf file in JSON format
 * [`peadm::get_pe_conf`](#peadm--get_pe_conf)
 * [`peadm::get_targets`](#peadm--get_targets): Accept undef or a SingleTargetSpec, and return an Array[Target, 1, 0]. This differs from get_target() in that:   - It returns an Array[Target
+* [`peadm::log_plan_parameters`](#peadm--log_plan_parameters)
 * [`peadm::migration_opts_default`](#peadm--migration_opts_default)
+* [`peadm::module_version`](#peadm--module_version)
 * [`peadm::node_manager_yaml_location`](#peadm--node_manager_yaml_location)
 * [`peadm::oid`](#peadm--oid)
 * [`peadm::pe_db_names`](#peadm--pe_db_names)
@@ -786,6 +788,24 @@ Data type: `Optional[Integer[1,1]]`
 
 
 
+### <a name="peadm--log_plan_parameters"></a>`peadm::log_plan_parameters`
+
+Type: Puppet Language
+
+The peadm::log_plan_parameters function.
+
+#### `peadm::log_plan_parameters(Hash $params)`
+
+The peadm::log_plan_parameters function.
+
+Returns: `Any`
+
+##### `params`
+
+Data type: `Hash`
+
+
+
 ### <a name="peadm--migration_opts_default"></a>`peadm::migration_opts_default`
 
 Type: Puppet Language
@@ -798,6 +818,18 @@ The peadm::migration_opts_default function.
 
 Returns: `Any`
 
+### <a name="peadm--module_version"></a>`peadm::module_version`
+
+Type: Ruby 4.x API
+
+The peadm::module_version function.
+
+#### `peadm::module_version()`
+
+The peadm::module_version function.
+
+Returns: `Any`
+
 ### <a name="peadm--node_manager_yaml_location"></a>`peadm::node_manager_yaml_location`
 
 Type: Ruby 4.x API
diff --git a/functions/log_plan_parameters.pp b/functions/log_plan_parameters.pp
@@ -1,4 +1,5 @@
 function peadm::log_plan_parameters(Hash $params) {
+  out::message("PEADM Module version: ${peadm::module_version()}")
   $params.each |$key, $value| {
     out::message("Parameter '${key}': [${value}]")
   }
diff --git a/lib/puppet/functions/peadm/module_version.rb b/lib/puppet/functions/peadm/module_version.rb
@@ -0,0 +1,9 @@
+Puppet::Functions.create_function(:'peadm::module_version', Puppet::Functions::InternalFunction) do
+  dispatch :module_version do
+    scope_param
+  end
+
+  def module_version(scope)
+    scope.compiler.environment.module('peadm').version
+  end
+end
diff --git a/plans/install.pp b/plans/install.pp
@@ -75,18 +75,36 @@
   Boolean                    $permit_unsafe_versions = false,
   String                     $token_lifetime         = '1y',
 ) {
+  # Log parameters for debugging 
+  peadm::log_plan_params({
+    'primary_host' => $primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'legacy_compilers' => $legacy_compilers,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'version' => $version,
+  })
+
   peadm::assert_supported_bolt_version()
 
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
 
-  # Log parameters for debugging
-  peadm::log_plan_parameters({
-    'targets' => $targets,
+  # Log parameters for debugging 
+  peadm::log_plan_params({
     'primary_host' => $primary_host,
-    'mode' => $mode,
-    'begin_at_step' => $begin_at_step,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'legacy_compilers' => $legacy_compilers,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'version' => $version,
   })
 
+  peadm::assert_supported_bolt_version()
+
+  peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
+
   $install_result = run_plan('peadm::subplans::install',
     # Standard
     primary_host                   => $primary_host,
diff --git a/plans/migrate.pp b/plans/migrate.pp
@@ -22,6 +22,17 @@
   Optional[Peadm::SingleTargetSpec] $primary_postgresql_host = undef,
   Optional[Peadm::SingleTargetSpec] $replica_postgresql_host = undef,
 ) {
+  # Log parameters for debugging 
+  peadm::log_plan_parameters({
+    'new_primary_host' => $new_primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'legacy_compilers' => $legacy_compilers,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'upgrade_version' => $upgrade_version,
+  })
+
   # pre-migration checks
   out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported')
   peadm::assert_supported_bolt_version()
diff --git a/plans/replace_failed_postgresql.pp b/plans/replace_failed_postgresql.pp
@@ -12,6 +12,19 @@
   Peadm::SingleTargetSpec   $failed_postgresql_host,
   Peadm::SingleTargetSpec   $replacement_postgresql_host,
 ) {
+  # Log parameters for debugging 
+  peadm::log_plan_parameters({
+    'primary_host' => $primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'legacy_compilers' => $legacy_compilers,
+    'working_postgresql_host' => $working_postgresql_host,
+    'failed_postgresql_host' => $failed_postgresql_host,
+    'replacement_postgresql_host' => $replacement_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'version' => $version,
+  })
+
   $all_hosts = peadm::flatten_compact([
       $primary_host,
       $replica_host,
diff --git a/plans/upgrade.pp b/plans/upgrade.pp
@@ -62,6 +62,16 @@
 
   Optional[Peadm::UpgradeSteps] $begin_at_step = undef,
 ) {
+  # Log parameters for debugging
+  peadm::log_plan_parameters({
+    'primary_host' => $primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'version' => $version,
+  })
+
   out::message('# Validating inputs')
 
   # Ensure input valid for a supported architecture
@@ -73,14 +83,6 @@
     $compiler_hosts,
   )
 
-  # Log parameters for debugging
-  peadm::log_plan_parameters({
-    'targets' => $targets,
-    'primary_host' => $primary_host,
-    'mode' => $mode,
-    'begin_at_step' => $begin_at_step,
-  })
-
   # Convert inputs into targets.
   $primary_target            = peadm::get_targets($primary_host, 1)
   $replica_target            = peadm::get_targets($replica_host, 1)
diff --git a/spec/plans/install_spec.rb b/spec/plans/install_spec.rb
@@ -5,6 +5,7 @@
 
   describe 'basic functionality' do
     it 'runs successfully with the minimum required parameters' do
+      allow_out_message
       expect_plan('peadm::subplans::install')
       expect_plan('peadm::subplans::configure')
       expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', 'version' => '2021.7.9')).to be_ok
diff --git a/spec/plans/subplans/install_spec.rb b/spec/plans/subplans/install_spec.rb
@@ -24,9 +24,9 @@
       },
     )
 
-    #########
+    ##########
     ## <🤮>
-    # rubocop:disable AnyInstance
+    rubocop:disable AnyInstance
     allow(Tempfile).to receive(:new).and_call_original
     allow(Pathname).to receive(:new).and_call_original
     allow(Puppet::FileSystem).to receive(:exist?).and_call_original

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`function peadm::log_plan_parameters(Hash $params) {`
	`2`	`+ out::message("PEADM Module version: ${peadm::module_version()}")`
`2`	`3`	`$params.each \|$key, $value\| {`
`3`	`4`	`out::message("Parameter '${key}': [${value}]")`
`4`	`5`	`}`