From ac4d38f45ab6300f803fb6c6fbbd284f12ef81e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Mon, 1 Jun 2020 12:27:12 +1000 Subject: [PATCH 1/4] Add a conditional replace explanation Apart from well defined changes, resources may be also conditionally replaced. This should be annotated in the proposed changes. Also change the colour to red for potential replacements. --- lib/stack_master/change_set.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/stack_master/change_set.rb b/lib/stack_master/change_set.rb index b8605d27..6dce3b1e 100644 --- a/lib/stack_master/change_set.rb +++ b/lib/stack_master/change_set.rb @@ -68,8 +68,11 @@ def id private def display_resource_change(io, resource_change) - action_name = if resource_change.replacement == 'True' + action_name = case resource_change.replacement + when 'True' 'Replace' + when 'Conditional' + 'Maybe replace' else resource_change.action end @@ -86,6 +89,8 @@ def display_resource_change_detail(io, action_name, color, detail) detail_messages = [target_name] if action_name == 'Replace' detail_messages << "#{detail.target.requires_recreation} requires recreation" + elif action_name == 'Maybe replace' + detail_messages << "#{detail.target.requires_recreation} may require recreation" end triggered_by = [detail.change_source, detail.causing_entity].compact.join('.') if detail.evaluation != 'Static' @@ -101,7 +106,7 @@ def action_color(action_name) :green when 'Modify' :yellow - when 'Remove', 'Replace' + when 'Remove', 'Replace', 'Maybe replace' :red end end From 0cd421bb0889de1c1ef2edd201346b4c712b4fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Mon, 1 Jun 2020 13:07:50 +1000 Subject: [PATCH 2/4] Keyword typo --- lib/stack_master/change_set.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stack_master/change_set.rb b/lib/stack_master/change_set.rb index 6dce3b1e..05adb10b 100644 --- a/lib/stack_master/change_set.rb +++ b/lib/stack_master/change_set.rb @@ -89,7 +89,7 @@ def display_resource_change_detail(io, action_name, color, detail) detail_messages = [target_name] if action_name == 'Replace' detail_messages << "#{detail.target.requires_recreation} requires recreation" - elif action_name == 'Maybe replace' + elsif action_name == 'Maybe replace' detail_messages << "#{detail.target.requires_recreation} may require recreation" end triggered_by = [detail.change_source, detail.causing_entity].compact.join('.') From 6b59e0eb7ba8170ece40730872cac891bd245a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Mon, 1 Jun 2020 13:09:21 +1000 Subject: [PATCH 3/4] Rename Maybe to Conditional --- lib/stack_master/change_set.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/stack_master/change_set.rb b/lib/stack_master/change_set.rb index 05adb10b..afdd8eff 100644 --- a/lib/stack_master/change_set.rb +++ b/lib/stack_master/change_set.rb @@ -72,7 +72,7 @@ def display_resource_change(io, resource_change) when 'True' 'Replace' when 'Conditional' - 'Maybe replace' + 'Conditional replace' else resource_change.action end @@ -89,7 +89,7 @@ def display_resource_change_detail(io, action_name, color, detail) detail_messages = [target_name] if action_name == 'Replace' detail_messages << "#{detail.target.requires_recreation} requires recreation" - elsif action_name == 'Maybe replace' + elsif action_name == 'Conditional replace' detail_messages << "#{detail.target.requires_recreation} may require recreation" end triggered_by = [detail.change_source, detail.causing_entity].compact.join('.') From 33c8dc118b3726091d3c1ef446cf10c142ae43a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 16 Jun 2020 12:42:26 +1000 Subject: [PATCH 4/4] Fix colours --- lib/stack_master/change_set.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stack_master/change_set.rb b/lib/stack_master/change_set.rb index afdd8eff..b2c8dafd 100644 --- a/lib/stack_master/change_set.rb +++ b/lib/stack_master/change_set.rb @@ -106,7 +106,7 @@ def action_color(action_name) :green when 'Modify' :yellow - when 'Remove', 'Replace', 'Maybe replace' + when 'Remove', 'Replace', 'Conditional replace' :red end end