Skip to content

Commit 962c7b3

Browse files
committed
PE-38801 Fixed formatting of rules in warning message
1 parent e83c741 commit 962c7b3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

plans/convert.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,9 @@
261261
# the existing groups are correct enough to function until the upgrade is
262262
# performed.
263263
if (versioncmp($pe_version, '2019.7.0') >= 0) {
264-
out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:')
265-
run_task('peadm::get_group_rules', $primary_target)
264+
$rules = run_task('peadm::get_group_rules', $primary_target).first.value['_output']
265+
$rules_formatted = stdlib::to_json_pretty(parsejson($rules))
266+
out::message("WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:\n ${rules_formatted}")
266267
267268
apply($primary_target) {
268269
class { 'peadm::setup::node_manager_yaml':

plans/upgrade.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,9 @@
326326
default => $primary_postgresql_target.peadm::certname(),
327327
}
328328

329-
out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:')
330-
run_task('peadm::get_group_rules', $primary_target)
329+
$rules = run_task('peadm::get_group_rules', $primary_target).first.value['_output']
330+
$rules_formatted = stdlib::to_json_pretty(parsejson($rules))
331+
out::message("WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:\n ${rules_formatted}")
331332
332333
apply($primary_target) {
333334
class { 'peadm::setup::node_manager_yaml':

0 commit comments

Comments
 (0)