diff --git a/internal/command/jsonformat/plan.go b/internal/command/jsonformat/plan.go index 8b6f16ecd8..418c654ed2 100644 --- a/internal/command/jsonformat/plan.go +++ b/internal/command/jsonformat/plan.go @@ -570,7 +570,7 @@ func actionDescription(action plans.Action) string { case plans.Delete: return " [red]-[reset] destroy" case plans.Update: - return " [yellow]~[reset] update in-place" + return " [yellow]~[reset] update in-place (current -> planned)" case plans.CreateThenDelete: return "[green]+[reset]/[red]-[reset] create replacement and then destroy" case plans.DeleteThenCreate: diff --git a/internal/command/jsonformat/plan_test.go b/internal/command/jsonformat/plan_test.go index 0deda9504a..163677a66d 100644 --- a/internal/command/jsonformat/plan_test.go +++ b/internal/command/jsonformat/plan_test.go @@ -259,7 +259,7 @@ Plan: 1 to import, 0 to add, 0 to change, 0 to destroy. output: ` OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: @@ -303,7 +303,7 @@ Plan: 1 to import, 0 to add, 1 to change, 0 to destroy. output: ` OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: @@ -344,7 +344,7 @@ Plan: 1 to import, 0 to add, 1 to change, 0 to destroy. output: ` OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/internal/command/test_test.go b/internal/command/test_test.go index 1b2e849cac..393b20960a 100644 --- a/internal/command/test_test.go +++ b/internal/command/test_test.go @@ -1041,7 +1041,7 @@ Plan: 1 to add, 0 to change, 0 to destroy. OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: @@ -1056,7 +1056,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/plan b/testing/equivalence-tests/outputs/basic_json_string_update/plan index 8f289afd2b..449a9b8262 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_json_string_update/plan @@ -2,7 +2,7 @@ tfcoremock_simple_resource.json: Refreshing state... [id=5a3fd9b3-e852-8956-8c0a OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_list_empty/plan b/testing/equivalence-tests/outputs/basic_list_empty/plan index 080fe1a7f2..515628c237 100644 --- a/testing/equivalence-tests/outputs/basic_list_empty/plan +++ b/testing/equivalence-tests/outputs/basic_list_empty/plan @@ -2,7 +2,7 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA336 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_list_null/plan b/testing/equivalence-tests/outputs/basic_list_null/plan index 244ff19d9b..552db954b5 100644 --- a/testing/equivalence-tests/outputs/basic_list_null/plan +++ b/testing/equivalence-tests/outputs/basic_list_null/plan @@ -2,7 +2,7 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA336 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_list_update/plan b/testing/equivalence-tests/outputs/basic_list_update/plan index 34d548aded..443954d6bf 100644 --- a/testing/equivalence-tests/outputs/basic_list_update/plan +++ b/testing/equivalence-tests/outputs/basic_list_update/plan @@ -2,7 +2,7 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA336 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_map_empty/plan b/testing/equivalence-tests/outputs/basic_map_empty/plan index cebb5c3403..ec94bf1ec3 100644 --- a/testing/equivalence-tests/outputs/basic_map_empty/plan +++ b/testing/equivalence-tests/outputs/basic_map_empty/plan @@ -2,7 +2,7 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_map_null/plan b/testing/equivalence-tests/outputs/basic_map_null/plan index 08649e2465..d090a3bb5e 100644 --- a/testing/equivalence-tests/outputs/basic_map_null/plan +++ b/testing/equivalence-tests/outputs/basic_map_null/plan @@ -2,7 +2,7 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_map_update/plan b/testing/equivalence-tests/outputs/basic_map_update/plan index 9e4d9e6e61..908829c5a0 100644 --- a/testing/equivalence-tests/outputs/basic_map_update/plan +++ b/testing/equivalence-tests/outputs/basic_map_update/plan @@ -2,7 +2,7 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan index 8decf5d159..abb70b0b67 100644 --- a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan @@ -2,7 +2,7 @@ tfcoremock_simple_resource.multiline: Refreshing state... [id=69fe5233-e77a-804f OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_set_empty/plan b/testing/equivalence-tests/outputs/basic_set_empty/plan index 4ae5f91d01..32213fe055 100644 --- a/testing/equivalence-tests/outputs/basic_set_empty/plan +++ b/testing/equivalence-tests/outputs/basic_set_empty/plan @@ -2,7 +2,7 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_set_null/plan b/testing/equivalence-tests/outputs/basic_set_null/plan index 0ef8afb481..9cd77960ce 100644 --- a/testing/equivalence-tests/outputs/basic_set_null/plan +++ b/testing/equivalence-tests/outputs/basic_set_null/plan @@ -2,7 +2,7 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/basic_set_update/plan b/testing/equivalence-tests/outputs/basic_set_update/plan index 95afd5ae49..82180046e2 100644 --- a/testing/equivalence-tests/outputs/basic_set_update/plan +++ b/testing/equivalence-tests/outputs/basic_set_update/plan @@ -2,7 +2,7 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan index aaccdefa04..3d7bb750fc 100644 --- a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan +++ b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan @@ -22,7 +22,7 @@ actions to undo or respond to these changes. OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/drift_simple/plan b/testing/equivalence-tests/outputs/drift_simple/plan index 82b8b6e548..4edc476713 100644 --- a/testing/equivalence-tests/outputs/drift_simple/plan +++ b/testing/equivalence-tests/outputs/drift_simple/plan @@ -2,7 +2,7 @@ tfcoremock_simple_resource.drift: Refreshing state... [id=f3c6ddc5-37d5-0170-64f OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan index 6ab9f5be8b..edf481964c 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan +++ b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan @@ -2,7 +2,7 @@ tfcoremock_complex_resource.complex: Refreshing state... [id=64564E36-BFCB-458B- OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/moved_with_drift/plan b/testing/equivalence-tests/outputs/moved_with_drift/plan index cdc7167d4c..d6425cb0ce 100644 --- a/testing/equivalence-tests/outputs/moved_with_drift/plan +++ b/testing/equivalence-tests/outputs/moved_with_drift/plan @@ -22,7 +22,7 @@ actions to undo or respond to these changes. OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/moved_with_update/plan b/testing/equivalence-tests/outputs/moved_with_update/plan index c41b6b7bed..b77e95391a 100644 --- a/testing/equivalence-tests/outputs/moved_with_update/plan +++ b/testing/equivalence-tests/outputs/moved_with_update/plan @@ -2,7 +2,7 @@ tfcoremock_simple_resource.moved: Refreshing state... [id=7da63aeb-f908-a112-988 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/multiple_block_types_update/plan b/testing/equivalence-tests/outputs/multiple_block_types_update/plan index ea674cd950..1eed168ffc 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types_update/plan +++ b/testing/equivalence-tests/outputs/multiple_block_types_update/plan @@ -2,7 +2,7 @@ tfcoremock_multiple_blocks.multiple_blocks: Refreshing state... [id=DA051126-BAD OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/nested_list_update/plan b/testing/equivalence-tests/outputs/nested_list_update/plan index fcf27d533c..f532a3f094 100644 --- a/testing/equivalence-tests/outputs/nested_list_update/plan +++ b/testing/equivalence-tests/outputs/nested_list_update/plan @@ -2,7 +2,7 @@ tfcoremock_nested_list.nested_list: Refreshing state... [id=DA051126-BAD6-4EB2-9 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/nested_map_update/plan b/testing/equivalence-tests/outputs/nested_map_update/plan index 826db8ccbc..16b0f1292c 100644 --- a/testing/equivalence-tests/outputs/nested_map_update/plan +++ b/testing/equivalence-tests/outputs/nested_map_update/plan @@ -2,7 +2,7 @@ tfcoremock_nested_map.nested_map: Refreshing state... [id=502B0348-B796-4F6A-869 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/nested_objects_update/plan b/testing/equivalence-tests/outputs/nested_objects_update/plan index 9d401caa2c..379909919e 100644 --- a/testing/equivalence-tests/outputs/nested_objects_update/plan +++ b/testing/equivalence-tests/outputs/nested_objects_update/plan @@ -2,7 +2,7 @@ tfcoremock_nested_object.nested_object: Refreshing state... [id=B2491EF0-9361-40 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/nested_set_update/plan b/testing/equivalence-tests/outputs/nested_set_update/plan index 7b08846f28..e54e9a6e4c 100644 --- a/testing/equivalence-tests/outputs/nested_set_update/plan +++ b/testing/equivalence-tests/outputs/nested_set_update/plan @@ -2,7 +2,7 @@ tfcoremock_nested_set.nested_set: Refreshing state... [id=510598F6-83FE-4090-898 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/simple_object_empty/plan b/testing/equivalence-tests/outputs/simple_object_empty/plan index e54f1f55f2..3c2cb56d53 100644 --- a/testing/equivalence-tests/outputs/simple_object_empty/plan +++ b/testing/equivalence-tests/outputs/simple_object_empty/plan @@ -2,7 +2,7 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/simple_object_null/plan b/testing/equivalence-tests/outputs/simple_object_null/plan index 6f18cf7451..7232a4e7ba 100644 --- a/testing/equivalence-tests/outputs/simple_object_null/plan +++ b/testing/equivalence-tests/outputs/simple_object_null/plan @@ -2,7 +2,7 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: diff --git a/testing/equivalence-tests/outputs/simple_object_update/plan b/testing/equivalence-tests/outputs/simple_object_update/plan index a0918d2b3e..ebb04c18df 100644 --- a/testing/equivalence-tests/outputs/simple_object_update/plan +++ b/testing/equivalence-tests/outputs/simple_object_update/plan @@ -2,7 +2,7 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555 OpenTofu used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place + ~ update in-place (current -> planned) OpenTofu will perform the following actions: