(PE-40163) deal with empty csr attributes

Author: davidmalloncares

plans/replace_failed_postgresql.pp

@@ -29,7 +29,7 @@
 
   # Bail if this is trying to be ran against Standard
   if $compilers.empty {
-    fail_plan('Plan peadm::add_database is only applicable for L and XL deployments')
+    fail_plan('Plan peadm::replace_failed_postgresql is only applicable for L and XL deployments')
   }
 
   $pe_hosts = peadm::flatten_compact([
@@ -47,7 +47,6 @@
   )
 
   # Restart pe-puppetdb.service on Puppet server primary and replica
-  # run_task('service', $pe_hosts, 'action' => 'restart', 'name' => 'pe-puppetdb.service')
   run_task('service', $pe_hosts, { action => 'restart', name => 'pe-puppetdb.service' })
 
   # Purge failed PE-PostgreSQL node from PuppetDB

plans/util/insert_csr_extension_requests.pp

@@ -15,9 +15,10 @@
     # If we're merging extension requests, existing requests will be preserved.
     # If we're not merging, only ours will be used; existing requests will be
     # overwritten.
-    $csr_file_data = $merge ? {
-      true  => $csr_attributes_data.deep_merge({ 'extension_requests' => $extension_requests }),
-      false => ($csr_attributes_data + { 'extension_requests' => $extension_requests }),
+    if $merge and !$csr_attributes_data.empty {
+      $csr_file_data = $csr_attributes_data.deep_merge({ 'extension_requests' => $extension_requests })
+    } else {
+      $csr_file_data = $csr_attributes_data + { 'extension_requests' => $extension_requests }
     }
 
     run_task('peadm::mkdir_p_file', $target,