(PE-40377) go back to what worked

Author: davidmalloncares

.github/workflows/test-migration.yaml

@@ -110,22 +110,15 @@ jobs:
             echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
             bundle exec rake spec_prep
           echo ::endgroup::
-          primary_host=$(yq '.groups[].targets[] | select(.vars.role == "primary") | .name' spec/fixtures/litmus_inventory.yaml) \
-          new_primary_host=$(yq '.groups[].targets[] | select(.vars.role == "new-primary") | .name' spec/fixtures/litmus_inventory.yaml) \
-          new_replica_host=$(yq '.groups[].targets[] | select(.vars.role == "new-replica") | .name // ""' spec/fixtures/litmus_inventory.yaml)
-          new_primary_postgresql_host=$(yq '.groups[].targets[] | select(.vars.role == "new-primary-pdb-postgresql") | .name // ""' spec/fixtures/litmus_inventory.yaml)
-          new_replica_postgresql_host=$(yq '.groups[].targets[] | select(.vars.role == "new-replica-pdb-postgresql") | .name // ""' spec/fixtures/litmus_inventory.yaml)
-          bolt_command = "bundle exec bolt plan run peadm_spec::test_migration \
+          bundle exec bolt plan run peadm_spec::test_migration \
             --inventoryfile spec/fixtures/litmus_inventory.yaml \
             --modulepath spec/fixtures/modules \
-            primary_host=$primary_host \
-            new_primary_host=new_primary_host \
-            upgrade_version=${{ matrix.new_pe_version }} "
-          [ -n "$new_replica_host" ] && [ "$new_replica_host" != "" ] && bolt_command="$bolt_command new_replica_host=$new_replica_host"
-          [ -n "$new_primary_postgresql_host" ] && [ "$new_primary_postgresql_host" != "" ] && bolt_command="$bolt_command new_primary_postgresql_host=$new_primary_postgresql_host"
-          [ -n "$new_replica_postgresql_host" ] && [ "$new_replica_postgresql_host" != "" ] && bolt_command="$bolt_command new_replica_postgresql_host=$new_replica_postgresql_host"
-          bolt_command="$bolt_command --no-host-key-check"
-          eval $bolt_command
+            primary_host=$(yq -r '.groups[].targets[] | select(.vars.role == "primary") | .name // ""' spec/fixtures/litmus_inventory.yaml) \          
+            new_primary_host=$(yq -r '.groups[].targets[] | select(.vars.role == "new-primary") | .name // ""' spec/fixtures/litmus_inventory.yaml) \
+            new_replica_host=$(yq -r '.groups[].targets[] | select(.vars.role == "new-replica") | .name // ""' spec/fixtures/litmus_inventory.yaml) \
+            new_primary_postgresql_host=$(yq -r '.groups[].targets[] | select(.vars.role == "new-primary-pdb-postgresql") | .name // ""' spec/fixtures/litmus_inventory.yaml) \
+            new_replica_postgresql_host=$(yq -r '.groups[].targets[] | select(.vars.role == "new-replica-pdb-postgresql") | .name // ""' spec/fixtures/litmus_inventory.yaml) \
+          --no-host-key-check
       - name: Install PE on test cluster
         timeout-minutes: 120
         run: |

spec/acceptance/peadm_spec/plans/test_migration.pp

@@ -1,20 +1,35 @@
 plan peadm_spec::test_migration(
-  Peadm::SingleTargetSpec $primary_host,
-  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,
+  String $primary_host,
+  String $new_primary_host,
+  Optional[String] $new_replica_host = undef,
+  Optional[String] $new_primary_postgresql_host = undef,
+  Optional[String] $new_replica_postgresql_host = undef,
   Optional[Peadm::SingleTargetSpec] $upgrade_version = undef,
 ) {
   out::message("primary_host:${primary_host}.")
   out::message("new_primary_host:${new_primary_host}.")
   out::message("new_replica_host:${new_replica_host}.")
   out::message("new_primary_postgresql_host:${new_primary_postgresql_host}.")
   out::message("new_replica_postgresql_host:${new_replica_postgresql_host}.")
+  out::message("upgrade_version:${upgrade_version}.")
+
+  # Convert String values to Peadm::SingleTargetSpec if they are not blank
+  $primary_target = $primary_host ? { '' => undef, default => peadm::get_targets($primary_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 the targets
+  out::message("primary_target:${primary_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_host}")
-  $primary_status = run_plan('peadm::status', $primary_host, { 'format' => 'json' })
+  out::message("Running peadm::status on primary host ${primary_target}")
+  $primary_status = run_plan('peadm::status', $primary_target, { 'format' => 'json' })
   out::message($primary_status)
 
   if empty($primary_status['failed']) {
@@ -25,13 +40,13 @@
 
   # perform the migration
   run_plan('peadm::migrate',
-    old_primary_host => $primary_host,
-    new_primary_host => $new_primary_host,
+    old_primary_host => $primary_target,
+    new_primary_host => $new_primary_target,
   )
 
   # run infra status on the new primary
-  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("Running peadm::status on new primary host ${new_primary_target}")
+  $new_primary_status = run_plan('peadm::status', $new_primary_target, { 'format' => 'json' })
   out::message($new_primary_status)
 
   if empty($new_primary_status['failed']) {
@@ -40,33 +55,33 @@
     fail_plan('Migrated cluster is not healthy, aborting')
   }
 
-  # 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()
+  # 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()
   out::message("peadm_config: ${result}")
-  # 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")
+  # if new_replica_target is supplied then check that is in the expected place in the config
+  if $new_replica_target {
+    if $peadm_config['params']['replica_host'] == $new_replica_target {
+      out::message("New replica host ${new_replica_target} set up correctly")
     } else {
-      fail_plan("New replica host ${new_replica_host} was not set up correctly")
+      fail_plan("New replica host ${new_replica_target} was not set up correctly")
     }
   }
 
-  # 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")
+  # if new_primary_postgresql_target is supplied then check that is in the expected place in the config
+  if $new_primary_postgresql_target {
+    if $peadm_config['params']['primary_postgresql_host'] == $new_primary_postgresql_target {
+      out::message("New primary postgres host ${new_primary_postgresql_target} set up correctly")
     } else {
-      fail_plan("New primary postgres host ${new_primary_postgresql_host} was not set up correctly")
+      fail_plan("New primary postgres host ${new_primary_postgresql_target} was not set up correctly")
     }
   }
 
-  # 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")
+  # if new_replica_postgresql_target is supplied then check that is in the expected place in the config
+  if $new_replica_postgresql_target {
+    if $peadm_config['params']['replica_postgresql_host'] == $new_replica_postgresql_target {
+      out::message("New primary postgres host ${new_replica_postgresql_target} set up correctly")
     } else {
-      fail_plan("New primary postgres host ${new_replica_postgresql_host} was not set up correctly")
+      fail_plan("New primary postgres host ${new_replica_postgresql_target} was not set up correctly")
     }
   }