(PE-40377) clean up params and use latest ubuntu

Author: davidmalloncares

.github/workflows/test-migration.yaml

@@ -26,8 +26,8 @@ on:
   workflow_dispatch: {}
 jobs:
   test-migration:
-    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
-    runs-on: ubuntu-20.04
+    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }} PE upgrade? ${{ matrix.new_pe_version }}
+    runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
       BOLT_DISABLE_ANALYTICS: true

spec/acceptance/peadm_spec/plans/test_migration.pp

@@ -1,13 +1,13 @@
 plan peadm_spec::test_migration(
-  String $primary_host,
-  String $replica_host,
-  String $primary_postgresql_host,
-  String $replica_postgresql_host,
-  String $new_primary_host,
-  String $new_replica_host,
-  String $new_primary_postgresql_host,
-  String $new_replica_postgresql_host,
-  String $new_pe_version,
+  Peadm::SingleTargetSpec $primary_host,
+  Optional[Peadm::SingleTargetSpec] $replica_host = undef,
+  Optional[Peadm::SingleTargetSpec] $primary_postgresql_host = undef,
+  Optional[Peadm::SingleTargetSpec] $replica_postgresql_host = undef,
+  Peadm::SingleTargetSpec $new_primary_host,
+  Optional[Peadm::SingleTargetSpec] $new_replica_host = undef,
+  Optional[Peadm::SingleTargetSpec] $new_primary_postgresql_host = undef,
+  Optional[Peadm::SingleTargetSpec] $new_replica_postgresql_host = undef,
+  Optional[Peadm::SingleTargetSpec] $new_pe_version = undef,
 ) {
   out::message("primary_host:${primary_host}.")
   out::message("replica_host:${replica_host}.")
@@ -18,29 +18,9 @@
   out::message("new_primary_postgresql_host:${new_primary_postgresql_host}.")
   out::message("new_replica_postgresql_host:${new_replica_postgresql_host}.")
 
-  # Convert String values to Peadm::SingleTargetSpec if they are not blank
-  $primary_target = $primary_host ? { '' => undef, default => peadm::get_targets($primary_host, 1) }
-  $replica_target = $replica_host ? { '' => undef, default => peadm::get_targets($replica_host, 1) }
-  $primary_postgresql_target = $primary_postgresql_host ? { '' => undef, default => peadm::get_targets($primary_postgresql_host, 1) }
-  $replica_postgresql_target = $replica_postgresql_host ? { '' => undef, default => peadm::get_targets($replica_postgresql_host, 1) }
-  $new_primary_target = $new_primary_host ? { '' => undef, default => peadm::get_targets($new_primary_host, 1) }
-  $new_replica_target = $new_replica_host ? { '' => undef, default => peadm::get_targets($new_replica_host, 1) }
-  $new_primary_postgresql_target = $new_primary_postgresql_host ? { '' => undef, default => peadm::get_targets($new_primary_postgresql_host, 1) }
-  $new_replica_postgresql_target = $new_replica_postgresql_host ? { '' => undef, default => peadm::get_targets($new_replica_postgresql_host, 1) }
-
-  # output converted values
-  out::message("primary_target:${primary_target}.")
-  out::message("replica_target:${replica_target}.")
-  out::message("primary_postgresql_target:${primary_postgresql_target}.")
-  out::message("replica_postgresql_target:${replica_postgresql_target}.")
-  out::message("new_primary_target:${new_primary_target}.")
-  out::message("new_replica_target:${new_replica_target}.")
-  out::message("new_primary_postgresql_target:${new_primary_postgresql_target}.")
-  out::message("new_replica_postgresql_target:${new_replica_postgresql_target}.")
-
   # run infra status on the primary
-  out::message("Running peadm::status on primary host ${primary_target}")
-  $primary_status = run_plan('peadm::status', $primary_target, { 'format' => 'json' })
+  out::message("Running peadm::status on primary host ${primary_host}")
+  $primary_status = run_plan('peadm::status', $primary_host, { 'format' => 'json' })
   out::message($primary_status)
 
   if empty($primary_status['failed']) {
@@ -51,13 +31,13 @@
 
   # # perform the migration
   # run_plan('peadm::migrate',
-  #   old_primary_host => $primary_target,
+  #   old_primary_host => $primary_host,
   #   new_primary_host => $new_primary_host,
   # )
 
   # run infra status on the new primary
-  out::message("Running peadm::status on new primary host ${new_primary_target}")
-  $new_primary_status = run_plan('peadm::status', $new_primary_target, { 'format' => 'json' })
+  out::message("Running peadm::status on new primary host ${new_primary_host}")
+  $new_primary_status = run_plan('peadm::status', $new_primary_host, { 'format' => 'json' })
   out::message($new_primary_status)
 
   if empty($new_primary_status['failed']) {
@@ -66,29 +46,29 @@
     fail_plan('Migrated cluster is not healthy, aborting')
   }
 
-  # get the config from new_primary_target and verify config looks as expected
-  $result = run_task('peadm::get_peadm_config', $new_primary_target, '_catch_errors' => true).first.to_data()
+  # get the config from new_primary_host and verify config looks as expected
+  $result = run_task('peadm::get_peadm_config', $new_primary_host, '_catch_errors' => true).first.to_data()
   out::message("peadm_config: ${result}")
-  # if new_replica_host is not empty then check that is in the expected place in the config
-  if $new_replica_host != '' {
+  # if new_replica_host is supplied then check that is in the expected place in the config
+  if $new_replica_host {
     if $peadm_config['params']['replica_host'] == $new_replica_host {
       out::message("New replica host ${new_replica_host} set up correctly")
     } else {
       fail_plan("New replica host ${new_replica_host} was not set up correctly")
     }
   }
 
-  # if new_primary_postgresql_host is not empty then check that is in the expected place in the config
-  if $new_primary_postgresql_host != '' {
+  # if new_primary_postgresql_host is supplied then check that is in the expected place in the config
+  if $new_primary_postgresql_host {
     if $peadm_config['params']['primary_postgresql_host'] == $new_primary_postgresql_host {
       out::message("New primary postgres host ${new_primary_postgresql_host} set up correctly")
     } else {
       fail_plan("New primary postgres host ${new_primary_postgresql_host} was not set up correctly")
     }
   }
 
-  # if new_replica_postgresql_host is not empty then check that is in the expected place in the config
-  if $new_replica_postgresql_host != '' {
+  # if new_replica_postgresql_host is supplied then check that is in the expected place in the config
+  if $new_replica_postgresql_host {
     if $peadm_config['params']['replica_postgresql_host'] == $new_replica_postgresql_host {
       out::message("New primary postgres host ${new_replica_postgresql_host} set up correctly")
     } else {
@@ -97,7 +77,7 @@
   }
 
   # if a new PE version was specified then check it has been upgraded
-  if ($new_pe_version != '') {
+  if $new_pe_version {
     if $peadm_config['params']['pe_version'] == $new_pe_version {
       out::message("Upgraded to new PE version ${new_pe_version} correctly")
     } else {