From 413419b267d84aa48ff87144ea954440741ba72b Mon Sep 17 00:00:00 2001 From: VenelinMartinov Date: Fri, 17 Jan 2025 19:27:56 +0200 Subject: [PATCH] Refactor Set and List Diff tests to use generic utilities (#2837) This PR refactors the Set and List Diff tests to use the generic diff utility functions and types introduced in https://github.com/pulumi/pulumi-terraform-bridge/pull/2829. This should make the tests more maintainable and more in-line with what other tests do. [861ec1f](https://github.com/pulumi/pulumi-terraform-bridge/pull/2837/commits/861ec1f52899b575125d86d1f3bda42da858d125) contains the changes: - Refactors the tests to use the generic `diffSchemaValueMakerPair` and `diffScenario` types for their tests. - Refactors the tests to use `prop` for top-level properties and `nested_prop` for nested ones, like the rest of the tests. - Refactors the tests to use the generic `runSDKv2TestMatrix` test function. - Refactors the `valueMaker` functions from `value_makers.go` to return a `map[string]cty.Value ` instead of a `cty.Value` which needs to be transformed further after. - Corrects three tests in `list element removed`, where the order of the elements was wrong in the changed values. [f800d2d](https://github.com/pulumi/pulumi-terraform-bridge/pull/2837/commits/f800d2dda79ce5f80320a7cef0298e4fe1fad9b7) contains the test recordings. Related to https://github.com/pulumi/pulumi-terraform-bridge/issues/2788 Related to https://github.com/pulumi/pulumi-terraform-bridge/issues/2789 --- .../diff_test/detailed_diff_list_test.go | 182 +++------------ pkg/tests/diff_test/detailed_diff_set_test.go | 211 ++++++------------ .../list_attribute/added_non-empty.golden | 8 +- .../list_attribute/changed.golden | 8 +- .../list_element_added_back.golden | 8 +- .../list_element_added_front.golden | 12 +- .../list_element_added_middle.golden | 10 +- .../list_element_removed_end.golden | 19 +- .../list_element_removed_front.golden | 21 +- .../list_element_removed_middle.golden | 19 +- .../long_list_added_back.golden | 8 +- .../long_list_added_front.golden | 48 ++-- .../long_list_removed_back.golden | 8 +- .../long_list_removed_front.golden | 48 ++-- .../one_added,_one_removed.golden | 12 +- .../list_attribute/removed_non-empty.golden | 8 +- .../added_non-empty.golden | 8 +- .../list_attribute_force_new/changed.golden | 8 +- .../list_element_added_back.golden | 8 +- .../list_element_added_front.golden | 12 +- .../list_element_added_middle.golden | 10 +- .../list_element_removed_end.golden | 19 +- .../list_element_removed_front.golden | 21 +- .../list_element_removed_middle.golden | 19 +- .../long_list_added_back.golden | 8 +- .../long_list_added_front.golden | 48 ++-- .../long_list_removed_back.golden | 8 +- .../long_list_removed_front.golden | 48 ++-- .../one_added,_one_removed.golden | 12 +- .../removed_non-empty.golden | 8 +- .../list_block/added_non-empty.golden | 10 +- .../list_block/changed.golden | 10 +- .../list_block/list_element_added_back.golden | 10 +- .../list_element_added_front.golden | 26 +-- .../list_element_added_middle.golden | 18 +- .../list_element_removed_end.golden | 30 +-- .../list_element_removed_front.golden | 29 ++- .../list_element_removed_middle.golden | 29 +-- .../list_block/long_list_added_back.golden | 10 +- .../list_block/long_list_added_front.golden | 170 +++++++------- .../list_block/long_list_removed_back.golden | 10 +- .../list_block/long_list_removed_front.golden | 170 +++++++------- .../list_block/one_added,_one_removed.golden | 26 +-- .../list_block/removed_non-empty.golden | 10 +- .../added_non-empty.golden | 10 +- .../list_block_force_new/changed.golden | 10 +- .../list_element_added_back.golden | 10 +- .../list_element_added_front.golden | 26 +-- .../list_element_added_middle.golden | 18 +- .../list_element_removed_end.golden | 30 +-- .../list_element_removed_front.golden | 29 ++- .../list_element_removed_middle.golden | 29 +-- .../long_list_added_back.golden | 10 +- .../long_list_added_front.golden | 170 +++++++------- .../long_list_removed_back.golden | 10 +- .../long_list_removed_front.golden | 170 +++++++------- .../one_added,_one_removed.golden | 26 +-- .../removed_non-empty.golden | 10 +- .../added_non-empty.golden | 23 +- .../changed.golden | 31 ++- .../list_element_added_back.golden | 23 +- .../list_element_added_front.golden | 41 +++- .../list_element_added_middle.golden | 34 ++- .../list_element_removed_end.golden | 26 ++- .../list_element_removed_front.golden | 44 ++-- .../list_element_removed_middle.golden | 37 +-- .../long_list_added_back.golden | 23 +- .../long_list_added_front.golden | 167 +++++++++++++- .../long_list_removed_back.golden | 24 +- .../long_list_removed_front.golden | 168 ++++++++++++-- .../one_added,_one_removed.golden | 47 +++- .../removed_non-empty.golden | 24 +- .../added_non-empty.golden | 6 +- .../changed.golden | 6 +- .../list_element_added_back.golden | 6 +- .../list_element_added_front.golden | 14 +- .../list_element_added_middle.golden | 10 +- .../list_element_removed_end.golden | 26 +-- .../list_element_removed_front.golden | 21 +- .../list_element_removed_middle.golden | 21 +- .../long_list_added_back.golden | 6 +- .../long_list_added_front.golden | 86 +++---- .../long_list_removed_back.golden | 6 +- .../long_list_removed_front.golden | 86 +++---- .../one_added,_one_removed.golden | 14 +- .../removed_non-empty.golden | 6 +- .../added_non-empty.golden | 8 +- .../list_block_sensitive/changed.golden | 31 ++- .../list_element_added_back.golden | 8 +- .../list_element_added_front.golden | 26 ++- .../list_element_added_middle.golden | 19 +- .../list_element_removed_end.golden | 10 +- .../list_element_removed_front.golden | 28 ++- .../list_element_removed_middle.golden | 21 +- .../long_list_added_back.golden | 8 +- .../long_list_added_front.golden | 152 ++++++++++++- .../long_list_removed_back.golden | 8 +- .../long_list_removed_front.golden | 152 ++++++++++++- .../one_added,_one_removed.golden | 47 +++- .../removed_non-empty.golden | 8 +- .../added_non-empty.golden | 8 +- .../max_items_one_attribute/changed.golden | 8 +- .../removed_non-empty.golden | 8 +- .../added_non-empty.golden | 8 +- .../changed.golden | 8 +- .../removed_non-empty.golden | 8 +- .../added_non-empty.golden | 6 +- .../max_items_one_block/changed.golden | 6 +- .../removed_non-empty.golden | 6 +- .../added_non-empty.golden | 6 +- .../changed.golden | 6 +- .../removed_non-empty.golden | 6 +- .../added_non-empty.golden | 6 +- .../changed.golden | 6 +- .../removed_non-empty.golden | 6 +- .../attribute_force_new/added.golden | 6 +- .../attribute_force_new/added_end.golden | 6 +- .../added_end_unordered.golden | 6 +- .../attribute_force_new/added_front.golden | 6 +- .../added_front_unordered.golden | 6 +- .../attribute_force_new/added_middle.golden | 6 +- .../added_middle_unordered.golden | 6 +- .../changed_non-null.golden | 6 +- .../changed_non-null_to_null.golden | 6 +- .../changed_null_to_non-null.golden | 6 +- .../attribute_force_new/removed.golden | 6 +- .../attribute_force_new/removed_end.golden | 6 +- .../removed_end_unordered.golden | 6 +- .../attribute_force_new/removed_front.golden | 6 +- .../removed_front_unordered.golden | 6 +- .../attribute_force_new/removed_middle.golden | 6 +- .../removed_middle_unordered.golden | 6 +- .../same_element_updated.golden | 6 +- .../same_element_updated_unordered.golden | 8 +- .../shuffled_added_end.golden | 6 +- .../shuffled_added_front.golden | 6 +- .../shuffled_added_middle.golden | 6 +- .../shuffled_removed_end.golden | 6 +- .../shuffled_removed_front.golden | 6 +- .../shuffled_removed_middle.golden | 6 +- .../attribute_force_new/two_added.golden | 8 +- .../two_added_and_two_removed.golden | 8 +- ...d_two_removed_shuffled,_no_overlaps.golden | 12 +- ..._two_removed_shuffled,_one_overlaps.golden | 10 +- ...o_removed_shuffled,_with_duplicates.golden | 10 +- .../attribute_force_new/two_removed.golden | 8 +- .../attribute_no_force_new/added.golden | 6 +- .../attribute_no_force_new/added_end.golden | 6 +- .../added_end_unordered.golden | 6 +- .../attribute_no_force_new/added_front.golden | 6 +- .../added_front_unordered.golden | 6 +- .../added_middle.golden | 6 +- .../added_middle_unordered.golden | 6 +- .../changed_non-null.golden | 6 +- .../changed_non-null_to_null.golden | 6 +- .../changed_null_to_non-null.golden | 6 +- .../attribute_no_force_new/removed.golden | 6 +- .../attribute_no_force_new/removed_end.golden | 6 +- .../removed_end_unordered.golden | 6 +- .../removed_front.golden | 6 +- .../removed_front_unordered.golden | 6 +- .../removed_middle.golden | 6 +- .../removed_middle_unordered.golden | 6 +- .../same_element_updated.golden | 6 +- .../same_element_updated_unordered.golden | 8 +- .../shuffled_added_end.golden | 6 +- .../shuffled_added_front.golden | 6 +- .../shuffled_added_middle.golden | 6 +- .../shuffled_removed_end.golden | 6 +- .../shuffled_removed_front.golden | 6 +- .../shuffled_removed_middle.golden | 6 +- .../attribute_no_force_new/two_added.golden | 8 +- .../two_added_and_two_removed.golden | 8 +- ...d_two_removed_shuffled,_no_overlaps.golden | 12 +- ..._two_removed_shuffled,_one_overlaps.golden | 10 +- ...o_removed_shuffled,_with_duplicates.golden | 10 +- .../attribute_no_force_new/two_removed.golden | 8 +- .../block_nested_force_new/added.golden | 10 +- .../block_nested_force_new/added_end.golden | 10 +- .../added_end_unordered.golden | 10 +- .../block_nested_force_new/added_front.golden | 10 +- .../added_front_unordered.golden | 10 +- .../added_middle.golden | 10 +- .../added_middle_unordered.golden | 10 +- .../changed_non-null.golden | 14 +- .../changed_non-null_to_null.golden | 10 +- .../changed_null_to_non-null.golden | 10 +- .../block_nested_force_new/removed.golden | 10 +- .../block_nested_force_new/removed_end.golden | 10 +- .../removed_end_unordered.golden | 10 +- .../removed_front.golden | 10 +- .../removed_front_unordered.golden | 10 +- .../removed_middle.golden | 10 +- .../removed_middle_unordered.golden | 10 +- .../same_element_updated.golden | 14 +- .../same_element_updated_unordered.golden | 18 +- .../shuffled_added_end.golden | 10 +- .../shuffled_added_front.golden | 10 +- .../shuffled_added_middle.golden | 10 +- .../shuffled_removed_end.golden | 10 +- .../shuffled_removed_front.golden | 10 +- .../shuffled_removed_middle.golden | 10 +- .../block_nested_force_new/two_added.golden | 18 +- .../two_added_and_two_removed.golden | 26 +-- ...d_two_removed_shuffled,_no_overlaps.golden | 34 +-- ..._two_removed_shuffled,_one_overlaps.golden | 30 +-- ...o_removed_shuffled,_with_duplicates.golden | 30 +-- .../block_nested_force_new/two_removed.golden | 18 +- .../block_no_force_new/added.golden | 10 +- .../block_no_force_new/added_end.golden | 10 +- .../added_end_unordered.golden | 10 +- .../block_no_force_new/added_front.golden | 10 +- .../added_front_unordered.golden | 10 +- .../block_no_force_new/added_middle.golden | 10 +- .../added_middle_unordered.golden | 10 +- .../changed_non-null.golden | 14 +- .../changed_non-null_to_null.golden | 10 +- .../changed_null_to_non-null.golden | 10 +- .../block_no_force_new/removed.golden | 10 +- .../block_no_force_new/removed_end.golden | 10 +- .../removed_end_unordered.golden | 10 +- .../block_no_force_new/removed_front.golden | 10 +- .../removed_front_unordered.golden | 10 +- .../block_no_force_new/removed_middle.golden | 10 +- .../removed_middle_unordered.golden | 10 +- .../same_element_updated.golden | 14 +- .../same_element_updated_unordered.golden | 18 +- .../shuffled_added_end.golden | 10 +- .../shuffled_added_front.golden | 10 +- .../shuffled_added_middle.golden | 10 +- .../shuffled_removed_end.golden | 10 +- .../shuffled_removed_front.golden | 10 +- .../shuffled_removed_middle.golden | 10 +- .../block_no_force_new/two_added.golden | 18 +- .../two_added_and_two_removed.golden | 26 +-- ...d_two_removed_shuffled,_no_overlaps.golden | 34 +-- ..._two_removed_shuffled,_one_overlaps.golden | 30 +-- ...o_removed_shuffled,_with_duplicates.golden | 30 +-- .../block_no_force_new/two_removed.golden | 18 +- .../block_top_level_force_new/added.golden | 10 +- .../added_end.golden | 10 +- .../added_end_unordered.golden | 10 +- .../added_front.golden | 10 +- .../added_front_unordered.golden | 10 +- .../added_middle.golden | 10 +- .../added_middle_unordered.golden | 10 +- .../changed_non-null.golden | 14 +- .../changed_non-null_to_null.golden | 10 +- .../changed_null_to_non-null.golden | 10 +- .../block_top_level_force_new/removed.golden | 10 +- .../removed_end.golden | 10 +- .../removed_end_unordered.golden | 10 +- .../removed_front.golden | 10 +- .../removed_front_unordered.golden | 10 +- .../removed_middle.golden | 10 +- .../removed_middle_unordered.golden | 10 +- .../same_element_updated.golden | 14 +- .../same_element_updated_unordered.golden | 18 +- .../shuffled_added_end.golden | 10 +- .../shuffled_added_front.golden | 10 +- .../shuffled_added_middle.golden | 10 +- .../shuffled_removed_end.golden | 10 +- .../shuffled_removed_front.golden | 10 +- .../shuffled_removed_middle.golden | 10 +- .../two_added.golden | 18 +- .../two_added_and_two_removed.golden | 26 +-- ...d_two_removed_shuffled,_no_overlaps.golden | 34 +-- ..._two_removed_shuffled,_one_overlaps.golden | 30 +-- ...o_removed_shuffled,_with_duplicates.golden | 30 +-- .../two_removed.golden | 18 +- .../block_nested_sensitive/added.golden | 6 +- .../block_nested_sensitive/added_end.golden | 6 +- .../added_end_unordered.golden | 6 +- .../block_nested_sensitive/added_front.golden | 6 +- .../added_front_unordered.golden | 6 +- .../added_middle.golden | 6 +- .../added_middle_unordered.golden | 6 +- .../changed_non-null.golden | 10 +- .../changed_non-null_to_null.golden | 6 +- .../changed_null_to_non-null.golden | 6 +- .../block_nested_sensitive/removed.golden | 6 +- .../block_nested_sensitive/removed_end.golden | 6 +- .../removed_end_unordered.golden | 6 +- .../removed_front.golden | 6 +- .../removed_front_unordered.golden | 6 +- .../removed_middle.golden | 6 +- .../removed_middle_unordered.golden | 6 +- .../same_element_updated.golden | 10 +- .../same_element_updated_unordered.golden | 10 +- .../shuffled_added_end.golden | 6 +- .../shuffled_added_front.golden | 6 +- .../shuffled_added_middle.golden | 6 +- .../shuffled_removed_end.golden | 6 +- .../shuffled_removed_front.golden | 6 +- .../shuffled_removed_middle.golden | 6 +- .../block_nested_sensitive/two_added.golden | 10 +- .../two_added_and_two_removed.golden | 18 +- ...d_two_removed_shuffled,_no_overlaps.golden | 18 +- ..._two_removed_shuffled,_one_overlaps.golden | 18 +- ...o_removed_shuffled,_with_duplicates.golden | 18 +- .../block_nested_sensitive/two_removed.golden | 10 +- .../block_sensitive/added.golden | 8 +- .../block_sensitive/added_end.golden | 8 +- .../added_end_unordered.golden | 8 +- .../block_sensitive/added_front.golden | 8 +- .../added_front_unordered.golden | 8 +- .../block_sensitive/added_middle.golden | 8 +- .../added_middle_unordered.golden | 8 +- .../block_sensitive/changed_non-null.golden | 14 +- .../changed_non-null_to_null.golden | 8 +- .../changed_null_to_non-null.golden | 8 +- .../block_sensitive/removed.golden | 8 +- .../block_sensitive/removed_end.golden | 8 +- .../removed_end_unordered.golden | 8 +- .../block_sensitive/removed_front.golden | 8 +- .../removed_front_unordered.golden | 8 +- .../block_sensitive/removed_middle.golden | 8 +- .../removed_middle_unordered.golden | 8 +- .../same_element_updated.golden | 14 +- .../same_element_updated_unordered.golden | 14 +- .../block_sensitive/shuffled_added_end.golden | 8 +- .../shuffled_added_front.golden | 8 +- .../shuffled_added_middle.golden | 8 +- .../shuffled_removed_end.golden | 8 +- .../shuffled_removed_front.golden | 8 +- .../shuffled_removed_middle.golden | 8 +- .../block_sensitive/two_added.golden | 14 +- .../two_added_and_two_removed.golden | 26 +-- ...d_two_removed_shuffled,_no_overlaps.golden | 26 +-- ..._two_removed_shuffled,_one_overlaps.golden | 26 +-- ...o_removed_shuffled,_with_duplicates.golden | 26 +-- .../block_sensitive/two_removed.golden | 14 +- .../computed_attribute_force_new/added.golden | 6 +- .../added_end.golden | 6 +- .../added_end_unordered.golden | 6 +- .../added_front.golden | 6 +- .../added_front_unordered.golden | 6 +- .../added_middle.golden | 6 +- .../added_middle_unordered.golden | 6 +- .../changed_non-null.golden | 6 +- .../changed_null_to_non-null.golden | 6 +- .../removed.golden | 6 +- .../removed_end.golden | 6 +- .../removed_end_unordered.golden | 6 +- .../removed_front.golden | 6 +- .../removed_front_unordered.golden | 6 +- .../removed_middle.golden | 6 +- .../removed_middle_unordered.golden | 6 +- .../same_element_updated.golden | 6 +- .../same_element_updated_unordered.golden | 8 +- .../shuffled_added_end.golden | 6 +- .../shuffled_added_front.golden | 6 +- .../shuffled_added_middle.golden | 6 +- .../shuffled_removed_end.golden | 6 +- .../shuffled_removed_front.golden | 6 +- .../shuffled_removed_middle.golden | 6 +- .../two_added.golden | 8 +- .../two_added_and_two_removed.golden | 8 +- ...d_two_removed_shuffled,_no_overlaps.golden | 12 +- ..._two_removed_shuffled,_one_overlaps.golden | 10 +- ...o_removed_shuffled,_with_duplicates.golden | 10 +- .../two_removed.golden | 8 +- .../added.golden | 6 +- .../added_end.golden | 6 +- .../added_end_unordered.golden | 6 +- .../added_front.golden | 6 +- .../added_front_unordered.golden | 6 +- .../added_middle.golden | 6 +- .../added_middle_unordered.golden | 6 +- .../changed_non-null.golden | 6 +- .../changed_null_to_empty.golden | 6 +- .../changed_null_to_non-null.golden | 6 +- .../removed.golden | 6 +- .../removed_end.golden | 6 +- .../removed_end_unordered.golden | 6 +- .../removed_front.golden | 6 +- .../removed_front_unordered.golden | 6 +- .../removed_middle.golden | 6 +- .../removed_middle_unordered.golden | 6 +- .../same_element_updated.golden | 6 +- .../same_element_updated_unordered.golden | 8 +- .../shuffled_added_end.golden | 6 +- .../shuffled_added_front.golden | 6 +- .../shuffled_added_middle.golden | 6 +- .../shuffled_removed_end.golden | 6 +- .../shuffled_removed_front.golden | 6 +- .../shuffled_removed_middle.golden | 6 +- .../two_added.golden | 8 +- .../two_added_and_two_removed.golden | 8 +- ...d_two_removed_shuffled,_no_overlaps.golden | 12 +- ..._two_removed_shuffled,_one_overlaps.golden | 10 +- ...o_removed_shuffled,_with_duplicates.golden | 10 +- .../two_removed.golden | 8 +- .../unchanged_empty.golden | 6 +- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_null_to_non-null.golden | 12 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_non-null_to_null.golden | 12 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_non-null_to_null.golden | 14 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 14 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_non-null_to_null.golden | 12 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_non-null_to_null.golden | 14 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 14 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- .../added.golden | 12 +- .../added_end.golden | 36 +-- .../added_end_unordered.golden | 36 +-- .../added_front.golden | 44 ++-- .../added_front_unordered.golden | 40 ++-- .../added_middle.golden | 40 ++-- .../added_middle_unordered.golden | 44 ++-- .../changed_non-null.golden | 18 +- .../changed_non-null_to_null.golden | 12 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 12 +- .../removed_end.golden | 36 +-- .../removed_end_unordered.golden | 44 ++-- .../removed_front.golden | 44 ++-- .../removed_front_unordered.golden | 44 ++-- .../removed_middle.golden | 40 ++-- .../removed_middle_unordered.golden | 44 ++-- .../same_element_updated.golden | 42 ++-- .../same_element_updated_unordered.golden | 50 ++--- .../shuffled_added_end.golden | 44 ++-- .../shuffled_added_front.golden | 40 ++-- .../shuffled_added_middle.golden | 44 ++-- .../shuffled_removed_end.golden | 44 ++-- .../shuffled_removed_front.golden | 40 ++-- .../shuffled_removed_middle.golden | 44 ++-- .../two_added.golden | 46 ++-- .../two_added_and_two_removed.golden | 58 ++--- ...d_two_removed_shuffled,_no_overlaps.golden | 66 +++--- ..._two_removed_shuffled,_one_overlaps.golden | 62 ++--- ...o_removed_shuffled,_with_duplicates.golden | 62 ++--- .../two_removed.golden | 46 ++-- .../added.golden | 12 +- .../added_end.golden | 12 +- .../added_end_unordered.golden | 12 +- .../added_front.golden | 12 +- .../added_front_unordered.golden | 12 +- .../added_middle.golden | 12 +- .../added_middle_unordered.golden | 12 +- .../changed_non-null.golden | 22 +- .../changed_non-null_to_null.golden | 14 +- .../changed_null_to_non-null.golden | 12 +- .../removed.golden | 14 +- .../removed_end.golden | 14 +- .../removed_end_unordered.golden | 14 +- .../removed_front.golden | 14 +- .../removed_front_unordered.golden | 14 +- .../removed_middle.golden | 14 +- .../removed_middle_unordered.golden | 14 +- .../same_element_updated.golden | 22 +- .../same_element_updated_unordered.golden | 24 +- .../shuffled_added_end.golden | 12 +- .../shuffled_added_front.golden | 12 +- .../shuffled_added_middle.golden | 12 +- .../shuffled_removed_end.golden | 14 +- .../shuffled_removed_front.golden | 14 +- .../shuffled_removed_middle.golden | 14 +- .../two_added.golden | 22 +- .../two_added_and_two_removed.golden | 42 ++-- ...d_two_removed_shuffled,_no_overlaps.golden | 46 ++-- ..._two_removed_shuffled,_one_overlaps.golden | 44 ++-- ...o_removed_shuffled,_with_duplicates.golden | 44 ++-- .../two_removed.golden | 26 +-- pkg/tests/diff_test/value_makers.go | 76 ++++--- 755 files changed, 8897 insertions(+), 8306 deletions(-) diff --git a/pkg/tests/diff_test/detailed_diff_list_test.go b/pkg/tests/diff_test/detailed_diff_list_test.go index 5cf568f65..57cde9d3a 100644 --- a/pkg/tests/diff_test/detailed_diff_list_test.go +++ b/pkg/tests/diff_test/detailed_diff_list_test.go @@ -5,10 +5,6 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hexops/autogold/v2" - "github.com/zclconf/go-cty/cty" - - crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests" ) func TestSDKv2DetailedDiffList(t *testing.T) { @@ -16,7 +12,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listAttrSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_attr": { + "prop": { Type: schema.TypeList, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, @@ -26,7 +22,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listAttrSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_attr": { + "prop": { Type: schema.TypeList, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, @@ -37,7 +33,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { maxItemsOneAttrSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_attr": { + "prop": { Type: schema.TypeList, Optional: true, MaxItems: 1, @@ -48,7 +44,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { maxItemsOneAttrSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_attr": { + "prop": { Type: schema.TypeList, Optional: true, MaxItems: 1, @@ -60,12 +56,12 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listBlockSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "prop": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -77,13 +73,13 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listBlockSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "prop": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -95,7 +91,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listBlockSchemaNestedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, Elem: &schema.Resource{ @@ -113,7 +109,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { maxItemsOneBlockSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, MaxItems: 1, @@ -131,7 +127,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { maxItemsOneBlockSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, MaxItems: 1, @@ -150,7 +146,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { maxItemsOneBlockSchemaNestedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, MaxItems: 1, @@ -169,7 +165,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listBlockSchemaSensitive := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, Sensitive: true, @@ -187,7 +183,7 @@ func TestSDKv2DetailedDiffList(t *testing.T) { listBlockSchemaNestedSensitive := schema.Resource{ Schema: map[string]*schema.Schema{ - "list_block": { + "prop": { Type: schema.TypeList, Optional: true, Elem: &schema.Resource{ @@ -203,97 +199,25 @@ func TestSDKv2DetailedDiffList(t *testing.T) { }, } - attrList := func(arr *[]string) map[string]cty.Value { - if arr == nil { - return map[string]cty.Value{} - } - - if len(*arr) == 0 { - return map[string]cty.Value{ - "list_attr": cty.ListValEmpty(cty.String), - } - } - - slice := make([]cty.Value, len(*arr)) - for i, v := range *arr { - slice[i] = cty.StringVal(v) - } - return map[string]cty.Value{ - "list_attr": cty.ListVal(slice), - } - } - - blockList := func(arr *[]string) map[string]cty.Value { - if arr == nil { - return map[string]cty.Value{} - } - - if len(*arr) == 0 { - return map[string]cty.Value{ - "list_block": cty.ListValEmpty(cty.DynamicPseudoType), - } - } - - slice := make([]cty.Value, len(*arr)) - for i, v := range *arr { - slice[i] = cty.ObjectVal(map[string]cty.Value{"prop": cty.StringVal(v)}) - } - return map[string]cty.Value{ - "list_block": cty.ListVal(slice), - } - } - - nestedBlockList := func(arr *[]string) map[string]cty.Value { - if arr == nil { - return map[string]cty.Value{} - } - - if len(*arr) == 0 { - return map[string]cty.Value{ - "list_block": cty.ListValEmpty(cty.DynamicPseudoType), - } - } - - slice := make([]cty.Value, len(*arr)) - for i, v := range *arr { - slice[i] = cty.ObjectVal(map[string]cty.Value{"nested_prop": cty.StringVal(v)}) - } - return map[string]cty.Value{ - "list_block": cty.ListVal(slice), - } - } - - listPairs := []struct { - name string - schema schema.Resource - valueMaker func(*[]string) map[string]cty.Value - }{ - {"list attribute", listAttrSchema, attrList}, - {"list attribute force new", listAttrSchemaForceNew, attrList}, - {"list block", listBlockSchema, blockList}, - {"list block force new", listBlockSchemaForceNew, blockList}, - {"list block nested force new", listBlockSchemaNestedForceNew, blockList}, - {"list block sensitive", listBlockSchemaSensitive, blockList}, - {"list block nested sensitive", listBlockSchemaNestedSensitive, nestedBlockList}, + listPairs := []diffSchemaValueMakerPair[[]string]{ + {"list attribute", listAttrSchema, listValueMaker}, + {"list attribute force new", listAttrSchemaForceNew, listValueMaker}, + {"list block", listBlockSchema, nestedListValueMaker}, + {"list block force new", listBlockSchemaForceNew, nestedListValueMaker}, + {"list block nested force new", listBlockSchemaNestedForceNew, nestedListValueMaker}, + {"list block sensitive", listBlockSchemaSensitive, nestedListValueMaker}, + {"list block nested sensitive", listBlockSchemaNestedSensitive, nestedListValueMaker}, } - maxItemsOnePairs := []struct { - name string - schema schema.Resource - valueMaker func(*[]string) map[string]cty.Value - }{ - {"max items one attribute", maxItemsOneAttrSchema, attrList}, - {"max items one attribute force new", maxItemsOneAttrSchemaForceNew, attrList}, - {"max items one block", maxItemsOneBlockSchema, nestedBlockList}, - {"max items one block force new", maxItemsOneBlockSchemaForceNew, nestedBlockList}, - {"max items one block nested force new", maxItemsOneBlockSchemaNestedForceNew, nestedBlockList}, + maxItemsOnePairs := []diffSchemaValueMakerPair[[]string]{ + {"max items one attribute", maxItemsOneAttrSchema, listValueMaker}, + {"max items one attribute force new", maxItemsOneAttrSchemaForceNew, listValueMaker}, + {"max items one block", maxItemsOneBlockSchema, nestedListValueMaker}, + {"max items one block force new", maxItemsOneBlockSchemaForceNew, nestedListValueMaker}, + {"max items one block nested force new", maxItemsOneBlockSchemaNestedForceNew, nestedListValueMaker}, } - oneElementScenarios := []struct { - name string - initialValue *[]string - changeValue *[]string - }{ + oneElementScenarios := []diffScenario[[]string]{ {"unchanged empty", nil, nil}, {"unchanged non-empty", ref([]string{"val1"}), ref([]string{"val1"})}, {"added non-empty", nil, ref([]string{"val1"})}, @@ -311,17 +235,13 @@ func TestSDKv2DetailedDiffList(t *testing.T) { longListAddedBack = append(longListAddedBack, "value20") longListAddedFront := append([]string{"value20"}, *longList...) - multiElementScenarios := []struct { - name string - initialValue *[]string - changeValue *[]string - }{ + multiElementScenarios := []diffScenario[[]string]{ {"list element added front", ref([]string{"val2", "val3"}), ref([]string{"val1", "val2", "val3"})}, {"list element added back", ref([]string{"val1", "val2"}), ref([]string{"val1", "val2", "val3"})}, {"list element added middle", ref([]string{"val1", "val3"}), ref([]string{"val1", "val2", "val3"})}, - {"list element removed front", ref([]string{"val1", "val2", "val3"}), ref([]string{"val3", "val2"})}, - {"list element removed middle", ref([]string{"val1", "val2", "val3"}), ref([]string{"val3", "val1"})}, - {"list element removed end", ref([]string{"val1", "val2", "val3"}), ref([]string{"val2", "val1"})}, + {"list element removed front", ref([]string{"val1", "val2", "val3"}), ref([]string{"val2", "val3"})}, + {"list element removed middle", ref([]string{"val1", "val2", "val3"}), ref([]string{"val1", "val3"})}, + {"list element removed end", ref([]string{"val1", "val2", "val3"}), ref([]string{"val1", "val2"})}, {"one added, one removed", ref([]string{"val1", "val2", "val3"}), ref([]string{"val2", "val3", "val4"})}, {"long list added back", longList, &longListAddedBack}, // TODO[pulumi/pulumi-terraform-bridge#2239]: These cases present as multiple changes instead of just one @@ -332,38 +252,6 @@ func TestSDKv2DetailedDiffList(t *testing.T) { scenarios := append(oneElementScenarios, multiElementScenarios...) - runTest := func(t *testing.T, schema schema.Resource, valueMaker func(*[]string) map[string]cty.Value, initialValue *[]string, changeValue *[]string) { - diff := crosstests.Diff(t, &schema, valueMaker(initialValue), valueMaker(changeValue)) - autogold.ExpectFile(t, testOutput{ - initialValue: initialValue, - changeValue: changeValue, - tfOut: diff.TFOut, - pulumiOut: diff.PulumiOut, - detailedDiff: diff.PulumiDiff.DetailedDiff, - }) - } - - for _, schemaValueMakerPair := range listPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range scenarios { - t.Run(scenario.name, func(t *testing.T) { - t.Parallel() - runTest(t, schemaValueMakerPair.schema, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue) - }) - } - }) - } - - for _, schemaValueMakerPair := range maxItemsOnePairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range oneElementScenarios { - t.Run(scenario.name, func(t *testing.T) { - t.Parallel() - runTest(t, schemaValueMakerPair.schema, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue) - }) - } - }) - } + runSDKv2TestMatrix(t, listPairs, scenarios) + runSDKv2TestMatrix(t, maxItemsOnePairs, oneElementScenarios) } diff --git a/pkg/tests/diff_test/detailed_diff_set_test.go b/pkg/tests/diff_test/detailed_diff_set_test.go index 808688f38..fb3222e57 100644 --- a/pkg/tests/diff_test/detailed_diff_set_test.go +++ b/pkg/tests/diff_test/detailed_diff_set_test.go @@ -6,27 +6,11 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hexops/autogold/v2" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/zclconf/go-cty/cty" - - crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests" ) -type setScenario struct { - name string - initialValue *[]string - changeValue *[]string -} - -type setSchemaValueMakerPair struct { - name string - res schema.Resource - valueMaker func(*[]string) cty.Value -} - -func setScenarios() []setScenario { - return []setScenario{ +func setScenarios() []diffScenario[[]string] { + return []diffScenario[[]string]{ {"unchanged non-empty", &[]string{"value"}, &[]string{"value"}}, {"unchanged empty", &[]string{}, &[]string{}}, {"unchanged null", nil, nil}, @@ -79,37 +63,12 @@ func setScenarios() []setScenario { } } -func runSetTest( - schema schema.Resource, valueMaker func(*[]string) cty.Value, val1 *[]string, val2 *[]string, - disableAccurateBridgePreviews bool, -) func(t *testing.T) { - return func(t *testing.T) { - t.Parallel() - initialValue := valueMaker(val1) - changeValue := valueMaker(val2) - - opts := []crosstests.DiffOption{} - if disableAccurateBridgePreviews { - opts = append(opts, crosstests.DiffDisableAccurateBridgePreviews()) - } - diff := crosstests.Diff(t, &schema, map[string]cty.Value{"test": initialValue}, map[string]cty.Value{"test": changeValue}, opts...) - - autogold.ExpectFile(t, testOutput{ - initialValue: val1, - changeValue: val2, - tfOut: diff.TFOut, - pulumiOut: diff.PulumiOut, - detailedDiff: diff.PulumiDiff.DetailedDiff, - }) - } -} - func TestSDKv2DetailedDiffSetAttribute(t *testing.T) { t.Parallel() attributeSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Schema{ @@ -121,7 +80,7 @@ func TestSDKv2DetailedDiffSetAttribute(t *testing.T) { attributeSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Schema{ @@ -132,19 +91,12 @@ func TestSDKv2DetailedDiffSetAttribute(t *testing.T) { }, } - setSchemaValueMakerPairs := []setSchemaValueMakerPair{ + diffSchemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"attribute no force new", attributeSchema, listValueMaker}, {"attribute force new", attributeSchemaForceNew, listValueMaker}, } - for _, schemaValueMakerPair := range setSchemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios()) } func TestSDKv2DetailedDiffSetBlock(t *testing.T) { @@ -152,12 +104,12 @@ func TestSDKv2DetailedDiffSetBlock(t *testing.T) { blockSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -169,13 +121,13 @@ func TestSDKv2DetailedDiffSetBlock(t *testing.T) { blockSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -187,12 +139,12 @@ func TestSDKv2DetailedDiffSetBlock(t *testing.T) { blockSchemaNestedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, ForceNew: true, @@ -203,20 +155,13 @@ func TestSDKv2DetailedDiffSetBlock(t *testing.T) { }, } - setSchemaValueMakerPairs := []setSchemaValueMakerPair{ + diffSchemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"block no force new", blockSchema, nestedListValueMaker}, {"block top level force new", blockSchemaForceNew, nestedListValueMaker}, {"block nested force new", blockSchemaNestedForceNew, nestedListValueMaker}, } - for _, schemaValueMakerPair := range setSchemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios()) } func TestSDKv2DetailedDiffSetComputedAttribute(t *testing.T) { @@ -224,7 +169,7 @@ func TestSDKv2DetailedDiffSetComputedAttribute(t *testing.T) { computedAttributeSchema := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Computed: true, @@ -235,15 +180,15 @@ func TestSDKv2DetailedDiffSetComputedAttribute(t *testing.T) { }, CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { d.SetId("id") - setHashFunc := d.Get("test").(*schema.Set).F - err := d.Set("test", schema.NewSet(setHashFunc, []interface{}{"computed"})) + setHashFunc := d.Get("prop").(*schema.Set).F + err := d.Set("prop", schema.NewSet(setHashFunc, []interface{}{"computed"})) contract.Assertf(err == nil, "failed to set attribute: %v", err) return nil }, UpdateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { - if d.Get("test") == nil { - setHashFunc := d.Get("test").(*schema.Set).F - err := d.Set("test", schema.NewSet(setHashFunc, []interface{}{"computed"})) + if d.Get("prop") == nil { + setHashFunc := d.Get("prop").(*schema.Set).F + err := d.Set("prop", schema.NewSet(setHashFunc, []interface{}{"computed"})) contract.Assertf(err == nil, "failed to set attribute: %v", err) } return nil @@ -252,7 +197,7 @@ func TestSDKv2DetailedDiffSetComputedAttribute(t *testing.T) { computedAttributeSchemaForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Computed: true, @@ -264,39 +209,32 @@ func TestSDKv2DetailedDiffSetComputedAttribute(t *testing.T) { }, CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { d.SetId("id") - if d.Get("test") == nil { - err := d.Set("test", schema.NewSet(schema.HashString, []interface{}{"computed"})) + if d.Get("prop") == nil { + err := d.Set("prop", schema.NewSet(schema.HashString, []interface{}{"computed"})) contract.Assertf(err == nil, "failed to set attribute: %v", err) } return nil }, UpdateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { - if d.Get("test") == nil { - err := d.Set("test", schema.NewSet(schema.HashString, []interface{}{"computed"})) + if d.Get("prop") == nil { + err := d.Set("prop", schema.NewSet(schema.HashString, []interface{}{"computed"})) contract.Assertf(err == nil, "failed to set attribute: %v", err) } return nil }, } - setSchemaValueMakerPairs := []setSchemaValueMakerPair{ + diffSchemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"computed attribute no force new", computedAttributeSchema, listValueMaker}, {"computed attribute force new", computedAttributeSchemaForceNew, listValueMaker}, } - for _, schemaValueMakerPair := range setSchemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios()) } func computedSetBlockAttributeFunc(_ context.Context, d *schema.ResourceData, _ interface{}) { - contract.Assertf(d.Get("test") != nil, "test attribute is nil") - testVals := d.Get("test").(*schema.Set).List() + contract.Assertf(d.Get("prop") != nil, "test attribute is nil") + testVals := d.Get("prop").(*schema.Set).List() for _, v := range testVals { val := v.(map[string]interface{}) if val["computed"] == nil { @@ -307,18 +245,18 @@ func computedSetBlockAttributeFunc(_ context.Context, d *schema.ResourceData, _ val["computed"] = compVal } } - setHashFunc := d.Get("test").(*schema.Set).F - err := d.Set("test", schema.NewSet(setHashFunc, testVals)) + setHashFunc := d.Get("prop").(*schema.Set).F + err := d.Set("prop", schema.NewSet(setHashFunc, testVals)) contract.Assertf(err == nil, "failed to set attribute: %v", err) } func computedSetBlockFunc(ctx context.Context, d *schema.ResourceData, i interface{}) { - if d.Get("test") == nil { - setHashFunc := d.Get("test").(*schema.Set).F - err := d.Set("test", schema.NewSet(setHashFunc, []interface{}{ + if d.Get("prop") == nil { + setHashFunc := d.Get("prop").(*schema.Set).F + err := d.Set("prop", schema.NewSet(setHashFunc, []interface{}{ map[string]interface{}{ - "nested": "computed", - "computed": "computed1", + "nested_prop": "computed", + "computed": "computed1", }, })) contract.Assertf(err == nil, "failed to set attribute: %v", err) @@ -332,13 +270,13 @@ func TestSDKv2DetailedDiffSetComputedBlock(t *testing.T) { blockSchemaComputed := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -364,14 +302,14 @@ func TestSDKv2DetailedDiffSetComputedBlock(t *testing.T) { blockSchemaComputedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, ForceNew: true, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -397,13 +335,13 @@ func TestSDKv2DetailedDiffSetComputedBlock(t *testing.T) { blockSchemaComputedNestedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, ForceNew: true, @@ -428,7 +366,7 @@ func TestSDKv2DetailedDiffSetComputedBlock(t *testing.T) { }, } - schemaValueMakerPairs := []setSchemaValueMakerPair{ + schemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"block with computed no replace", blockSchemaComputed, nestedListValueMaker}, {"block with computed no replace computed specified in program", blockSchemaComputed, nestedListValueMakerWithComputedSpecified}, {"block with computed force new", blockSchemaComputedForceNew, nestedListValueMaker}, @@ -437,14 +375,7 @@ func TestSDKv2DetailedDiffSetComputedBlock(t *testing.T) { {"block with computed and nested force new computed specified in program", blockSchemaComputedNestedForceNew, nestedListValueMakerWithComputedSpecified}, } - for _, schemaValueMakerPair := range schemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, schemaValueMakerPairs, setScenarios()) } func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { @@ -452,12 +383,12 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { blockSchemaNestedComputed := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -472,13 +403,13 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { }, CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { d.SetId("id") - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil }, UpdateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil @@ -487,13 +418,13 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { blockSchemaNestedComputedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -508,13 +439,13 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { }, CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { d.SetId("id") - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil }, UpdateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil @@ -523,12 +454,12 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { blockSchemaNestedComputedNestedForceNew := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, ForceNew: true, @@ -544,20 +475,20 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { }, CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { d.SetId("id") - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil }, UpdateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics { - if d.Get("test") != nil { + if d.Get("prop") != nil { computedSetBlockAttributeFunc(ctx, d, i) } return nil }, } - schemaValueMakerPairs := []setSchemaValueMakerPair{ + schemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"block with nested computed no replace", blockSchemaNestedComputed, nestedListValueMaker}, {"block with nested computed no replace computed specified in program", blockSchemaNestedComputed, nestedListValueMakerWithComputedSpecified}, {"block with nested computed and force new", blockSchemaNestedComputedForceNew, nestedListValueMaker}, @@ -566,14 +497,7 @@ func TestSDKv2DetailedDiffSetNestedComputedBlock(t *testing.T) { {"block with nested computed and nested force new computed specified", blockSchemaNestedComputedNestedForceNew, nestedListValueMakerWithComputedSpecified}, } - for _, schemaValueMakerPair := range schemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, schemaValueMakerPairs, setScenarios()) } func TestSDKv2DetailedDiffSetBlockSensitive(t *testing.T) { @@ -581,13 +505,13 @@ func TestSDKv2DetailedDiffSetBlockSensitive(t *testing.T) { blockSchemaSensitive := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Sensitive: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, }, @@ -599,12 +523,12 @@ func TestSDKv2DetailedDiffSetBlockSensitive(t *testing.T) { blockSchemaNestedSensitive := schema.Resource{ Schema: map[string]*schema.Schema{ - "test": { + "prop": { Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "nested": { + "nested_prop": { Type: schema.TypeString, Optional: true, Sensitive: true, @@ -615,17 +539,10 @@ func TestSDKv2DetailedDiffSetBlockSensitive(t *testing.T) { }, } - setSchemaValueMakerPairs := []setSchemaValueMakerPair{ + diffSchemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{ {"block sensitive", blockSchemaSensitive, nestedListValueMaker}, {"block nested sensitive", blockSchemaNestedSensitive, nestedListValueMaker}, } - for _, schemaValueMakerPair := range setSchemaValueMakerPairs { - t.Run(schemaValueMakerPair.name, func(t *testing.T) { - t.Parallel() - for _, scenario := range setScenarios() { - t.Run(scenario.name, runSetTest(schemaValueMakerPair.res, schemaValueMakerPair.valueMaker, scenario.initialValue, scenario.changeValue, false)) - } - }) - } + runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios()) } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/added_non-empty.golden index cc4582fb5..32b2d2e17 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/added_non-empty.golden @@ -11,8 +11,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - + list_attr = [ + id = "newid" + + prop = [ + "val1", ] } @@ -26,12 +26,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listAttrs: [ + + props: [ + [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/changed.golden index 5337d13ba..2a1eade26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/changed.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ ~ "val1" -> "val2", ] } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val1" => "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_back.golden index 6661382d3..e3e51808b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_back.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ # (1 unchanged element hidden) "val2", + "val3", @@ -34,12 +34,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ + [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_front.golden index 9d3584432..b1c3ed88c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_front.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ + "val1", "val2", # (1 unchanged element hidden) @@ -34,7 +34,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val2" => "val1" ~ [1]: "val3" => "val2" + [2]: "val3" @@ -44,8 +44,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{}, + "props[0]": map[string]interface{}{"kind": "UPDATE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_middle.golden index a4cdb618a..c4576437c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_added_middle.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ "val1", + "val2", "val3", @@ -34,7 +34,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [1]: "val3" => "val2" + [2]: "val3" ] @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_end.golden index 0fad4d531..cddf59a69 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ - - "val1", + id = "newid" + ~ prop = [ + # (1 unchanged element hidden) "val2", - "val3", - + "val1", ] } @@ -35,18 +34,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val2" - ~ [1]: "val2" => "val1" + ~ props: [ - [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE"}, - }, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_front.golden index 425e86f7b..86c926225 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ - "val1", - - "val2", - "val3", - + "val2", + "val2", + # (1 unchanged element hidden) ] } @@ -35,8 +34,9 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val3" + ~ props: [ + ~ [0]: "val1" => "val2" + ~ [1]: "val2" => "val3" - [2]: "val3" ] Resources: @@ -44,7 +44,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_middle.golden index d8373408b..daf24c780 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ - - "val1", + id = "newid" + ~ prop = [ + "val1", - "val2", "val3", - + "val1", ] } @@ -35,9 +34,8 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val3" - ~ [1]: "val2" => "val1" + ~ props: [ + ~ [1]: "val2" => "val3" - [2]: "val3" ] Resources: @@ -45,8 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_back.golden index e37dc03de..214d67ae9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_back.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ # (19 unchanged elements hidden) "value19", + "value20", @@ -70,12 +70,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ + [20]: "value20" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_front.golden index ae61d269a..ce6d001aa 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_added_front.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ + "value20", "value0", # (19 unchanged elements hidden) @@ -70,7 +70,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "value0" => "value20" ~ [1]: "value1" => "value0" ~ [2]: "value2" => "value1" @@ -98,26 +98,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[10]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[11]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[12]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[13]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[14]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[15]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[16]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[17]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[18]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[19]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[20]": map[string]interface{}{}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[3]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[4]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[5]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[6]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[7]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[8]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[9]": map[string]interface{}{"kind": "UPDATE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE"}, + "props[10]": map[string]interface{}{"kind": "UPDATE"}, + "props[11]": map[string]interface{}{"kind": "UPDATE"}, + "props[12]": map[string]interface{}{"kind": "UPDATE"}, + "props[13]": map[string]interface{}{"kind": "UPDATE"}, + "props[14]": map[string]interface{}{"kind": "UPDATE"}, + "props[15]": map[string]interface{}{"kind": "UPDATE"}, + "props[16]": map[string]interface{}{"kind": "UPDATE"}, + "props[17]": map[string]interface{}{"kind": "UPDATE"}, + "props[18]": map[string]interface{}{"kind": "UPDATE"}, + "props[19]": map[string]interface{}{"kind": "UPDATE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE"}, + "props[4]": map[string]interface{}{"kind": "UPDATE"}, + "props[5]": map[string]interface{}{"kind": "UPDATE"}, + "props[6]": map[string]interface{}{"kind": "UPDATE"}, + "props[7]": map[string]interface{}{"kind": "UPDATE"}, + "props[8]": map[string]interface{}{"kind": "UPDATE"}, + "props[9]": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_back.golden index 13c73f95c..9dc5116d7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_back.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ # (19 unchanged elements hidden) "value19", - "value20", @@ -70,12 +70,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ - [20]: "value20" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_front.golden index 79381a7c3..c99ae4eea 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/long_list_removed_front.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ - "value20", "value0", # (19 unchanged elements hidden) @@ -70,7 +70,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "value20" => "value0" ~ [1]: "value0" => "value1" ~ [2]: "value1" => "value2" @@ -98,26 +98,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[10]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[11]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[12]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[13]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[14]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[15]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[16]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[17]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[18]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[19]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[20]": map[string]interface{}{"kind": "DELETE"}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[3]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[4]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[5]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[6]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[7]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[8]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[9]": map[string]interface{}{"kind": "UPDATE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE"}, + "props[10]": map[string]interface{}{"kind": "UPDATE"}, + "props[11]": map[string]interface{}{"kind": "UPDATE"}, + "props[12]": map[string]interface{}{"kind": "UPDATE"}, + "props[13]": map[string]interface{}{"kind": "UPDATE"}, + "props[14]": map[string]interface{}{"kind": "UPDATE"}, + "props[15]": map[string]interface{}{"kind": "UPDATE"}, + "props[16]": map[string]interface{}{"kind": "UPDATE"}, + "props[17]": map[string]interface{}{"kind": "UPDATE"}, + "props[18]": map[string]interface{}{"kind": "UPDATE"}, + "props[19]": map[string]interface{}{"kind": "UPDATE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE"}, + "props[4]": map[string]interface{}{"kind": "UPDATE"}, + "props[5]": map[string]interface{}{"kind": "UPDATE"}, + "props[6]": map[string]interface{}{"kind": "UPDATE"}, + "props[7]": map[string]interface{}{"kind": "UPDATE"}, + "props[8]": map[string]interface{}{"kind": "UPDATE"}, + "props[9]": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/one_added,_one_removed.golden index 088ca9367..2f3739585 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/one_added,_one_removed.golden @@ -18,8 +18,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ ~ "val1" -> "val2", ~ "val2" -> "val3", ~ "val3" -> "val4", @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val1" => "val2" ~ [1]: "val2" => "val3" ~ [2]: "val3" => "val4" @@ -45,8 +45,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE"}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/removed_non-empty.golden index a9aa282e9..c2ddc3444 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute/removed_non-empty.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ - "val1", ] } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listAttrs: [ + - props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/added_non-empty.golden index 8170ba27d..d16c49fdf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/added_non-empty.golden @@ -11,8 +11,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - + list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + + prop = [ # forces replacement + "val1", ] } @@ -26,12 +26,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listAttrs: [ + + props: [ + [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/changed.golden index 48e3d2338..8340bfe86 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/changed.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement ~ "val1" -> "val2", ] } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val1" => "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_back.golden index 5d48729c4..8de9d5d9e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_back.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement # (1 unchanged element hidden) "val2", + "val3", @@ -34,12 +34,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ + [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_front.golden index 27cc4f86f..3ec61dbe2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_front.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement + "val1", "val2", # (1 unchanged element hidden) @@ -34,7 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val2" => "val1" ~ [1]: "val3" => "val2" + [2]: "val3" @@ -44,8 +44,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_middle.golden index 7d7ef68aa..8fbb74b1e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_added_middle.golden @@ -17,8 +17,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement "val1", + "val2", "val3", @@ -34,7 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [1]: "val3" => "val2" + [2]: "val3" ] @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_end.golden index 8edd22139..56479392a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement - - "val1", + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement + # (1 unchanged element hidden) "val2", - "val3", - + "val1", ] } @@ -35,18 +34,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val2" - ~ [1]: "val2" => "val1" + ~ props: [ - [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - }, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_front.golden index e171ece6c..3891d19f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement - "val1", - - "val2", - "val3", - + "val2", + "val2", + # (1 unchanged element hidden) ] } @@ -35,8 +34,9 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val3" + ~ props: [ + ~ [0]: "val1" => "val2" + ~ [1]: "val2" => "val3" - [2]: "val3" ] Resources: @@ -44,7 +44,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_middle.golden index 134bbf98e..fd7d886ea 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -17,12 +17,11 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement - - "val1", + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement + "val1", - "val2", "val3", - + "val1", ] } @@ -35,9 +34,8 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ - ~ [0]: "val1" => "val3" - ~ [1]: "val2" => "val1" + ~ props: [ + ~ [1]: "val2" => "val3" - [2]: "val3" ] Resources: @@ -45,8 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_back.golden index 429c0fe1b..883b06667 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_back.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement # (19 unchanged elements hidden) "value19", + "value20", @@ -70,12 +70,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ + [20]: "value20" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[20]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_front.golden index 2540d59c1..746255c1a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_added_front.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement + "value20", "value0", # (19 unchanged elements hidden) @@ -70,7 +70,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "value0" => "value20" ~ [1]: "value1" => "value0" ~ [2]: "value2" => "value1" @@ -98,26 +98,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[10]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[11]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[12]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[13]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[14]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[15]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[16]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[17]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[18]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[19]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[20]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[4]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[5]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[6]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[7]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[8]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[9]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[10]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[11]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[12]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[13]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[14]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[15]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[16]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[17]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[18]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[19]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[4]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[5]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[6]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[7]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[8]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[9]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_back.golden index a1a2b2405..6b60defe2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_back.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement # (19 unchanged elements hidden) "value19", - "value20", @@ -70,12 +70,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ - [20]: "value20" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_front.golden index 026739cee..43f682438 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/long_list_removed_front.golden @@ -53,8 +53,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement - "value20", "value0", # (19 unchanged elements hidden) @@ -70,7 +70,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "value20" => "value0" ~ [1]: "value0" => "value1" ~ [2]: "value1" => "value2" @@ -98,26 +98,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[10]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[11]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[12]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[13]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[14]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[15]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[16]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[17]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[18]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[19]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[4]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[5]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[6]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[7]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[8]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[9]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[10]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[11]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[12]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[13]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[14]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[15]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[16]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[17]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[18]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[19]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[4]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[5]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[6]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[7]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[8]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[9]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/one_added,_one_removed.golden index 631a0ebb0..01d406799 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/one_added,_one_removed.golden @@ -18,8 +18,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement ~ "val1" -> "val2", ~ "val2" -> "val3", ~ "val3" -> "val4", @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttrs: [ + ~ props: [ ~ [0]: "val1" => "val2" ~ [1]: "val2" => "val3" ~ [2]: "val3" => "val4" @@ -45,8 +45,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listAttrs[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "listAttrs[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/removed_non-empty.golden index ca7b8c267..98038985b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_attribute_force_new/removed_non-empty.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - - list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + - prop = [ # forces replacement - "val1", ] -> null } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listAttrs: [ + - props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttrs": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/added_non-empty.golden index d14312512..d12439f68 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/added_non-empty.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { - + prop = "val1" + + prop { + + nested_prop = "val1" } } @@ -27,14 +27,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlocks: [ + + props: [ + [0]: { - + prop : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/changed.golden index b2bedc1d1..54201bb79 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/changed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val2" + ~ prop { + ~ nested_prop = "val1" -> "val2" } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_back.golden index 3982f29d0..b9492b2c4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_back.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { - + prop = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_front.golden index ce38ccea8..998e8a35d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_front.golden @@ -19,14 +19,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val2" -> "val1" + ~ prop { + ~ nested_prop = "val2" -> "val1" } - ~ list_block { - ~ prop = "val3" -> "val2" + ~ prop { + ~ nested_prop = "val3" -> "val2" } - + list_block { - + prop = "val3" + + prop { + + nested_prop = "val3" } } @@ -39,15 +39,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ prop: "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: @@ -55,8 +55,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_middle.golden index 708a968c6..3f20da13c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_added_middle.golden @@ -19,11 +19,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val3" -> "val2" + ~ prop { + ~ nested_prop = "val3" -> "val2" } - + list_block { - + prop = "val3" + + prop { + + nested_prop = "val3" } # (1 unchanged block hidden) @@ -38,12 +38,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [1]: { - ~ prop: "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: @@ -51,7 +51,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_end.golden index 7f26041ed..07883d3e4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val2" - } - ~ list_block { - ~ prop = "val2" -> "val1" - } - - list_block { - - prop = "val3" -> null + - prop { + - nested_prop = "val3" -> null } + + # (2 unchanged blocks hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -39,24 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ prop: "val1" => "val2" - } - ~ [1]: { - ~ prop: "val2" => "val1" - } + ~ props: [ - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, - }, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_front.golden index f695583e5..98177cfbd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,14 +19,15 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val3" + ~ prop { + ~ nested_prop = "val1" -> "val2" } - - list_block { - - prop = "val3" -> null + ~ prop { + ~ nested_prop = "val2" -> "val3" + } + - prop { + - nested_prop = "val3" -> null } - - # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -38,12 +39,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val3" + ~ nestedProp: "val1" => "val2" + } + ~ [1]: { + ~ nestedProp: "val2" => "val3" } - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: @@ -51,7 +55,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_middle.golden index fad5f4aef..aee758dec 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val3" - } - ~ list_block { - ~ prop = "val2" -> "val1" + ~ prop { + ~ nested_prop = "val2" -> "val3" } - - list_block { - - prop = "val3" -> null + - prop { + - nested_prop = "val3" -> null } + + # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -39,15 +38,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ prop: "val1" => "val3" - } + ~ props: [ ~ [1]: { - ~ prop: "val2" => "val1" + ~ nestedProp: "val2" => "val3" } - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: @@ -55,8 +51,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_back.golden index 90b2551c9..4240f31a1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_back.golden @@ -55,8 +55,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { - + prop = "value20" + + prop { + + nested_prop = "value20" } # (20 unchanged blocks hidden) @@ -71,14 +71,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [20]: { - + prop : "value20" + + nestedProp: "value20" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_front.golden index 5ce2bf111..23ed7227d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_added_front.golden @@ -55,68 +55,68 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "value0" -> "value20" + ~ prop { + ~ nested_prop = "value0" -> "value20" } - ~ list_block { - ~ prop = "value1" -> "value0" + ~ prop { + ~ nested_prop = "value1" -> "value0" } - ~ list_block { - ~ prop = "value2" -> "value1" + ~ prop { + ~ nested_prop = "value2" -> "value1" } - ~ list_block { - ~ prop = "value3" -> "value2" + ~ prop { + ~ nested_prop = "value3" -> "value2" } - ~ list_block { - ~ prop = "value4" -> "value3" + ~ prop { + ~ nested_prop = "value4" -> "value3" } - ~ list_block { - ~ prop = "value5" -> "value4" + ~ prop { + ~ nested_prop = "value5" -> "value4" } - ~ list_block { - ~ prop = "value6" -> "value5" + ~ prop { + ~ nested_prop = "value6" -> "value5" } - ~ list_block { - ~ prop = "value7" -> "value6" + ~ prop { + ~ nested_prop = "value7" -> "value6" } - ~ list_block { - ~ prop = "value8" -> "value7" + ~ prop { + ~ nested_prop = "value8" -> "value7" } - ~ list_block { - ~ prop = "value9" -> "value8" + ~ prop { + ~ nested_prop = "value9" -> "value8" } - ~ list_block { - ~ prop = "value10" -> "value9" + ~ prop { + ~ nested_prop = "value10" -> "value9" } - ~ list_block { - ~ prop = "value11" -> "value10" + ~ prop { + ~ nested_prop = "value11" -> "value10" } - ~ list_block { - ~ prop = "value12" -> "value11" + ~ prop { + ~ nested_prop = "value12" -> "value11" } - ~ list_block { - ~ prop = "value13" -> "value12" + ~ prop { + ~ nested_prop = "value13" -> "value12" } - ~ list_block { - ~ prop = "value14" -> "value13" + ~ prop { + ~ nested_prop = "value14" -> "value13" } - ~ list_block { - ~ prop = "value15" -> "value14" + ~ prop { + ~ nested_prop = "value15" -> "value14" } - ~ list_block { - ~ prop = "value16" -> "value15" + ~ prop { + ~ nested_prop = "value16" -> "value15" } - ~ list_block { - ~ prop = "value17" -> "value16" + ~ prop { + ~ nested_prop = "value17" -> "value16" } - ~ list_block { - ~ prop = "value18" -> "value17" + ~ prop { + ~ nested_prop = "value18" -> "value17" } - ~ list_block { - ~ prop = "value19" -> "value18" + ~ prop { + ~ nested_prop = "value19" -> "value18" } - + list_block { - + prop = "value19" + + prop { + + nested_prop = "value19" } } @@ -129,69 +129,69 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "value0" => "value20" + ~ nestedProp: "value0" => "value20" } ~ [1]: { - ~ prop: "value1" => "value0" + ~ nestedProp: "value1" => "value0" } ~ [2]: { - ~ prop: "value2" => "value1" + ~ nestedProp: "value2" => "value1" } ~ [3]: { - ~ prop: "value3" => "value2" + ~ nestedProp: "value3" => "value2" } ~ [4]: { - ~ prop: "value4" => "value3" + ~ nestedProp: "value4" => "value3" } ~ [5]: { - ~ prop: "value5" => "value4" + ~ nestedProp: "value5" => "value4" } ~ [6]: { - ~ prop: "value6" => "value5" + ~ nestedProp: "value6" => "value5" } ~ [7]: { - ~ prop: "value7" => "value6" + ~ nestedProp: "value7" => "value6" } ~ [8]: { - ~ prop: "value8" => "value7" + ~ nestedProp: "value8" => "value7" } ~ [9]: { - ~ prop: "value9" => "value8" + ~ nestedProp: "value9" => "value8" } ~ [10]: { - ~ prop: "value10" => "value9" + ~ nestedProp: "value10" => "value9" } ~ [11]: { - ~ prop: "value11" => "value10" + ~ nestedProp: "value11" => "value10" } ~ [12]: { - ~ prop: "value12" => "value11" + ~ nestedProp: "value12" => "value11" } ~ [13]: { - ~ prop: "value13" => "value12" + ~ nestedProp: "value13" => "value12" } ~ [14]: { - ~ prop: "value14" => "value13" + ~ nestedProp: "value14" => "value13" } ~ [15]: { - ~ prop: "value15" => "value14" + ~ nestedProp: "value15" => "value14" } ~ [16]: { - ~ prop: "value16" => "value15" + ~ nestedProp: "value16" => "value15" } ~ [17]: { - ~ prop: "value17" => "value16" + ~ nestedProp: "value17" => "value16" } ~ [18]: { - ~ prop: "value18" => "value17" + ~ nestedProp: "value18" => "value17" } ~ [19]: { - ~ prop: "value19" => "value18" + ~ nestedProp: "value19" => "value18" } + [20]: { - + prop : "value19" + + nestedProp: "value19" } ] Resources: @@ -199,26 +199,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_back.golden index 113f594bf..f488aaafd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_back.golden @@ -55,8 +55,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block { - - prop = "value20" -> null + - prop { + - nested_prop = "value20" -> null } # (20 unchanged blocks hidden) @@ -71,14 +71,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [20]: { - - prop: "value20" + - nestedProp: "value20" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_front.golden index 86111f4fb..3dcef2640 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/long_list_removed_front.golden @@ -55,68 +55,68 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "value20" -> "value0" + ~ prop { + ~ nested_prop = "value20" -> "value0" } - ~ list_block { - ~ prop = "value0" -> "value1" + ~ prop { + ~ nested_prop = "value0" -> "value1" } - ~ list_block { - ~ prop = "value1" -> "value2" + ~ prop { + ~ nested_prop = "value1" -> "value2" } - ~ list_block { - ~ prop = "value2" -> "value3" + ~ prop { + ~ nested_prop = "value2" -> "value3" } - ~ list_block { - ~ prop = "value3" -> "value4" + ~ prop { + ~ nested_prop = "value3" -> "value4" } - ~ list_block { - ~ prop = "value4" -> "value5" + ~ prop { + ~ nested_prop = "value4" -> "value5" } - ~ list_block { - ~ prop = "value5" -> "value6" + ~ prop { + ~ nested_prop = "value5" -> "value6" } - ~ list_block { - ~ prop = "value6" -> "value7" + ~ prop { + ~ nested_prop = "value6" -> "value7" } - ~ list_block { - ~ prop = "value7" -> "value8" + ~ prop { + ~ nested_prop = "value7" -> "value8" } - ~ list_block { - ~ prop = "value8" -> "value9" + ~ prop { + ~ nested_prop = "value8" -> "value9" } - ~ list_block { - ~ prop = "value9" -> "value10" + ~ prop { + ~ nested_prop = "value9" -> "value10" } - ~ list_block { - ~ prop = "value10" -> "value11" + ~ prop { + ~ nested_prop = "value10" -> "value11" } - ~ list_block { - ~ prop = "value11" -> "value12" + ~ prop { + ~ nested_prop = "value11" -> "value12" } - ~ list_block { - ~ prop = "value12" -> "value13" + ~ prop { + ~ nested_prop = "value12" -> "value13" } - ~ list_block { - ~ prop = "value13" -> "value14" + ~ prop { + ~ nested_prop = "value13" -> "value14" } - ~ list_block { - ~ prop = "value14" -> "value15" + ~ prop { + ~ nested_prop = "value14" -> "value15" } - ~ list_block { - ~ prop = "value15" -> "value16" + ~ prop { + ~ nested_prop = "value15" -> "value16" } - ~ list_block { - ~ prop = "value16" -> "value17" + ~ prop { + ~ nested_prop = "value16" -> "value17" } - ~ list_block { - ~ prop = "value17" -> "value18" + ~ prop { + ~ nested_prop = "value17" -> "value18" } - ~ list_block { - ~ prop = "value18" -> "value19" + ~ prop { + ~ nested_prop = "value18" -> "value19" } - - list_block { - - prop = "value19" -> null + - prop { + - nested_prop = "value19" -> null } } @@ -129,69 +129,69 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "value20" => "value0" + ~ nestedProp: "value20" => "value0" } ~ [1]: { - ~ prop: "value0" => "value1" + ~ nestedProp: "value0" => "value1" } ~ [2]: { - ~ prop: "value1" => "value2" + ~ nestedProp: "value1" => "value2" } ~ [3]: { - ~ prop: "value2" => "value3" + ~ nestedProp: "value2" => "value3" } ~ [4]: { - ~ prop: "value3" => "value4" + ~ nestedProp: "value3" => "value4" } ~ [5]: { - ~ prop: "value4" => "value5" + ~ nestedProp: "value4" => "value5" } ~ [6]: { - ~ prop: "value5" => "value6" + ~ nestedProp: "value5" => "value6" } ~ [7]: { - ~ prop: "value6" => "value7" + ~ nestedProp: "value6" => "value7" } ~ [8]: { - ~ prop: "value7" => "value8" + ~ nestedProp: "value7" => "value8" } ~ [9]: { - ~ prop: "value8" => "value9" + ~ nestedProp: "value8" => "value9" } ~ [10]: { - ~ prop: "value9" => "value10" + ~ nestedProp: "value9" => "value10" } ~ [11]: { - ~ prop: "value10" => "value11" + ~ nestedProp: "value10" => "value11" } ~ [12]: { - ~ prop: "value11" => "value12" + ~ nestedProp: "value11" => "value12" } ~ [13]: { - ~ prop: "value12" => "value13" + ~ nestedProp: "value12" => "value13" } ~ [14]: { - ~ prop: "value13" => "value14" + ~ nestedProp: "value13" => "value14" } ~ [15]: { - ~ prop: "value14" => "value15" + ~ nestedProp: "value14" => "value15" } ~ [16]: { - ~ prop: "value15" => "value16" + ~ nestedProp: "value15" => "value16" } ~ [17]: { - ~ prop: "value16" => "value17" + ~ nestedProp: "value16" => "value17" } ~ [18]: { - ~ prop: "value17" => "value18" + ~ nestedProp: "value17" => "value18" } ~ [19]: { - ~ prop: "value18" => "value19" + ~ nestedProp: "value18" => "value19" } - [20]: { - - prop: "value19" + - nestedProp: "value19" } ] Resources: @@ -199,26 +199,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{"kind": "DELETE"}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "DELETE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/one_added,_one_removed.golden index 5658a65a0..cce9003da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/one_added,_one_removed.golden @@ -20,14 +20,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val2" + ~ prop { + ~ nested_prop = "val1" -> "val2" } - ~ list_block { - ~ prop = "val2" -> "val3" + ~ prop { + ~ nested_prop = "val2" -> "val3" } - ~ list_block { - ~ prop = "val3" -> "val4" + ~ prop { + ~ nested_prop = "val3" -> "val4" } } @@ -40,15 +40,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ prop: "val2" => "val3" + ~ nestedProp: "val2" => "val3" } ~ [2]: { - ~ prop: "val3" => "val4" + ~ nestedProp: "val3" => "val4" } ] Resources: @@ -56,8 +56,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/removed_non-empty.golden index 2a5627b74..0657a3f5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block/removed_non-empty.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block { - - prop = "val1" -> null + - prop { + - nested_prop = "val1" -> null } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlocks: [ + - props: [ - [0]: { - - prop: "val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/added_non-empty.golden index ecf8be3f2..1ac108e18 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/added_non-empty.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + list_block { # forces replacement - + prop = "val1" + + prop { # forces replacement + + nested_prop = "val1" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlocks: [ + + props: [ + [0]: { - + prop : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/changed.golden index b2bedc1d1..54201bb79 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/changed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val2" + ~ prop { + ~ nested_prop = "val1" -> "val2" } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_back.golden index 6f65e800c..382247dc8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_back.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + list_block { # forces replacement - + prop = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_front.golden index db3969bd2..5fd8463e0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_front.golden @@ -19,14 +19,14 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "val2" -> "val1" + ~ prop { # forces replacement + ~ nested_prop = "val2" -> "val1" } - ~ list_block { # forces replacement - ~ prop = "val3" -> "val2" + ~ prop { # forces replacement + ~ nested_prop = "val3" -> "val2" } - + list_block { # forces replacement - + prop = "val3" + + prop { # forces replacement + + nested_prop = "val3" } } @@ -39,15 +39,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ prop: "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: @@ -55,8 +55,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_middle.golden index 702605e95..4920bd47b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_added_middle.golden @@ -19,11 +19,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "val3" -> "val2" + ~ prop { # forces replacement + ~ nested_prop = "val3" -> "val2" } - + list_block { # forces replacement - + prop = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (1 unchanged block hidden) @@ -38,12 +38,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [1]: { - ~ prop: "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + prop : "val3" + + nestedProp: "val3" } ] Resources: @@ -51,7 +51,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_end.golden index 205bac165..7c52650c3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "val1" -> "val2" - } - ~ list_block { # forces replacement - ~ prop = "val2" -> "val1" - } - - list_block { # forces replacement - - prop = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } + + # (2 unchanged blocks hidden) } Plan: 1 to add, 0 to change, 1 to destroy. @@ -39,24 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ prop: "val1" => "val2" - } - ~ [1]: { - ~ prop: "val2" => "val1" - } + ~ props: [ - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - }, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_front.golden index 9a92bb6cc..a051a1b23 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,14 +19,15 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "val1" -> "val3" + ~ prop { # forces replacement + ~ nested_prop = "val1" -> "val2" } - - list_block { # forces replacement - - prop = "val3" -> null + ~ prop { # forces replacement + ~ nested_prop = "val2" -> "val3" + } + - prop { # forces replacement + - nested_prop = "val3" -> null } - - # (1 unchanged block hidden) } Plan: 1 to add, 0 to change, 1 to destroy. @@ -38,12 +39,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val3" + ~ nestedProp: "val1" => "val2" + } + ~ [1]: { + ~ nestedProp: "val2" => "val3" } - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: @@ -51,7 +55,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_middle.golden index fe9e940b6..d64909b3b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,14 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "val1" -> "val3" - } - ~ list_block { # forces replacement - ~ prop = "val2" -> "val1" + ~ prop { # forces replacement + ~ nested_prop = "val2" -> "val3" } - - list_block { # forces replacement - - prop = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } + + # (1 unchanged block hidden) } Plan: 1 to add, 0 to change, 1 to destroy. @@ -39,15 +38,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ prop: "val1" => "val3" - } + ~ props: [ ~ [1]: { - ~ prop: "val2" => "val1" + ~ nestedProp: "val2" => "val3" } - [2]: { - - prop: "val3" + - nestedProp: "val3" } ] Resources: @@ -55,8 +51,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_back.golden index f5a98ba62..ae23b50df 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_back.golden @@ -55,8 +55,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + list_block { # forces replacement - + prop = "value20" + + prop { # forces replacement + + nested_prop = "value20" } # (20 unchanged blocks hidden) @@ -71,14 +71,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [20]: { - + prop : "value20" + + nestedProp: "value20" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_front.golden index ce1f68dc3..846b33b64 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_added_front.golden @@ -55,68 +55,68 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "value0" -> "value20" + ~ prop { # forces replacement + ~ nested_prop = "value0" -> "value20" } - ~ list_block { # forces replacement - ~ prop = "value1" -> "value0" + ~ prop { # forces replacement + ~ nested_prop = "value1" -> "value0" } - ~ list_block { # forces replacement - ~ prop = "value2" -> "value1" + ~ prop { # forces replacement + ~ nested_prop = "value2" -> "value1" } - ~ list_block { # forces replacement - ~ prop = "value3" -> "value2" + ~ prop { # forces replacement + ~ nested_prop = "value3" -> "value2" } - ~ list_block { # forces replacement - ~ prop = "value4" -> "value3" + ~ prop { # forces replacement + ~ nested_prop = "value4" -> "value3" } - ~ list_block { # forces replacement - ~ prop = "value5" -> "value4" + ~ prop { # forces replacement + ~ nested_prop = "value5" -> "value4" } - ~ list_block { # forces replacement - ~ prop = "value6" -> "value5" + ~ prop { # forces replacement + ~ nested_prop = "value6" -> "value5" } - ~ list_block { # forces replacement - ~ prop = "value7" -> "value6" + ~ prop { # forces replacement + ~ nested_prop = "value7" -> "value6" } - ~ list_block { # forces replacement - ~ prop = "value8" -> "value7" + ~ prop { # forces replacement + ~ nested_prop = "value8" -> "value7" } - ~ list_block { # forces replacement - ~ prop = "value9" -> "value8" + ~ prop { # forces replacement + ~ nested_prop = "value9" -> "value8" } - ~ list_block { # forces replacement - ~ prop = "value10" -> "value9" + ~ prop { # forces replacement + ~ nested_prop = "value10" -> "value9" } - ~ list_block { # forces replacement - ~ prop = "value11" -> "value10" + ~ prop { # forces replacement + ~ nested_prop = "value11" -> "value10" } - ~ list_block { # forces replacement - ~ prop = "value12" -> "value11" + ~ prop { # forces replacement + ~ nested_prop = "value12" -> "value11" } - ~ list_block { # forces replacement - ~ prop = "value13" -> "value12" + ~ prop { # forces replacement + ~ nested_prop = "value13" -> "value12" } - ~ list_block { # forces replacement - ~ prop = "value14" -> "value13" + ~ prop { # forces replacement + ~ nested_prop = "value14" -> "value13" } - ~ list_block { # forces replacement - ~ prop = "value15" -> "value14" + ~ prop { # forces replacement + ~ nested_prop = "value15" -> "value14" } - ~ list_block { # forces replacement - ~ prop = "value16" -> "value15" + ~ prop { # forces replacement + ~ nested_prop = "value16" -> "value15" } - ~ list_block { # forces replacement - ~ prop = "value17" -> "value16" + ~ prop { # forces replacement + ~ nested_prop = "value17" -> "value16" } - ~ list_block { # forces replacement - ~ prop = "value18" -> "value17" + ~ prop { # forces replacement + ~ nested_prop = "value18" -> "value17" } - ~ list_block { # forces replacement - ~ prop = "value19" -> "value18" + ~ prop { # forces replacement + ~ nested_prop = "value19" -> "value18" } - + list_block { # forces replacement - + prop = "value19" + + prop { # forces replacement + + nested_prop = "value19" } } @@ -129,69 +129,69 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "value0" => "value20" + ~ nestedProp: "value0" => "value20" } ~ [1]: { - ~ prop: "value1" => "value0" + ~ nestedProp: "value1" => "value0" } ~ [2]: { - ~ prop: "value2" => "value1" + ~ nestedProp: "value2" => "value1" } ~ [3]: { - ~ prop: "value3" => "value2" + ~ nestedProp: "value3" => "value2" } ~ [4]: { - ~ prop: "value4" => "value3" + ~ nestedProp: "value4" => "value3" } ~ [5]: { - ~ prop: "value5" => "value4" + ~ nestedProp: "value5" => "value4" } ~ [6]: { - ~ prop: "value6" => "value5" + ~ nestedProp: "value6" => "value5" } ~ [7]: { - ~ prop: "value7" => "value6" + ~ nestedProp: "value7" => "value6" } ~ [8]: { - ~ prop: "value8" => "value7" + ~ nestedProp: "value8" => "value7" } ~ [9]: { - ~ prop: "value9" => "value8" + ~ nestedProp: "value9" => "value8" } ~ [10]: { - ~ prop: "value10" => "value9" + ~ nestedProp: "value10" => "value9" } ~ [11]: { - ~ prop: "value11" => "value10" + ~ nestedProp: "value11" => "value10" } ~ [12]: { - ~ prop: "value12" => "value11" + ~ nestedProp: "value12" => "value11" } ~ [13]: { - ~ prop: "value13" => "value12" + ~ nestedProp: "value13" => "value12" } ~ [14]: { - ~ prop: "value14" => "value13" + ~ nestedProp: "value14" => "value13" } ~ [15]: { - ~ prop: "value15" => "value14" + ~ nestedProp: "value15" => "value14" } ~ [16]: { - ~ prop: "value16" => "value15" + ~ nestedProp: "value16" => "value15" } ~ [17]: { - ~ prop: "value17" => "value16" + ~ nestedProp: "value17" => "value16" } ~ [18]: { - ~ prop: "value18" => "value17" + ~ nestedProp: "value18" => "value17" } ~ [19]: { - ~ prop: "value19" => "value18" + ~ nestedProp: "value19" => "value18" } + [20]: { - + prop : "value19" + + nestedProp: "value19" } ] Resources: @@ -199,26 +199,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_back.golden index 4117bc078..7d59072ba 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_back.golden @@ -55,8 +55,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - list_block { # forces replacement - - prop = "value20" -> null + - prop { # forces replacement + - nested_prop = "value20" -> null } # (20 unchanged blocks hidden) @@ -71,14 +71,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [20]: { - - prop: "value20" + - nestedProp: "value20" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_front.golden index e13e11347..ea5434a04 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/long_list_removed_front.golden @@ -55,68 +55,68 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { # forces replacement - ~ prop = "value20" -> "value0" + ~ prop { # forces replacement + ~ nested_prop = "value20" -> "value0" } - ~ list_block { # forces replacement - ~ prop = "value0" -> "value1" + ~ prop { # forces replacement + ~ nested_prop = "value0" -> "value1" } - ~ list_block { # forces replacement - ~ prop = "value1" -> "value2" + ~ prop { # forces replacement + ~ nested_prop = "value1" -> "value2" } - ~ list_block { # forces replacement - ~ prop = "value2" -> "value3" + ~ prop { # forces replacement + ~ nested_prop = "value2" -> "value3" } - ~ list_block { # forces replacement - ~ prop = "value3" -> "value4" + ~ prop { # forces replacement + ~ nested_prop = "value3" -> "value4" } - ~ list_block { # forces replacement - ~ prop = "value4" -> "value5" + ~ prop { # forces replacement + ~ nested_prop = "value4" -> "value5" } - ~ list_block { # forces replacement - ~ prop = "value5" -> "value6" + ~ prop { # forces replacement + ~ nested_prop = "value5" -> "value6" } - ~ list_block { # forces replacement - ~ prop = "value6" -> "value7" + ~ prop { # forces replacement + ~ nested_prop = "value6" -> "value7" } - ~ list_block { # forces replacement - ~ prop = "value7" -> "value8" + ~ prop { # forces replacement + ~ nested_prop = "value7" -> "value8" } - ~ list_block { # forces replacement - ~ prop = "value8" -> "value9" + ~ prop { # forces replacement + ~ nested_prop = "value8" -> "value9" } - ~ list_block { # forces replacement - ~ prop = "value9" -> "value10" + ~ prop { # forces replacement + ~ nested_prop = "value9" -> "value10" } - ~ list_block { # forces replacement - ~ prop = "value10" -> "value11" + ~ prop { # forces replacement + ~ nested_prop = "value10" -> "value11" } - ~ list_block { # forces replacement - ~ prop = "value11" -> "value12" + ~ prop { # forces replacement + ~ nested_prop = "value11" -> "value12" } - ~ list_block { # forces replacement - ~ prop = "value12" -> "value13" + ~ prop { # forces replacement + ~ nested_prop = "value12" -> "value13" } - ~ list_block { # forces replacement - ~ prop = "value13" -> "value14" + ~ prop { # forces replacement + ~ nested_prop = "value13" -> "value14" } - ~ list_block { # forces replacement - ~ prop = "value14" -> "value15" + ~ prop { # forces replacement + ~ nested_prop = "value14" -> "value15" } - ~ list_block { # forces replacement - ~ prop = "value15" -> "value16" + ~ prop { # forces replacement + ~ nested_prop = "value15" -> "value16" } - ~ list_block { # forces replacement - ~ prop = "value16" -> "value17" + ~ prop { # forces replacement + ~ nested_prop = "value16" -> "value17" } - ~ list_block { # forces replacement - ~ prop = "value17" -> "value18" + ~ prop { # forces replacement + ~ nested_prop = "value17" -> "value18" } - ~ list_block { # forces replacement - ~ prop = "value18" -> "value19" + ~ prop { # forces replacement + ~ nested_prop = "value18" -> "value19" } - - list_block { # forces replacement - - prop = "value19" -> null + - prop { # forces replacement + - nested_prop = "value19" -> null } } @@ -129,69 +129,69 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "value20" => "value0" + ~ nestedProp: "value20" => "value0" } ~ [1]: { - ~ prop: "value0" => "value1" + ~ nestedProp: "value0" => "value1" } ~ [2]: { - ~ prop: "value1" => "value2" + ~ nestedProp: "value1" => "value2" } ~ [3]: { - ~ prop: "value2" => "value3" + ~ nestedProp: "value2" => "value3" } ~ [4]: { - ~ prop: "value3" => "value4" + ~ nestedProp: "value3" => "value4" } ~ [5]: { - ~ prop: "value4" => "value5" + ~ nestedProp: "value4" => "value5" } ~ [6]: { - ~ prop: "value5" => "value6" + ~ nestedProp: "value5" => "value6" } ~ [7]: { - ~ prop: "value6" => "value7" + ~ nestedProp: "value6" => "value7" } ~ [8]: { - ~ prop: "value7" => "value8" + ~ nestedProp: "value7" => "value8" } ~ [9]: { - ~ prop: "value8" => "value9" + ~ nestedProp: "value8" => "value9" } ~ [10]: { - ~ prop: "value9" => "value10" + ~ nestedProp: "value9" => "value10" } ~ [11]: { - ~ prop: "value10" => "value11" + ~ nestedProp: "value10" => "value11" } ~ [12]: { - ~ prop: "value11" => "value12" + ~ nestedProp: "value11" => "value12" } ~ [13]: { - ~ prop: "value12" => "value13" + ~ nestedProp: "value12" => "value13" } ~ [14]: { - ~ prop: "value13" => "value14" + ~ nestedProp: "value13" => "value14" } ~ [15]: { - ~ prop: "value14" => "value15" + ~ nestedProp: "value14" => "value15" } ~ [16]: { - ~ prop: "value15" => "value16" + ~ nestedProp: "value15" => "value16" } ~ [17]: { - ~ prop: "value16" => "value17" + ~ nestedProp: "value16" => "value17" } ~ [18]: { - ~ prop: "value17" => "value18" + ~ nestedProp: "value17" => "value18" } ~ [19]: { - ~ prop: "value18" => "value19" + ~ nestedProp: "value18" => "value19" } - [20]: { - - prop: "value19" + - nestedProp: "value19" } ] Resources: @@ -199,26 +199,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/one_added,_one_removed.golden index 5658a65a0..cce9003da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/one_added,_one_removed.golden @@ -20,14 +20,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ prop = "val1" -> "val2" + ~ prop { + ~ nested_prop = "val1" -> "val2" } - ~ list_block { - ~ prop = "val2" -> "val3" + ~ prop { + ~ nested_prop = "val2" -> "val3" } - ~ list_block { - ~ prop = "val3" -> "val4" + ~ prop { + ~ nested_prop = "val3" -> "val4" } } @@ -40,15 +40,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { - ~ prop: "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ prop: "val2" => "val3" + ~ nestedProp: "val2" => "val3" } ~ [2]: { - ~ prop: "val3" => "val4" + ~ nestedProp: "val3" => "val4" } ] Resources: @@ -56,8 +56,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].prop": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2].prop": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/removed_non-empty.golden index 84b83a363..f988ffbc5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_force_new/removed_non-empty.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - list_block { # forces replacement - - prop = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlocks: [ + - props: [ - [0]: { - - prop: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/added_non-empty.golden index c74107103..72da74dab 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/added_non-empty.golden @@ -5,33 +5,36 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} + + prop { + + nested_prop = "val1" # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlocks: [ + + props: [ + [0]: { + + nestedProp: "val1" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/changed.golden index b9ed46f8e..b0d4a7501 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/changed.golden @@ -4,15 +4,38 @@ tests.testOutput{ }, changeValue: &[]string{"val2"}, tfOut: ` -No changes. Your infrastructure matches the configuration. +Terraform used the selected providers to generate the following execution +plan. Resource actions are indicated with the following symbols: ++/- create replacement and then destroy + +Terraform will perform the following actions: + + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) + + ~ prop { + ~ nested_prop = "val1" -> "val2" # forces replacement + } + } + +Plan: 1 to add, 0 to change, 1 to destroy. -Terraform has compared your real infrastructure against your configuration -and found no differences, so no changes are needed. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] + +-crossprovider:index/testRes:TestRes: (replace) + [id=newid] + [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] + ~ props: [ + ~ [0]: { + ~ nestedProp: "val1" => "val2" + } + ] Resources: - 2 unchanged + +-1 to replace + 1 unchanged `, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_back.golden index f004cc40c..385b0bc70 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_back.golden @@ -11,35 +11,38 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} + + prop { + + nested_prop = "val3" # forces replacement + } # (2 unchanged blocks hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [2]: { + + nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_front.golden index 6b6068947..95f4ab12c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_front.golden @@ -11,35 +11,52 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} - - # (2 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "val2" -> "val1" # forces replacement + } + ~ prop { + ~ nested_prop = "val3" -> "val2" # forces replacement + } + + prop { + + nested_prop = "val3" # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: "val2" => "val1" + } + ~ [1]: { + ~ nestedProp: "val3" => "val2" + } + [2]: { + + nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_middle.golden index 4828a7d56..6d193beb0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_added_middle.golden @@ -11,35 +11,47 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} + ~ prop { + ~ nested_prop = "val3" -> "val2" # forces replacement + } + + prop { + + nested_prop = "val3" # forces replacement + } - # (2 unchanged blocks hidden) + # (1 unchanged block hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [1]: { + ~ nestedProp: "val3" => "val2" + } + [2]: { + + nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_end.golden index 9333e7525..e1e02952b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_end.golden @@ -5,42 +5,44 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - - list_block {} + - prop { + - nested_prop = "val3" -> null # forces replacement + } # (2 unchanged blocks hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [2]: { - - nestedProp: + - nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_front.golden index 34709388a..c745cab77 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_front.golden @@ -5,42 +5,58 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" - - - list_block {} + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - # (2 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "val1" -> "val2" # forces replacement + } + ~ prop { + ~ nested_prop = "val2" -> "val3" # forces replacement + } + - prop { + - nested_prop = "val3" -> null # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: "val1" => "val2" + } + ~ [1]: { + ~ nestedProp: "val2" => "val3" + } - [2]: { - - nestedProp: + - nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_middle.golden index 0d7ba5196..bc50cfe85 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/list_element_removed_middle.golden @@ -5,42 +5,53 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - - list_block {} + ~ prop { + ~ nested_prop = "val2" -> "val3" # forces replacement + } + - prop { + - nested_prop = "val3" -> null # forces replacement + } - # (2 unchanged blocks hidden) + # (1 unchanged block hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [1]: { + ~ nestedProp: "val2" => "val3" + } - [2]: { - - nestedProp: + - nestedProp: "val3" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_back.golden index 408c0efc5..bdf675039 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_back.golden @@ -47,35 +47,38 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} + + prop { + + nested_prop = "value20" # forces replacement + } # (20 unchanged blocks hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [20]: { + + nestedProp: "value20" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_front.golden index fe72a40b9..42cccc44c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_added_front.golden @@ -47,35 +47,178 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - + list_block {} - - # (20 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "value0" -> "value20" # forces replacement + } + ~ prop { + ~ nested_prop = "value1" -> "value0" # forces replacement + } + ~ prop { + ~ nested_prop = "value2" -> "value1" # forces replacement + } + ~ prop { + ~ nested_prop = "value3" -> "value2" # forces replacement + } + ~ prop { + ~ nested_prop = "value4" -> "value3" # forces replacement + } + ~ prop { + ~ nested_prop = "value5" -> "value4" # forces replacement + } + ~ prop { + ~ nested_prop = "value6" -> "value5" # forces replacement + } + ~ prop { + ~ nested_prop = "value7" -> "value6" # forces replacement + } + ~ prop { + ~ nested_prop = "value8" -> "value7" # forces replacement + } + ~ prop { + ~ nested_prop = "value9" -> "value8" # forces replacement + } + ~ prop { + ~ nested_prop = "value10" -> "value9" # forces replacement + } + ~ prop { + ~ nested_prop = "value11" -> "value10" # forces replacement + } + ~ prop { + ~ nested_prop = "value12" -> "value11" # forces replacement + } + ~ prop { + ~ nested_prop = "value13" -> "value12" # forces replacement + } + ~ prop { + ~ nested_prop = "value14" -> "value13" # forces replacement + } + ~ prop { + ~ nested_prop = "value15" -> "value14" # forces replacement + } + ~ prop { + ~ nested_prop = "value16" -> "value15" # forces replacement + } + ~ prop { + ~ nested_prop = "value17" -> "value16" # forces replacement + } + ~ prop { + ~ nested_prop = "value18" -> "value17" # forces replacement + } + ~ prop { + ~ nested_prop = "value19" -> "value18" # forces replacement + } + + prop { + + nested_prop = "value19" # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: "value0" => "value20" + } + ~ [1]: { + ~ nestedProp: "value1" => "value0" + } + ~ [2]: { + ~ nestedProp: "value2" => "value1" + } + ~ [3]: { + ~ nestedProp: "value3" => "value2" + } + ~ [4]: { + ~ nestedProp: "value4" => "value3" + } + ~ [5]: { + ~ nestedProp: "value5" => "value4" + } + ~ [6]: { + ~ nestedProp: "value6" => "value5" + } + ~ [7]: { + ~ nestedProp: "value7" => "value6" + } + ~ [8]: { + ~ nestedProp: "value8" => "value7" + } + ~ [9]: { + ~ nestedProp: "value9" => "value8" + } + ~ [10]: { + ~ nestedProp: "value10" => "value9" + } + ~ [11]: { + ~ nestedProp: "value11" => "value10" + } + ~ [12]: { + ~ nestedProp: "value12" => "value11" + } + ~ [13]: { + ~ nestedProp: "value13" => "value12" + } + ~ [14]: { + ~ nestedProp: "value14" => "value13" + } + ~ [15]: { + ~ nestedProp: "value15" => "value14" + } + ~ [16]: { + ~ nestedProp: "value16" => "value15" + } + ~ [17]: { + ~ nestedProp: "value17" => "value16" + } + ~ [18]: { + ~ nestedProp: "value18" => "value17" + } + ~ [19]: { + ~ nestedProp: "value19" => "value18" + } + [20]: { + + nestedProp: "value19" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[20]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_back.golden index 9f62cfbb7..5b6793a25 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_back.golden @@ -47,36 +47,38 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - - list_block {} + - prop { + - nested_prop = "value20" -> null # forces replacement + } # (20 unchanged blocks hidden) } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [20]: { - - nestedProp: + - nestedProp: "value20" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_front.golden index a9c7e5f1a..70aea4160 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/long_list_removed_front.golden @@ -47,36 +47,178 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - - list_block {} - - # (20 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "value20" -> "value0" # forces replacement + } + ~ prop { + ~ nested_prop = "value0" -> "value1" # forces replacement + } + ~ prop { + ~ nested_prop = "value1" -> "value2" # forces replacement + } + ~ prop { + ~ nested_prop = "value2" -> "value3" # forces replacement + } + ~ prop { + ~ nested_prop = "value3" -> "value4" # forces replacement + } + ~ prop { + ~ nested_prop = "value4" -> "value5" # forces replacement + } + ~ prop { + ~ nested_prop = "value5" -> "value6" # forces replacement + } + ~ prop { + ~ nested_prop = "value6" -> "value7" # forces replacement + } + ~ prop { + ~ nested_prop = "value7" -> "value8" # forces replacement + } + ~ prop { + ~ nested_prop = "value8" -> "value9" # forces replacement + } + ~ prop { + ~ nested_prop = "value9" -> "value10" # forces replacement + } + ~ prop { + ~ nested_prop = "value10" -> "value11" # forces replacement + } + ~ prop { + ~ nested_prop = "value11" -> "value12" # forces replacement + } + ~ prop { + ~ nested_prop = "value12" -> "value13" # forces replacement + } + ~ prop { + ~ nested_prop = "value13" -> "value14" # forces replacement + } + ~ prop { + ~ nested_prop = "value14" -> "value15" # forces replacement + } + ~ prop { + ~ nested_prop = "value15" -> "value16" # forces replacement + } + ~ prop { + ~ nested_prop = "value16" -> "value17" # forces replacement + } + ~ prop { + ~ nested_prop = "value17" -> "value18" # forces replacement + } + ~ prop { + ~ nested_prop = "value18" -> "value19" # forces replacement + } + - prop { + - nested_prop = "value19" -> null # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: "value20" => "value0" + } + ~ [1]: { + ~ nestedProp: "value0" => "value1" + } + ~ [2]: { + ~ nestedProp: "value1" => "value2" + } + ~ [3]: { + ~ nestedProp: "value2" => "value3" + } + ~ [4]: { + ~ nestedProp: "value3" => "value4" + } + ~ [5]: { + ~ nestedProp: "value4" => "value5" + } + ~ [6]: { + ~ nestedProp: "value5" => "value6" + } + ~ [7]: { + ~ nestedProp: "value6" => "value7" + } + ~ [8]: { + ~ nestedProp: "value7" => "value8" + } + ~ [9]: { + ~ nestedProp: "value8" => "value9" + } + ~ [10]: { + ~ nestedProp: "value9" => "value10" + } + ~ [11]: { + ~ nestedProp: "value10" => "value11" + } + ~ [12]: { + ~ nestedProp: "value11" => "value12" + } + ~ [13]: { + ~ nestedProp: "value12" => "value13" + } + ~ [14]: { + ~ nestedProp: "value13" => "value14" + } + ~ [15]: { + ~ nestedProp: "value14" => "value15" + } + ~ [16]: { + ~ nestedProp: "value15" => "value16" + } + ~ [17]: { + ~ nestedProp: "value16" => "value17" + } + ~ [18]: { + ~ nestedProp: "value17" => "value18" + } + ~ [19]: { + ~ nestedProp: "value18" => "value19" + } - [20]: { - - nestedProp: + - nestedProp: "value19" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[20]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/one_added,_one_removed.golden index ec6d9dee0..daf070371 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/one_added,_one_removed.golden @@ -10,15 +10,54 @@ tests.testOutput{ "val4", }, tfOut: ` -No changes. Your infrastructure matches the configuration. +Terraform used the selected providers to generate the following execution +plan. Resource actions are indicated with the following symbols: ++/- create replacement and then destroy + +Terraform will perform the following actions: + + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) + + ~ prop { + ~ nested_prop = "val1" -> "val2" # forces replacement + } + ~ prop { + ~ nested_prop = "val2" -> "val3" # forces replacement + } + ~ prop { + ~ nested_prop = "val3" -> "val4" # forces replacement + } + } + +Plan: 1 to add, 0 to change, 1 to destroy. -Terraform has compared your real infrastructure against your configuration -and found no differences, so no changes are needed. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] + +-crossprovider:index/testRes:TestRes: (replace) + [id=newid] + [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] + ~ props: [ + ~ [0]: { + ~ nestedProp: "val1" => "val2" + } + ~ [1]: { + ~ nestedProp: "val2" => "val3" + } + ~ [2]: { + ~ nestedProp: "val3" => "val4" + } + ] Resources: - 2 unchanged + +-1 to replace + 1 unchanged `, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/removed_non-empty.golden index 6dffd4945..6ec94c4b6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_force_new/removed_non-empty.golden @@ -6,34 +6,36 @@ tests.testOutput{ tfOut: ` Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - ~ update in-place ++/- create replacement and then destroy Terraform will perform the following actions: - # crossprovider_test_res.example will be updated in-place - ~ resource "crossprovider_test_res" "example" { - id = "newid" + # crossprovider_test_res.example must be replaced ++/- resource "crossprovider_test_res" "example" { + ~ id = "newid" -> (known after apply) - - list_block {} + - prop { + - nested_prop = "val1" -> null # forces replacement + } } -Plan: 0 to add, 1 to change, 0 to destroy. +Plan: 1 to add, 0 to change, 1 to destroy. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] - ~ crossprovider:index/testRes:TestRes: (update) + +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlocks: [ + - props: [ - [0]: { - - nestedProp: + - nestedProp: "val1" } ] Resources: - ~ 1 to update + +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/added_non-empty.golden index 5223e1bcd..d4026f646 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/added_non-empty.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { + + prop { + nested_prop = (sensitive value) } } @@ -27,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlocks: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/changed.golden index 43dec4d44..5895d5431 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/changed.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } } @@ -28,7 +28,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } @@ -37,5 +37,5 @@ Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_back.golden index c294ca3ba..2b6e15886 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_back.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { + + prop { + nested_prop = (sensitive value) } @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_front.golden index 4c115f66d..f5f8778bd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_front.golden @@ -19,13 +19,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - + list_block { + + prop { + nested_prop = (sensitive value) } } @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } @@ -53,8 +53,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_middle.golden index 8a97ff02c..9fea77f6d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_added_middle.golden @@ -19,10 +19,10 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - + list_block { + + prop { + nested_prop = (sensitive value) } @@ -38,7 +38,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [1]: { ~ nestedProp: [secret] => [secret] } @@ -49,7 +49,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_end.golden index 718e408ef..b2f9c16f5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ nested_prop = (sensitive value) - } - ~ list_block { - ~ nested_prop = (sensitive value) - } - - list_block { + - prop { - nested_prop = (sensitive value) -> null } + + # (2 unchanged blocks hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -39,22 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ nestedProp: [secret] => [secret] - } - ~ [1]: { - ~ nestedProp: [secret] => [secret] - } + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, - }, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_front.golden index 5bafd4933..e80e3b950 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,14 +19,15 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { + ~ nested_prop = (sensitive value) + } + ~ prop { ~ nested_prop = (sensitive value) } - - list_block { + - prop { - nested_prop = (sensitive value) -> null } - - # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -38,10 +39,13 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } - [2]: [secret] ] Resources: @@ -49,7 +53,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_middle.golden index 04310cb96..995344c2e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,15 +19,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { - ~ nested_prop = (sensitive value) - } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - - list_block { + - prop { - nested_prop = (sensitive value) -> null } + + # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -39,10 +38,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ - ~ [0]: { - ~ nestedProp: [secret] => [secret] - } + ~ props: [ ~ [1]: { ~ nestedProp: [secret] => [secret] } @@ -53,8 +49,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_back.golden index 6749f69bb..35d54ab6b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_back.golden @@ -55,7 +55,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { + + prop { + nested_prop = (sensitive value) } @@ -71,12 +71,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_front.golden index 882879945..086d17085 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_added_front.golden @@ -55,67 +55,67 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - + list_block { + + prop { + nested_prop = (sensitive value) } } @@ -129,7 +129,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } @@ -197,26 +197,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{}, - "listBlocks[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_back.golden index 87345930e..3337c5506 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_back.golden @@ -55,7 +55,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block { + - prop { - nested_prop = (sensitive value) -> null } @@ -71,12 +71,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_front.golden index 45e20b21c..2f4a68d94 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/long_list_removed_front.golden @@ -55,67 +55,67 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - - list_block { + - prop { - nested_prop = (sensitive value) -> null } } @@ -129,7 +129,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } @@ -197,26 +197,26 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[20]": map[string]interface{}{"kind": "DELETE"}, - "listBlocks[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "DELETE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/one_added,_one_removed.golden index 471464b24..c6dd4232b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/one_added,_one_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } - ~ list_block { + ~ prop { ~ nested_prop = (sensitive value) } } @@ -40,7 +40,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ ~ [0]: { ~ nestedProp: [secret] => [secret] } @@ -56,8 +56,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "listBlocks[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, - "listBlocks[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/removed_non-empty.golden index 5890d10e6..78db7a940 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_nested_sensitive/removed_non-empty.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block { + - prop { - nested_prop = (sensitive value) -> null } } @@ -28,10 +28,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlocks: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/added_non-empty.golden index 7ab46337a..380c959b1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/added_non-empty.golden @@ -13,7 +13,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} + + prop { + + nested_prop = "val1" + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -25,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlocks: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/changed.golden index b9ed46f8e..d81dc7473 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/changed.golden @@ -4,15 +4,38 @@ tests.testOutput{ }, changeValue: &[]string{"val2"}, tfOut: ` -No changes. Your infrastructure matches the configuration. +Terraform used the selected providers to generate the following execution +plan. Resource actions are indicated with the following symbols: + ~ update in-place + +Terraform will perform the following actions: + + # crossprovider_test_res.example will be updated in-place + ~ resource "crossprovider_test_res" "example" { + id = "newid" + + ~ prop { + ~ nested_prop = "val1" -> "val2" + } + } + +Plan: 0 to add, 1 to change, 0 to destroy. -Terraform has compared your real infrastructure against your configuration -and found no differences, so no changes are needed. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] + ~ crossprovider:index/testRes:TestRes: (update) + [id=newid] + [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ] Resources: - 2 unchanged + ~ 1 to update + 1 unchanged `, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_back.golden index f0ec7e6ca..8ec90c3b8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_back.golden @@ -19,7 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} + + prop { + + nested_prop = "val3" + } # (2 unchanged blocks hidden) } @@ -33,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_front.golden index 54c477324..b8e2327ca 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_front.golden @@ -19,9 +19,15 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} - - # (2 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "val2" -> "val1" + } + ~ prop { + ~ nested_prop = "val3" -> "val2" + } + + prop { + + nested_prop = "val3" + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -33,12 +39,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_middle.golden index 55ade03ab..a238a2a94 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_added_middle.golden @@ -19,9 +19,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} + ~ prop { + ~ nested_prop = "val3" -> "val2" + } + + prop { + + nested_prop = "val3" + } - # (2 unchanged blocks hidden) + # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -33,12 +38,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_end.golden index 26aba6119..9166ee341 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_end.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val2", "val1", + "val2", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,7 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} + - prop { + - nested_prop = "val3" -> null + } # (2 unchanged blocks hidden) } @@ -33,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_front.golden index 1b5862462..790a8486a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_front.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val2", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,9 +19,15 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} - - # (2 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "val1" -> "val2" + } + ~ prop { + ~ nested_prop = "val2" -> "val3" + } + - prop { + - nested_prop = "val3" -> null + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -33,12 +39,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_middle.golden index 8b6069be3..40a90b6ff 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/list_element_removed_middle.golden @@ -5,8 +5,8 @@ tests.testOutput{ "val3", }, changeValue: &[]string{ - "val3", "val1", + "val3", }, tfOut: ` Terraform used the selected providers to generate the following execution @@ -19,9 +19,14 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} + ~ prop { + ~ nested_prop = "val2" -> "val3" + } + - prop { + - nested_prop = "val3" -> null + } - # (2 unchanged blocks hidden) + # (1 unchanged block hidden) } Plan: 0 to add, 1 to change, 0 to destroy. @@ -33,12 +38,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_back.golden index 174fb78a5..2172024d0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_back.golden @@ -55,7 +55,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} + + prop { + + nested_prop = "value20" + } # (20 unchanged blocks hidden) } @@ -69,12 +71,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_front.golden index 93f9197de..a9e6acd0d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_added_front.golden @@ -55,9 +55,69 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block {} - - # (20 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "value0" -> "value20" + } + ~ prop { + ~ nested_prop = "value1" -> "value0" + } + ~ prop { + ~ nested_prop = "value2" -> "value1" + } + ~ prop { + ~ nested_prop = "value3" -> "value2" + } + ~ prop { + ~ nested_prop = "value4" -> "value3" + } + ~ prop { + ~ nested_prop = "value5" -> "value4" + } + ~ prop { + ~ nested_prop = "value6" -> "value5" + } + ~ prop { + ~ nested_prop = "value7" -> "value6" + } + ~ prop { + ~ nested_prop = "value8" -> "value7" + } + ~ prop { + ~ nested_prop = "value9" -> "value8" + } + ~ prop { + ~ nested_prop = "value10" -> "value9" + } + ~ prop { + ~ nested_prop = "value11" -> "value10" + } + ~ prop { + ~ nested_prop = "value12" -> "value11" + } + ~ prop { + ~ nested_prop = "value13" -> "value12" + } + ~ prop { + ~ nested_prop = "value14" -> "value13" + } + ~ prop { + ~ nested_prop = "value15" -> "value14" + } + ~ prop { + ~ nested_prop = "value16" -> "value15" + } + ~ prop { + ~ nested_prop = "value17" -> "value16" + } + ~ prop { + ~ nested_prop = "value18" -> "value17" + } + ~ prop { + ~ nested_prop = "value19" -> "value18" + } + + prop { + + nested_prop = "value19" + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -69,12 +129,94 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } + ~ [2]: { + ~ nestedProp: [secret] => [secret] + } + ~ [3]: { + ~ nestedProp: [secret] => [secret] + } + ~ [4]: { + ~ nestedProp: [secret] => [secret] + } + ~ [5]: { + ~ nestedProp: [secret] => [secret] + } + ~ [6]: { + ~ nestedProp: [secret] => [secret] + } + ~ [7]: { + ~ nestedProp: [secret] => [secret] + } + ~ [8]: { + ~ nestedProp: [secret] => [secret] + } + ~ [9]: { + ~ nestedProp: [secret] => [secret] + } + ~ [10]: { + ~ nestedProp: [secret] => [secret] + } + ~ [11]: { + ~ nestedProp: [secret] => [secret] + } + ~ [12]: { + ~ nestedProp: [secret] => [secret] + } + ~ [13]: { + ~ nestedProp: [secret] => [secret] + } + ~ [14]: { + ~ nestedProp: [secret] => [secret] + } + ~ [15]: { + ~ nestedProp: [secret] => [secret] + } + ~ [16]: { + ~ nestedProp: [secret] => [secret] + } + ~ [17]: { + ~ nestedProp: [secret] => [secret] + } + ~ [18]: { + ~ nestedProp: [secret] => [secret] + } + ~ [19]: { + ~ nestedProp: [secret] => [secret] + } + [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_back.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_back.golden index d29a22522..fa8469b97 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_back.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_back.golden @@ -55,7 +55,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} + - prop { + - nested_prop = "value20" -> null + } # (20 unchanged blocks hidden) } @@ -69,12 +71,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ - [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[20]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_front.golden index 9aa15d457..cb5ae121e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/long_list_removed_front.golden @@ -55,9 +55,69 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} - - # (20 unchanged blocks hidden) + ~ prop { + ~ nested_prop = "value20" -> "value0" + } + ~ prop { + ~ nested_prop = "value0" -> "value1" + } + ~ prop { + ~ nested_prop = "value1" -> "value2" + } + ~ prop { + ~ nested_prop = "value2" -> "value3" + } + ~ prop { + ~ nested_prop = "value3" -> "value4" + } + ~ prop { + ~ nested_prop = "value4" -> "value5" + } + ~ prop { + ~ nested_prop = "value5" -> "value6" + } + ~ prop { + ~ nested_prop = "value6" -> "value7" + } + ~ prop { + ~ nested_prop = "value7" -> "value8" + } + ~ prop { + ~ nested_prop = "value8" -> "value9" + } + ~ prop { + ~ nested_prop = "value9" -> "value10" + } + ~ prop { + ~ nested_prop = "value10" -> "value11" + } + ~ prop { + ~ nested_prop = "value11" -> "value12" + } + ~ prop { + ~ nested_prop = "value12" -> "value13" + } + ~ prop { + ~ nested_prop = "value13" -> "value14" + } + ~ prop { + ~ nested_prop = "value14" -> "value15" + } + ~ prop { + ~ nested_prop = "value15" -> "value16" + } + ~ prop { + ~ nested_prop = "value16" -> "value17" + } + ~ prop { + ~ nested_prop = "value17" -> "value18" + } + ~ prop { + ~ nested_prop = "value18" -> "value19" + } + - prop { + - nested_prop = "value19" -> null + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -69,12 +129,94 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlocks: [ + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } + ~ [2]: { + ~ nestedProp: [secret] => [secret] + } + ~ [3]: { + ~ nestedProp: [secret] => [secret] + } + ~ [4]: { + ~ nestedProp: [secret] => [secret] + } + ~ [5]: { + ~ nestedProp: [secret] => [secret] + } + ~ [6]: { + ~ nestedProp: [secret] => [secret] + } + ~ [7]: { + ~ nestedProp: [secret] => [secret] + } + ~ [8]: { + ~ nestedProp: [secret] => [secret] + } + ~ [9]: { + ~ nestedProp: [secret] => [secret] + } + ~ [10]: { + ~ nestedProp: [secret] => [secret] + } + ~ [11]: { + ~ nestedProp: [secret] => [secret] + } + ~ [12]: { + ~ nestedProp: [secret] => [secret] + } + ~ [13]: { + ~ nestedProp: [secret] => [secret] + } + ~ [14]: { + ~ nestedProp: [secret] => [secret] + } + ~ [15]: { + ~ nestedProp: [secret] => [secret] + } + ~ [16]: { + ~ nestedProp: [secret] => [secret] + } + ~ [17]: { + ~ nestedProp: [secret] => [secret] + } + ~ [18]: { + ~ nestedProp: [secret] => [secret] + } + ~ [19]: { + ~ nestedProp: [secret] => [secret] + } - [20]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks[20]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[10].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[11].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[12].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[13].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[14].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[15].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[16].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[17].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[18].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[19].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[20]": map[string]interface{}{"kind": "DELETE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[4].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[5].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[6].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[7].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[8].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[9].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/one_added,_one_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/one_added,_one_removed.golden index ec6d9dee0..5fb4046dc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/one_added,_one_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/one_added,_one_removed.golden @@ -10,15 +10,54 @@ tests.testOutput{ "val4", }, tfOut: ` -No changes. Your infrastructure matches the configuration. +Terraform used the selected providers to generate the following execution +plan. Resource actions are indicated with the following symbols: + ~ update in-place + +Terraform will perform the following actions: + + # crossprovider_test_res.example will be updated in-place + ~ resource "crossprovider_test_res" "example" { + id = "newid" + + ~ prop { + ~ nested_prop = "val1" -> "val2" + } + ~ prop { + ~ nested_prop = "val2" -> "val3" + } + ~ prop { + ~ nested_prop = "val3" -> "val4" + } + } + +Plan: 0 to add, 1 to change, 0 to destroy. -Terraform has compared your real infrastructure against your configuration -and found no differences, so no changes are needed. `, pulumiOut: `Previewing update (test): pulumi:pulumi:Stack: (same) [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test] + ~ crossprovider:index/testRes:TestRes: (update) + [id=newid] + [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] + ~ props: [ + ~ [0]: { + ~ nestedProp: [secret] => [secret] + } + ~ [1]: { + ~ nestedProp: [secret] => [secret] + } + ~ [2]: { + ~ nestedProp: [secret] => [secret] + } + ] Resources: - 2 unchanged + ~ 1 to update + 1 unchanged `, + detailedDiff: map[string]interface{}{ + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/removed_non-empty.golden index 18dc450fc..82bea97d1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/list_block_sensitive/removed_non-empty.golden @@ -14,7 +14,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block {} + - prop { + - nested_prop = "val1" -> null + } } Plan: 0 to add, 1 to change, 0 to destroy. @@ -26,10 +28,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlocks: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlocks": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/added_non-empty.golden index 661f5f39d..a3609ba0d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/added_non-empty.golden @@ -11,8 +11,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - + list_attr = [ + id = "newid" + + prop = [ + "val1", ] } @@ -26,10 +26,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listAttr: "val1" + + prop: "val1" Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/changed.golden index 2e7dd97f3..fedcc0488 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/changed.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ ~ "val1" -> "val2", ] } @@ -27,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttr: "val1" => "val2" + ~ prop: "val1" => "val2" Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/removed_non-empty.golden index 15c39bcdb..ee7a56259 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute/removed_non-empty.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { - id = "newid" - ~ list_attr = [ + id = "newid" + ~ prop = [ - "val1", ] } @@ -27,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listAttr: "val1" + - prop: "val1" Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/added_non-empty.golden index d723166c6..2580ea3a6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/added_non-empty.golden @@ -11,8 +11,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - + list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + + prop = [ # forces replacement + "val1", ] } @@ -26,10 +26,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listAttr: "val1" + + prop: "val1" Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/changed.golden index 67bd378f9..15ede4415 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/changed.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - ~ list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + ~ prop = [ # forces replacement ~ "val1" -> "val2", ] } @@ -27,10 +27,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listAttr: "val1" => "val2" + ~ prop: "val1" => "val2" Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/removed_non-empty.golden index 05968b455..97b9d07a8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_attribute_force_new/removed_non-empty.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { - ~ id = "newid" -> (known after apply) - - list_attr = [ # forces replacement + ~ id = "newid" -> (known after apply) + - prop = [ # forces replacement - "val1", ] -> null } @@ -27,10 +27,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listAttr: "val1" + - prop: "val1" Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listAttr": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/added_non-empty.golden index 2f8be6dc0..f25c60d0c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/added_non-empty.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + list_block { + + prop { + nested_prop = "val1" } } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlock: { + + prop: { + nestedProp: "val1" } Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/changed.golden index c0d558ea3..f3e6d7e4c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/changed.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = "val1" -> "val2" } } @@ -28,12 +28,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlock: { + ~ prop: { ~ nestedProp: "val1" => "val2" } Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock.nestedProp": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"prop.nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/removed_non-empty.golden index 9063a0ce3..b4a82cc0d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block/removed_non-empty.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - list_block { + - prop { - nested_prop = "val1" -> null } } @@ -28,12 +28,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlock: { + - prop: { - nestedProp: "val1" } Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/added_non-empty.golden index b2c1d79f9..fcb861dfc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/added_non-empty.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + list_block { # forces replacement + + prop { # forces replacement + nested_prop = "val1" } } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlock: { + + prop: { + nestedProp: "val1" } Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/changed.golden index c0d558ea3..f3e6d7e4c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/changed.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ list_block { + ~ prop { ~ nested_prop = "val1" -> "val2" } } @@ -28,12 +28,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlock: { + ~ prop: { ~ nestedProp: "val1" => "val2" } Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock.nestedProp": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"prop.nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/removed_non-empty.golden index 45a9b35e7..28765515a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_force_new/removed_non-empty.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - list_block { # forces replacement + - prop { # forces replacement - nested_prop = "val1" -> null } } @@ -28,12 +28,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlock: { + - prop: { - nestedProp: "val1" } Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/added_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/added_non-empty.golden index abd5e5e7b..4fbf4c177 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/added_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/added_non-empty.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + list_block { + + prop { + nested_prop = "val1" # forces replacement } } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + listBlock: { + + prop: { + nestedProp: "val1" } Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/changed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/changed.golden index 733ec0705..f57b3f257 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/changed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/changed.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ list_block { + ~ prop { ~ nested_prop = "val1" -> "val2" # forces replacement } } @@ -28,12 +28,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ listBlock: { + ~ prop: { ~ nestedProp: "val1" => "val2" } Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock.nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop.nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/removed_non-empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/removed_non-empty.golden index 7813d1daf..8bf81c55d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/removed_non-empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffList/max_items_one_block_nested_force_new/removed_non-empty.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - list_block { + - prop { - nested_prop = "val1" -> null # forces replacement } } @@ -28,12 +28,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - listBlock: { + - prop: { - nestedProp: "val1" } Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"listBlock": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added.golden index 66e9cc7d3..5cb4df85b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added.golden @@ -11,7 +11,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test = [ # forces replacement + + prop = [ # forces replacement + "value", ] } @@ -25,12 +25,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end.golden index 7797eb83b..aed826510 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end_unordered.golden index 1dfe44665..e5f992fd7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front.golden index d76823ac7..530edd08b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front_unordered.golden index 468dfb3cb..ebf2ca149 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle.golden index 46ab092e8..a4adb0e39 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle_unordered.golden index 51c2aacf0..7d2607368 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/added_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null.golden index 9e3603726..d5e53b478 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "value", + "value1", ] @@ -28,12 +28,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "value" => "value1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null_to_null.golden index 44d418dc4..61caa0777 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_non-null_to_null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test = [ # forces replacement + - prop = [ # forces replacement - "value", ] -> null } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_null_to_non-null.golden index f3a83bf35..a690a935b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/changed_null_to_non-null.golden @@ -12,7 +12,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test = [ # forces replacement + + prop = [ # forces replacement + "value", ] } @@ -26,12 +26,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed.golden index 0bb96f006..284a462bf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test = [ # forces replacement + - prop = [ # forces replacement - "value", ] -> null } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end.golden index 60572f997..6ffa23f5f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end_unordered.golden index b6a670b5a..fb8a3c810 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front.golden index f5966a206..63136e0fc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front_unordered.golden index 0b8b1470a..47bdf49d8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle.golden index 0e840b84c..1d1903cad 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle_unordered.golden index 98d5bec97..fc63d70e4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/removed_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated.golden index c4ae9cfe1..aeb116a52 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", + "val4", # (2 unchanged elements hidden) @@ -35,12 +35,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: "val2" => "val4" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated_unordered.golden index 28b43f73a..910fda410 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/same_element_updated_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val4" - [2]: "val3" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_end.golden index be5397837..30d42a4f3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_front.golden index 10030b62a..198ef5c23 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_middle.golden index f66657f2e..76796f1c5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_end.golden index 849321a1b..d8bb66893 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_front.golden index 7f711ac92..eeeaf6563 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_middle.golden index e8c54a3f5..0e9b1be6f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/shuffled_removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added.golden index dbb7713d9..3fa494bdc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" + [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed.golden index 95e2ff154..5add66fb8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: "val3" => "val5" ~ [3]: "val4" => "val6" ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index acfea998f..88761afa9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val5" + [1]: "val6" - [2]: "val3" @@ -50,9 +50,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 8d5f0b91d..d1d01ca5b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -49,8 +49,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 12970d705..40d1c2531 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -23,7 +23,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -41,7 +41,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -51,8 +51,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_removed.golden index 2e78c99ff..7dc90fd5a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_force_new/two_removed.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" - [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added.golden index 999005b56..ba8683534 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added.golden @@ -11,7 +11,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - + test = [ + + prop = [ + "value", ] } @@ -25,12 +25,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end.golden index afca810d5..f813eb181 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end_unordered.golden index d41e34001..8302b749c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front.golden index 0876f2158..db9e7459d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front_unordered.golden index b44e1ffd0..e319503bc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle.golden index f63116704..3b1ccf336 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle_unordered.golden index a56104842..0f97eb8ec 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/added_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null.golden index 261a7d399..0f85193f6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "value", + "value1", ] @@ -28,12 +28,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "value" => "value1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null_to_null.golden index 2f350afc8..de4e0d090 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_non-null_to_null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "value", ] } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_null_to_non-null.golden index 4a5c04e3f..d23fad10e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/changed_null_to_non-null.golden @@ -12,7 +12,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - + test = [ + + prop = [ + "value", ] } @@ -26,12 +26,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed.golden index ba720bc92..a527d6401 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "value", ] } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end.golden index d26cb521b..8a72f43b5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end_unordered.golden index b215f22fe..1c5d5e1ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front.golden index 031a569fd..5b6b34d48 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front_unordered.golden index 9602fe247..2d7a14876 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle.golden index d14e72e6b..d4cc26e2d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle_unordered.golden index b18bab4f3..e26193ec4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/removed_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated.golden index 10255f4e2..6d1786926 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val2", + "val4", # (2 unchanged elements hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: "val2" => "val4" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated_unordered.golden index 7d6e1253d..9bf6c81cb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/same_element_updated_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val4" - [2]: "val3" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_end.golden index 244592ebc..03bd15968 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_front.golden index f7e5fd0b1..f7817b286 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_middle.golden index 62ffabcf4..6338dfc5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_end.golden index 64bf7facd..e382b25a5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_front.golden index b5b727009..43da3e571 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_middle.golden index 898de1c67..639168de3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/shuffled_removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added.golden index a0faaaceb..00f09b0bb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ + "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" + [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed.golden index 29983f2b4..49058bf8d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: "val3" => "val5" ~ [3]: "val4" => "val6" ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index b8a5d5c09..e32abfbea 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val5" + [1]: "val6" - [2]: "val3" @@ -50,9 +50,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 473f52ddd..b3a3254be 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -49,8 +49,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index dbfdfb4cd..82051594d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -23,7 +23,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -41,7 +41,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -51,8 +51,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_removed.golden index b7482fc6b..04afd8845 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetAttribute/attribute_no_force_new/two_removed.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "newid" - ~ test = [ + ~ prop = [ - "val3", - "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" - [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added.golden index 10d82d99a..da267f261 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "value" + + prop { # forces replacement + + nested_prop = "value" } } @@ -26,14 +26,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end.golden index 3e7a81565..382247dc8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end_unordered.golden index 4f1b9a49b..08da8b4ee 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front.golden index 66286b3f2..0e89964a5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front_unordered.golden index fc91a82a2..87bdbab2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle.golden index 6500bba0b..05280bd8e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle_unordered.golden index 7f3d1108f..bab22e97b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/added_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null.golden index c41476526..88158bb46 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null.golden @@ -14,11 +14,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null } - + test { # forces replacement - + nested = "value1" + + prop { # forces replacement + + nested_prop = "value1" } } @@ -31,14 +31,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested: "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null_to_null.golden index bf5a2743d..635cf34e5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_null_to_non-null.golden index be8da24df..4f8782f4c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/changed_null_to_non-null.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "value" + + prop { # forces replacement + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed.golden index bce9459bf..54674d663 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end.golden index b9b27b7bb..7c52650c3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end_unordered.golden index 3d59d39ff..d92ce43ba 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front.golden index b166de593..d45343b6a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front_unordered.golden index b32adae12..6dbe1cfcd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle.golden index 43d40629c..f36ee94da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle_unordered.golden index 53f28a103..71817b238 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/removed_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated.golden index 0d9162e5b..6790ec57c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } - + test { # forces replacement - + nested = "val4" + + prop { # forces replacement + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,14 +39,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ nested: "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated_unordered.golden index bf7ac5383..aff63c558 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/same_element_updated_unordered.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - + test { # forces replacement - + nested = "val4" + + prop { # forces replacement + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_end.golden index 37ea56333..379f45cc4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_front.golden index 0f837543f..9850fa528 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_middle.golden index 1eafb16ce..9d6520cba 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_end.golden index b7c1fcc2e..f1f5be6fd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_front.golden index 7f391ace8..29f094105 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_middle.golden index a172a3cf2..22b65d6ee 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/shuffled_removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added.golden index 245630f95..a051d30c0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } - + test { # forces replacement - + nested = "val4" + + prop { # forces replacement + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed.golden index d6c16b12d..bd48c889d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } - + test { # forces replacement - + nested = "val5" + + prop { # forces replacement + + nested_prop = "val5" } - + test { # forces replacement - + nested = "val6" + + prop { # forces replacement + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,12 +47,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ nested: "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested: "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -60,7 +60,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 0798b4a0c..ac308e3bc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } - + test { # forces replacement - + nested = "val5" + + prop { # forces replacement + + nested_prop = "val5" } - + test { # forces replacement - + nested = "val6" + + prop { # forces replacement + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,18 +47,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val5" + + nestedProp: "val5" } + [1]: { - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 2b4795c94..1184409ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } - + test { # forces replacement - + nested = "val5" + + prop { # forces replacement + + nested_prop = "val5" } - + test { # forces replacement - + nested = "val6" + + prop { # forces replacement + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,15 +47,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -63,8 +63,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index b4c7c4cad..d0ee336ac 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,17 +24,17 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } - + test { # forces replacement - + nested = "val5" + + prop { # forces replacement + + nested_prop = "val5" } - + test { # forces replacement - + nested = "val6" + + prop { # forces replacement + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -49,15 +49,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_removed.golden index 751e8ad77..6ef2428fd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_nested_force_new/two_removed.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added.golden index 4437d3d93..04263ceb0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "value" + + prop { + + nested_prop = "value" } } @@ -26,14 +26,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end.golden index 0e99f32fc..b9492b2c4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end_unordered.golden index 925a57134..3ac314eb4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front.golden index 34add3a49..4b0699d97 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front_unordered.golden index e1a4e54e1..ae9c2bdf4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle.golden index 52a50696e..ebb61a26e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle_unordered.golden index 6d48c5ade..a934413c6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/added_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null.golden index 0d933f20b..c9f4c4bcb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null.golden @@ -14,11 +14,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } - + test { - + nested = "value1" + + prop { + + nested_prop = "value1" } } @@ -31,14 +31,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested: "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null_to_null.golden index 7855506e3..e27850a26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_null_to_non-null.golden index 8f9f0bd5f..a7a879782 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/changed_null_to_non-null.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "value" + + prop { + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed.golden index 3b3dab62b..a435a207c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end.golden index 6693f8924..07883d3e4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end_unordered.golden index 21971c24f..55ecc8cc0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front.golden index e8f12ff97..531b94308 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front_unordered.golden index 7e58b5b00..4d5067d3d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle.golden index 4670bad22..c97bd9b93 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle_unordered.golden index f8b84dcfb..20a0eb6bf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/removed_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated.golden index 6e47be3c9..121faae30 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,14 +39,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ nested: "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated_unordered.golden index 877874c48..ef011cf82 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/same_element_updated_unordered.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_end.golden index 6dbef5048..ef8feeeee 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_front.golden index fe5dfced8..131318b55 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_middle.golden index 6fa1d73ec..8e17f5939 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_end.golden index 84de354bb..d642ae80b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_front.golden index 7dadcb788..1d0eacff1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_middle.golden index 9d064d347..b6fef50fe 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/shuffled_removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added.golden index f4568a6cc..5aaa5f7a5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed.golden index 7fb5ca1ca..cfd858da3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,12 +47,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ nested: "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested: "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -60,7 +60,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index a2d950d91..ddfe95b00 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,18 +47,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val5" + + nestedProp: "val5" } + [1]: { - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 174d501cf..ab66fd255 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,15 +47,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -63,8 +63,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 893609195..ad70c3837 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,17 +24,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -49,15 +49,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_removed.golden index 1e78db624..3ae15556f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_no_force_new/two_removed.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added.golden index 10d82d99a..da267f261 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "value" + + prop { # forces replacement + + nested_prop = "value" } } @@ -26,14 +26,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end.golden index 3e7a81565..382247dc8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end_unordered.golden index 4f1b9a49b..08da8b4ee 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front.golden index 66286b3f2..0e89964a5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front_unordered.golden index fc91a82a2..87bdbab2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle.golden index 6500bba0b..05280bd8e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle_unordered.golden index 7f3d1108f..bab22e97b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/added_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null.golden index 0d933f20b..c9f4c4bcb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null.golden @@ -14,11 +14,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } - + test { - + nested = "value1" + + prop { + + nested_prop = "value1" } } @@ -31,14 +31,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested: "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null_to_null.golden index bf5a2743d..635cf34e5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_null_to_non-null.golden index be8da24df..4f8782f4c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/changed_null_to_non-null.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "value" + + prop { # forces replacement + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed.golden index bce9459bf..54674d663 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - nested: "value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end.golden index b9b27b7bb..7c52650c3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end_unordered.golden index 3d59d39ff..d92ce43ba 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front.golden index b166de593..d45343b6a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front_unordered.golden index b32adae12..6dbe1cfcd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle.golden index 43d40629c..f36ee94da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle_unordered.golden index 53f28a103..71817b238 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/removed_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated.golden index 6e47be3c9..121faae30 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,14 +39,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ nested: "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated_unordered.golden index 877874c48..ef011cf82 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/same_element_updated_unordered.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_end.golden index 37ea56333..379f45cc4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_front.golden index 0f837543f..9850fa528 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val1" + + prop { # forces replacement + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_middle.golden index 1eafb16ce..9d6520cba 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val2" + + prop { # forces replacement + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_end.golden index b7c1fcc2e..f1f5be6fd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_front.golden index 7f391ace8..29f094105 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - nested: "val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_middle.golden index a172a3cf2..22b65d6ee 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/shuffled_removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,14 +35,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - nested: "val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added.golden index 245630f95..a051d30c0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - + test { # forces replacement - + nested = "val3" + + prop { # forces replacement + + nested_prop = "val3" } - + test { # forces replacement - + nested = "val4" + + prop { # forces replacement + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed.golden index 7fb5ca1ca..cfd858da3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,12 +47,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ nested: "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested: "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -60,7 +60,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index a2d950d91..ddfe95b00 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,18 +47,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { - + nested : "val5" + + nestedProp: "val5" } + [1]: { - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 174d501cf..ab66fd255 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,15 +47,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -63,8 +63,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 893609195..ad70c3837 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,17 +24,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -49,15 +49,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ nested: "val3" => "val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_removed.golden index 751e8ad77..6ef2428fd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlock/block_top_level_force_new/two_removed.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "newid" -> (known after apply) - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -39,12 +39,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - nested: "val3" + - nestedProp: "val3" } - [3]: { - - nested: "val4" + - nestedProp: "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added.golden index 850a6778e..0b52dd04d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added.golden @@ -12,7 +12,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -27,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end.golden index 4c5e337fc..3de98c144 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end_unordered.golden index de1bf9b74..594f59dde 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_end_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front.golden index c5c854373..ead9e0517 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front_unordered.golden index ab8199633..daab0786d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_front_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle.golden index c9a26e149..8ac854c9a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle_unordered.golden index fe6a84016..cc7b2144d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/added_middle_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null.golden index 491552bc5..70cd9548b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null.golden @@ -14,11 +14,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -33,14 +33,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null_to_null.golden index f89bf7308..439d88300 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_non-null_to_null.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -29,10 +29,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_null_to_non-null.golden index 75e2f7bcc..fe6cdc003 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/changed_null_to_non-null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -28,10 +28,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed.golden index 7b4df09ca..82282ffa2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed.golden @@ -14,7 +14,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -29,10 +29,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end.golden index ebd730dbd..4d328b078 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end_unordered.golden index 97729965c..484c8a6ff 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_end_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front.golden index f10953ea7..3fd718e3a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front_unordered.golden index 8c421c576..f5f5c1a78 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_front_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle.golden index a4ee2a31e..af8a1e389 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle_unordered.golden index 410a09fcc..ccc52eed1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/removed_middle_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated.golden index 821728cb4..74a8b8f1b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated_unordered.golden index aea2b1675..a9c4829f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/same_element_updated_unordered.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -41,7 +41,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] - [2]: [secret] ] @@ -50,7 +50,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_end.golden index 22cdfc830..62b29872a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_end.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_front.golden index 6dd8bcb9f..1bed97984 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_front.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_middle.golden index f6494e781..846e09a92 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_added_middle.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_end.golden index d32209adb..9a31a0bf2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_end.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_front.golden index dccbbf340..89f9a51db 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_front.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_middle.golden index 02d1805c7..d4dc621bf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/shuffled_removed_middle.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -36,12 +36,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added.golden index 5f3c94b63..ce124a99a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -41,7 +41,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] + [3]: [secret] ] @@ -50,7 +50,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed.golden index de1dea8d5..46c6c1305 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed.golden @@ -22,19 +22,19 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -51,12 +51,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ~ [3]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: @@ -64,7 +64,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden index 3296e5a14..bf267b05a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,19 +22,19 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -51,7 +51,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] + [1]: [secret] - [2]: [secret] @@ -62,9 +62,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden index 2c4f7ba01..531040c00 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,19 +22,19 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -51,10 +51,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } - [3]: [secret] ] @@ -63,8 +63,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden index 94d8479e5..1ca8b000d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,19 +24,19 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - + test { + + prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -53,10 +53,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } - [3]: [secret] ] @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_removed.golden index 00cdfb430..bcef233dd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_nested_sensitive/two_removed.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } - - test { + - prop { # At least one attribute in this block is (or was) sensitive, # so its contents will not be displayed. } @@ -41,7 +41,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] - [3]: [secret] ] @@ -50,7 +50,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added.golden index ead166f9e..9d81f6a53 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added.golden @@ -12,8 +12,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "value" + + prop { + + nested_prop = "value" } } @@ -26,10 +26,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end.golden index 0e02f7fbb..8ec90c3b8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end_unordered.golden index b7a03a57b..4bc0838bd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front.golden index ceec9f13b..acf6b36dd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front_unordered.golden index 6f9c2d1bb..ba9e3c7d3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle.golden index dd3439bef..2bd36f186 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle_unordered.golden index a5d1cf314..d85b01979 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/added_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null.golden index 16be7628b..108f54913 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null.golden @@ -14,11 +14,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } - + test { - + nested = "value1" + + prop { + + nested_prop = "value1" } } @@ -31,14 +31,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null_to_null.golden index 026d1eaee..cc8ce86dd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } } @@ -28,10 +28,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_null_to_non-null.golden index d28a79400..4cda15da1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/changed_null_to_non-null.golden @@ -13,8 +13,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "value" + + prop { + + nested_prop = "value" } } @@ -27,10 +27,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [secret] + + props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed.golden index 378c70774..28738d990 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null } } @@ -28,10 +28,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [secret] + - props: [secret] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end.golden index 1038f827f..9166ee341 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end_unordered.golden index bcbf2e5ec..872523af2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_end_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front.golden index 642efbc29..5e02f8dd0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front_unordered.golden index f52cf39ca..4028c3039 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_front_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle.golden index 7176d5971..e3965e9b4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle_unordered.golden index 6fa7c68e4..fd8700718 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/removed_middle_unordered.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated.golden index 88a83a709..235c1ab60 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,14 +39,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1].nested": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated_unordered.golden index 02d169ed0..02f369289 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/same_element_updated_unordered.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] - [2]: [secret] ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_end.golden index 94bf025fd..f7beb1c17 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_front.golden index 4bfc37686..38b64d2e9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val1" + + prop { + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_middle.golden index c3513cc68..e8e9ce193 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_added_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val2" + + prop { + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_end.golden index 9cefcabf1..284938ac7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_end.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_front.golden index 0504c5f23..0cf944a7e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_front.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_middle.golden index c703a2039..267e69ed5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/shuffled_removed_middle.golden @@ -19,8 +19,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: [secret] ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added.golden index aafa0fc09..361666af5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - + test { - + nested = "val3" + + prop { + + nested_prop = "val3" } - + test { - + nested = "val4" + + prop { + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: [secret] + [3]: [secret] ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed.golden index 2ad0c65f0..e57773a50 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,12 +47,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ~ [3]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } ] Resources: @@ -60,7 +60,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden index 627adc622..1fd316c1b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,7 +47,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: [secret] + [1]: [secret] - [2]: [secret] @@ -58,9 +58,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden index 78a7be4a9..c2a646fa2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,17 +22,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -47,10 +47,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } - [3]: [secret] ] @@ -59,8 +59,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden index 7ff739e95..b6cfedab4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,17 +24,17 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } - + test { - + nested = "val5" + + prop { + + nested_prop = "val5" } - + test { - + nested = "val6" + + prop { + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -49,10 +49,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: [secret] ~ [2]: { - ~ nested: [secret] => [secret] + ~ nestedProp: [secret] => [secret] } - [3]: [secret] ] @@ -61,8 +61,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_removed.golden index ffeabebff..ecfa7a999 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetBlockSensitive/block_sensitive/two_removed.golden @@ -20,11 +20,11 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "newid" - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=newid] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: [secret] - [3]: [secret] ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added.golden index 954d6936d..b7a96eb12 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added.golden @@ -11,7 +11,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "value", ] } @@ -25,12 +25,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end.golden index efb765e14..a089c2ef4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end_unordered.golden index aab9107ec..da39d1c49 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front.golden index 31e792da5..afe07570e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front_unordered.golden index 759b13ab8..9d2ed61a8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle.golden index fcbd5e43e..64895d9a8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle_unordered.golden index 981c53f8d..177a16996 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/added_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_non-null.golden index 697e4c5c9..b7988445f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_non-null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "value", + "value1", ] @@ -28,12 +28,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "value" => "value1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_null_to_non-null.golden index 504ff6160..e654d64f2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/changed_null_to_non-null.golden @@ -12,7 +12,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "value", ] } @@ -26,12 +26,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed.golden index 60aaba5dd..b830732cd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ + ~ prop = [ - "value", ] -> (known after apply) # forces replacement } @@ -27,12 +27,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end.golden index 778429a10..fc752e85b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end_unordered.golden index ba2e33837..a8352fea9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front.golden index 559e88f3c..97565f42a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front_unordered.golden index 66fb90e78..641355f84 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle.golden index 89b2548c5..47c526fdb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle_unordered.golden index a34fe9f43..f8c5f8730 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/removed_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated.golden index 552a12cb5..c065c3c01 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", + "val4", # (2 unchanged elements hidden) @@ -35,12 +35,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: "val2" => "val4" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "UPDATE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated_unordered.golden index 31b48aecb..1eaa13dfa 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/same_element_updated_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val4" - [2]: "val3" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_end.golden index 83c54b25e..6f37b8e3f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_front.golden index 062d80a9d..67bdc80a7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_middle.golden index 4ba476ddf..2f20e400f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_end.golden index 65bf2f44a..4dc47399d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_front.golden index 73f5630f4..b841f880e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_middle.golden index adb70ea2c..c4216b9f2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/shuffled_removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added.golden index fd567fa7b..cb29a8b2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement + "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" + [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed.golden index e79aff8fd..b47ee0ae0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: "val3" => "val5" ~ [3]: "val4" => "val6" ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index c9d4a8067..0be5b026c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val5" + [1]: "val6" - [2]: "val3" @@ -50,9 +50,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 73a9123d2..15fc4e3b8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -49,8 +49,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index ce85ddfc3..f9c3b801f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -23,7 +23,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", + "val5", @@ -41,7 +41,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -51,8 +51,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_removed.golden index c52a70c37..72b69c9f4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_force_new/two_removed.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example must be replaced +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - ~ test = [ # forces replacement + ~ prop = [ # forces replacement - "val3", - "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" - [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added.golden index 3ca3626f8..871e67b7b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added.golden @@ -11,7 +11,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "computed", + "value", ] @@ -26,12 +26,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "computed" => "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end.golden index 7ee2106a7..976a4c1e2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end_unordered.golden index 8c4222156..ddb39b486 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front.golden index 8895df583..39d19608c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front_unordered.golden index cf5ded15a..d5e2f8356 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle.golden index 39cae1691..35800a86c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle_unordered.golden index 4c15c514f..2b2a34058 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/added_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_non-null.golden index 123294b6b..422ebc47f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_non-null.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "value", + "value1", ] @@ -28,12 +28,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "value" => "value1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_empty.golden index 4949b3c15..c9b73293f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_empty.golden @@ -10,7 +10,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "computed", ] } @@ -24,12 +24,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "computed" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_non-null.golden index 45d8d00ae..3981189e3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/changed_null_to_non-null.golden @@ -12,7 +12,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "computed", + "value", ] @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: "computed" => "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed.golden index f19c6593e..fca632042 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed.golden @@ -13,7 +13,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "value", ] } @@ -27,12 +27,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "value" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end.golden index 853195eb7..d92675907 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end_unordered.golden index c542534f7..009fdef36 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_end_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front.golden index 451cac3b8..43778ec83 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front_unordered.golden index da0f3d3ce..c4e963939 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_front_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle.golden index 9af564bb3..2663facfb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle_unordered.golden index 28fd761cf..fc2536775 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/removed_middle_unordered.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated.golden index 9e21245ae..67525bdb8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val2", + "val4", # (2 unchanged elements hidden) @@ -35,12 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: "val2" => "val4" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "UPDATE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "UPDATE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated_unordered.golden index 02ca1b701..07dbb8cbe 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/same_element_updated_unordered.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val4" - [2]: "val3" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_end.golden index 40c2fe45c..68810d283 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_front.golden index 9827f1c99..4317de897 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_middle.golden index 249ad9570..51a6cf7d6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_added_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_end.golden index a7b63e504..f43ba1e48 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_end.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_front.golden index 6ca7784ef..d3d1038a7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_front.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val1", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: "val1" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_middle.golden index f55f66baa..b98006bfb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/shuffled_removed_middle.golden @@ -18,7 +18,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val2", # (2 unchanged elements hidden) ] @@ -33,12 +33,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: "val2" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added.golden index e79983b61..4f2cc752b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ + "val3", + "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: "val3" + [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed.golden index c0e323986..9c2b17b1e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: "val3" => "val5" ~ [3]: "val4" => "val6" ] @@ -48,7 +48,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 4b7d8bdb0..6d1f65b6e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: "val5" + [1]: "val6" - [2]: "val3" @@ -50,9 +50,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index eac1d9905..72bb4399c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -21,7 +21,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -39,7 +39,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -49,8 +49,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 6f1620693..a107fa41d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -23,7 +23,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", - "val4", + "val5", @@ -41,7 +41,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: "val5" ~ [2]: "val3" => "val6" - [3]: "val4" @@ -51,8 +51,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_removed.golden index f97ddf92d..2a4a66f27 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/two_removed.golden @@ -19,7 +19,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "val3", - "val4", # (2 unchanged elements hidden) @@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: "val3" - [3]: "val4" ] @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/unchanged_empty.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/unchanged_empty.golden index ee393acc7..cdad9c495 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/unchanged_empty.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedAttribute/computed_attribute_no_force_new/unchanged_empty.golden @@ -11,7 +11,7 @@ Terraform will perform the following actions: # crossprovider_test_res.example will be updated in-place ~ resource "crossprovider_test_res" "example" { id = "id" - ~ test = [ + ~ prop = [ - "computed", ] } @@ -25,12 +25,12 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: "computed" ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added.golden index 94f5561c4..1d1028399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end.golden index 61e7023f4..8637a9399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end_unordered.golden index 9e8f02e21..bbb80b137 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front.golden index 3a2d9fcbb..5dfba3036 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front_unordered.golden index afed007f9..0b5de615f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle.golden index d91143690..29fe53225 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle_unordered.golden index 77521f58f..e5df81b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_non-null.golden index 3c61d1ead..8324413cb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "value1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_null_to_non-null.golden index ae12d57d0..a30ffbd74 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end.golden index 49a453315..2803126eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end_unordered.golden index 11c25ea19..08c37f01f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front.golden index 7e9debb9f..e560b2a43 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front_unordered.golden index c7b999d62..63c7fdd30 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle.golden index 9c5e259b8..d567cc4c5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle_unordered.golden index 4c99be506..3356fe941 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated.golden index 20af5dce4..dcb6afe35 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated_unordered.golden index 0daa3357d..88a38f3bb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_end.golden index 63705da7b..3e03ac9c4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_front.golden index 41adc784d..aa94140f1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_middle.golden index d66a47680..c6aaa2952 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_end.golden index 27f6fd2e0..b8fa7427f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_front.golden index 24e502d14..235116c5a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_middle.golden index 37646faa5..0678ffc04 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added.golden index 127e90847..ff3a6d0a1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed.golden index 888c08999..f0f92b2e2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 45ad19c32..02dfad036 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 447a94af5..6bc525da3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 76cb9ef06..d74ca25da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_removed.golden index b6f28b466..44e751cdf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added.golden index 1de9875a9..838692c3a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end.golden index 9c1af455d..8e71d9ec8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end_unordered.golden index 2fcfb24b8..5e6a9b0c2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front.golden index 24ebf3720..50786549b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front_unordered.golden index 9477ea35b..1307988ca 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle.golden index cb91ff477..75800cf7e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle_unordered.golden index 3de19f40c..4bd445ea7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_non-null.golden index 3d40302c3..067436d85 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { # forces replacement - + computed = "non-computed-value1" - + nested = "value1" + + prop { # forces replacement + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_null_to_non-null.golden index c2f1607a9..4fc99f481 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end.golden index 27b631a62..aeb4e7de0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end_unordered.golden index 87c9ced14..831b1537a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front.golden index 74c0f7468..8da851f26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front_unordered.golden index d83c330b0..082a2e230 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle.golden index 7b3e9ce15..443c54ed7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle_unordered.golden index 8e95109d1..5b952246d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated.golden index b4f76f7a7..d725622a0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated_unordered.golden index a3af8c6c3..70e62a519 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_end.golden index cf125372c..328aa7b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_front.golden index c8d7a3a0f..946b8eb2f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_middle.golden index 373c6cff9..dfbdff5c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_end.golden index 9ec766ae5..0418d3c60 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_front.golden index 1a4103a07..83be787cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_middle.golden index 40b9ff67a..061f3c932 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added.golden index 353e54999..c3cdd1008 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed.golden index d4593e7f3..034c064fc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden index 3c647ef4e..1a8236451 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden index 5e4e96ab2..22504246a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden index 6b4b00e7a..5e3936385 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_removed.golden index fa8851ce6..d59c38a45 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_and_nested_force_new_computed_specified_in_program/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added.golden index 94f5561c4..1d1028399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end.golden index 61e7023f4..8637a9399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end_unordered.golden index 9e8f02e21..bbb80b137 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front.golden index 6c3c3e039..cfbfbb188 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front_unordered.golden index 6d0830e4b..2d5534957 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle.golden index 23cedb220..f67f6225b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle_unordered.golden index 22da1919d..fbdcdbe1d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_non-null.golden index 0170773e4..eb6fe82c1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "value1" + + prop { + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_null_to_non-null.golden index ae12d57d0..a30ffbd74 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end.golden index 49a453315..2803126eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end_unordered.golden index 27a71d3d4..421a7005c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front.golden index f90856167..69c3dc50c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front_unordered.golden index ecfe8e436..cbd9201f6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle.golden index 648c2e19c..59c4377c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle_unordered.golden index 27f07f40c..c62ba8c6a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated.golden index ef4fe3047..fe88e4b08 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated_unordered.golden index d683f9400..43e98ac9a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_end.golden index f9fa4badc..328619fb4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_front.golden index 2803f4130..5f1c5dbff 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_middle.golden index e1c8e2839..3e8bfe35c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_end.golden index 97212ee45..f9fc1c873 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_front.golden index d99c1f916..3b7a9f42f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_middle.golden index 87c298f59..cb491d083 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added.golden index 127e90847..ff3a6d0a1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed.golden index 78e89cb3f..81ba1993f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 5c1cb78b8..3b1ef3297 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index b733ba7f7..12eb4ba2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3ecef9514..b0390bc5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_removed.golden index b6f28b466..44e751cdf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added.golden index 1de9875a9..838692c3a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end.golden index 9c1af455d..8e71d9ec8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end_unordered.golden index 2fcfb24b8..5e6a9b0c2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front.golden index 24ebf3720..50786549b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front_unordered.golden index 9477ea35b..1307988ca 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle.golden index cb91ff477..75800cf7e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle_unordered.golden index 3de19f40c..4bd445ea7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_non-null.golden index 89c888348..aab1363ae 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { - + computed = "non-computed-value1" - + nested = "value1" + + prop { + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_null_to_non-null.golden index c2f1607a9..4fc99f481 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end.golden index 27b631a62..aeb4e7de0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end_unordered.golden index 87c9ced14..831b1537a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front.golden index 74c0f7468..8da851f26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front_unordered.golden index d83c330b0..082a2e230 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle.golden index 7b3e9ce15..443c54ed7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle_unordered.golden index 8e95109d1..5b952246d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated.golden index f6696642d..9038e34eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated_unordered.golden index 8a21d2bb9..9e846f4ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_end.golden index cf125372c..328aa7b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_front.golden index c8d7a3a0f..946b8eb2f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_middle.golden index 373c6cff9..dfbdff5c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_end.golden index 9ec766ae5..0418d3c60 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_front.golden index 1a4103a07..83be787cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_middle.golden index 40b9ff67a..061f3c932 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added.golden index 353e54999..c3cdd1008 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed.golden index fc533b2c3..3dc7c244a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden index 95ac81c70..42c1c57f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden index db9ebe90d..cf55e86d5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3e1d56263..4c558fe90 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_removed.golden index fa8851ce6..d59c38a45 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_force_new_computed_specified_in_program/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added.golden index 8a0de2272..c1796dacc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = (known after apply) - + nested = "value" + + prop { + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end.golden index f16128f51..6abe57ea4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end_unordered.golden index ae509e972..d5dfc9005 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front.golden index 1ee158309..3e25e9978 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front_unordered.golden index 485cf9314..c369bbf48 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle.golden index be8c5fc65..fb2634af0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle_unordered.golden index 5dcd42ada..34380e77f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_non-null.golden index 0170773e4..eb6fe82c1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "value1" + + prop { + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_null_to_non-null.golden index d9a3f3f7d..5a6adc46d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = (known after apply) - + nested = "value" + + prop { + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end.golden index cb5cf4ece..e14092f23 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end_unordered.golden index 899c8114b..af66c220e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front.golden index f3b02f42d..4a3902ddf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front_unordered.golden index c1f45d3dc..87679f365 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle.golden index d799448f4..20a947571 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle_unordered.golden index 81b888971..17e203ae2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated.golden index ef4fe3047..fe88e4b08 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated_unordered.golden index d683f9400..43e98ac9a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_end.golden index 9b2ffd6ec..7135908e8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_front.golden index 719761f3c..3daa5fb6c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_middle.golden index 71fb4ed7f..aaf9ac1cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_end.golden index 2e433d674..02973167f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_front.golden index c04626257..0ac40ebbb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_middle.golden index c3a451e7d..05dd7b0a3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added.golden index 1637ef233..e7dc17241 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed.golden index 78e89cb3f..81ba1993f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden index 5c1cb78b8..3b1ef3297 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden index b733ba7f7..12eb4ba2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3ecef9514..b0390bc5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_removed.golden index 6677548c8..de189334f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added.golden index 9c107c39e..7ca1c48b0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-value" - + nested = "value" + + prop { + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end.golden index 66fbc1c2d..bc0919160 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end_unordered.golden index 698ac8437..05804ab7b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front.golden index 9a8683764..95adb9648 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front_unordered.golden index eb66a56e2..de0995169 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle.golden index 3fa147fc4..2fbd662f2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden index 7742de733..593758212 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_non-null.golden index 89c888348..aab1363ae 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { - + computed = "non-computed-value1" - + nested = "value1" + + prop { + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden index 15a585c5a..3c54b777b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-value" - + nested = "value" + + prop { + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end.golden index 101d829f4..7c6bfae1c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden index d3921213c..56adeda63 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front.golden index 95cec62f9..7bed80977 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden index 4ce1bb1bb..25f5a65de 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle.golden index e27759e65..842094cfd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden index 71aca2ff6..99f870899 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated.golden index f6696642d..9038e34eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden index 8a21d2bb9..9e846f4ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden index ae58b0bcc..2ecc6b303 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden index c73db179d..7ee108159 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden index ccd82694b..6e5995141 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden index 8741a83c6..4b575c80e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden index e0d9d13c4..d9d3ef76b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden index 19dd48fb4..13f64c6c7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added.golden index e43424e12..8d64ed893 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden index fc533b2c3..3dc7c244a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden index 95ac81c70..42c1c57f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden index db9ebe90d..cf55e86d5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3e1d56263..4c558fe90 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_removed.golden index b811014c9..c063ef5fb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetComputedBlock/block_with_computed_no_replace_computed_specified_in_program/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added.golden index 94f5561c4..1d1028399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end.golden index 61e7023f4..8637a9399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end_unordered.golden index 9e8f02e21..bbb80b137 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front.golden index 6c3c3e039..cfbfbb188 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front_unordered.golden index 6d0830e4b..2d5534957 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle.golden index 23cedb220..f67f6225b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle_unordered.golden index 22da1919d..fbdcdbe1d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null.golden index 0170773e4..eb6fe82c1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "value1" + + prop { + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null_to_null.golden index 78fc54133..36d0dbea5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_null_to_non-null.golden index ae12d57d0..a30ffbd74 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed.golden index be31441b2..ee01ddc6e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end.golden index 49a453315..2803126eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end_unordered.golden index 27a71d3d4..421a7005c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front.golden index f90856167..69c3dc50c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front_unordered.golden index ecfe8e436..cbd9201f6 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle.golden index 648c2e19c..59c4377c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle_unordered.golden index 27f07f40c..c62ba8c6a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated.golden index ef4fe3047..fe88e4b08 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated_unordered.golden index d683f9400..43e98ac9a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_end.golden index f9fa4badc..328619fb4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_front.golden index 2803f4130..5f1c5dbff 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_middle.golden index e1c8e2839..3e8bfe35c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_end.golden index 97212ee45..f9fc1c873 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_front.golden index d99c1f916..3b7a9f42f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_middle.golden index 87c298f59..cb491d083 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added.golden index 127e90847..ff3a6d0a1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed.golden index 78e89cb3f..81ba1993f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 5c1cb78b8..3b1ef3297 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index b733ba7f7..12eb4ba2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3ecef9514..b0390bc5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_removed.golden index b6f28b466..44e751cdf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added.golden index 1de9875a9..838692c3a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end.golden index 9c1af455d..8e71d9ec8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end_unordered.golden index 2fcfb24b8..5e6a9b0c2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front.golden index 24ebf3720..50786549b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front_unordered.golden index 9477ea35b..1307988ca 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle.golden index cb91ff477..75800cf7e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle_unordered.golden index 3de19f40c..4bd445ea7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null.golden index 89c888348..aab1363ae 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { - + computed = "non-computed-value1" - + nested = "value1" + + prop { + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null_to_null.golden index d200f8583..2e15d6875 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_non-null_to_null.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_null_to_non-null.golden index c2f1607a9..4fc99f481 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed.golden index ea57b6068..c8aa2028f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end.golden index 27b631a62..aeb4e7de0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end_unordered.golden index 87c9ced14..831b1537a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front.golden index 74c0f7468..8da851f26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front_unordered.golden index d83c330b0..082a2e230 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle.golden index 7b3e9ce15..443c54ed7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle_unordered.golden index 8e95109d1..5b952246d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated.golden index f6696642d..9038e34eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated_unordered.golden index 8a21d2bb9..9e846f4ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_end.golden index cf125372c..328aa7b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_front.golden index c8d7a3a0f..946b8eb2f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_middle.golden index 373c6cff9..dfbdff5c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_end.golden index 9ec766ae5..0418d3c60 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_front.golden index 1a4103a07..83be787cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_middle.golden index 40b9ff67a..061f3c932 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added.golden index 353e54999..c3cdd1008 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed.golden index fc533b2c3..3dc7c244a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden index 95ac81c70..42c1c57f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden index db9ebe90d..cf55e86d5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3e1d56263..4c558fe90 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_removed.golden index fa8851ce6..d59c38a45 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_force_new_computed_specified_in_program/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added.golden index 94f5561c4..1d1028399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end.golden index 61e7023f4..8637a9399 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end_unordered.golden index 9e8f02e21..bbb80b137 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front.golden index 3a2d9fcbb..5dfba3036 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front_unordered.golden index afed007f9..0b5de615f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle.golden index d91143690..29fe53225 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle_unordered.golden index 77521f58f..e5df81b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null.golden index 3c61d1ead..8324413cb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "value1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null_to_null.golden index 78fc54133..36d0dbea5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_null_to_non-null.golden index ae12d57d0..a30ffbd74 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = (known after apply) - + nested = "value" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed.golden index be31441b2..ee01ddc6e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "value" -> null + - prop { # forces replacement + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end.golden index 49a453315..2803126eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end_unordered.golden index 11c25ea19..08c37f01f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front.golden index 7e9debb9f..e560b2a43 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front_unordered.golden index c7b999d62..63c7fdd30 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle.golden index 9c5e259b8..d567cc4c5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle_unordered.golden index 4c99be506..3356fe941 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated.golden index 20af5dce4..dcb6afe35 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated_unordered.golden index 0daa3357d..88a38f3bb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_end.golden index 63705da7b..3e03ac9c4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_front.golden index 41adc784d..aa94140f1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_middle.golden index d66a47680..c6aaa2952 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_end.golden index 27f6fd2e0..b8fa7427f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_front.golden index 24e502d14..235116c5a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_middle.golden index 37646faa5..0678ffc04 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added.golden index 127e90847..ff3a6d0a1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val3" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val3" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val4" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed.golden index 888c08999..f0f92b2e2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden index 45ad19c32..02dfad036 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden index 447a94af5..6bc525da3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden index 76cb9ef06..d74ca25da 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val5" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val5" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val6" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_removed.golden index b6f28b466..44e751cdf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - nested = "val1" -> null + - prop { # forces replacement + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val2" -> null + - prop { # forces replacement + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val3" -> null + - prop { # forces replacement + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { # forces replacement - - nested = "val4" -> null + - prop { # forces replacement + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { # forces replacement - + computed = (known after apply) - + nested = "val1" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val1" } - + test { # forces replacement - + computed = (known after apply) - + nested = "val2" + + prop { # forces replacement + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added.golden index 1de9875a9..838692c3a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end.golden index 9c1af455d..8e71d9ec8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end_unordered.golden index 2fcfb24b8..5e6a9b0c2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front.golden index 24ebf3720..50786549b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front_unordered.golden index 9477ea35b..1307988ca 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle.golden index cb91ff477..75800cf7e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle_unordered.golden index 3de19f40c..4bd445ea7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null.golden index 3d40302c3..067436d85 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { # forces replacement - + computed = "non-computed-value1" - + nested = "value1" + + prop { # forces replacement + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null_to_null.golden index d200f8583..2e15d6875 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_non-null_to_null.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_null_to_non-null.golden index c2f1607a9..4fc99f481 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-value" - + nested = "value" + + prop { # forces replacement + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed.golden index ea57b6068..c8aa2028f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { # forces replacement + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end.golden index 27b631a62..aeb4e7de0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end_unordered.golden index 87c9ced14..831b1537a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front.golden index 74c0f7468..8da851f26 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front_unordered.golden index d83c330b0..082a2e230 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle.golden index 7b3e9ce15..443c54ed7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle_unordered.golden index 8e95109d1..5b952246d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated.golden index b4f76f7a7..d725622a0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated_unordered.golden index a3af8c6c3..70e62a519 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_end.golden index cf125372c..328aa7b88 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_front.golden index c8d7a3a0f..946b8eb2f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val1" - + nested = "val1" + + prop { # forces replacement + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_middle.golden index 373c6cff9..dfbdff5c8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val2" - + nested = "val2" + + prop { # forces replacement + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_end.golden index 9ec766ae5..0418d3c60 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_front.golden index 1a4103a07..83be787cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { # forces replacement + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_middle.golden index 40b9ff67a..061f3c932 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { # forces replacement + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: +-1 to replace 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE_REPLACE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added.golden index 353e54999..c3cdd1008 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - + test { # forces replacement - + computed = "non-computed-val3" - + nested = "val3" + + prop { # forces replacement + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { # forces replacement - + computed = "non-computed-val4" - + nested = "val4" + + prop { # forces replacement + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "ADD_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed.golden index d4593e7f3..034c064fc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_no_overlaps.golden index 3c647ef4e..1a8236451 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[0]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_one_overlaps.golden index 5e4e96ab2..22504246a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_with_duplicates.golden index 6b4b00e7a..5e3936385 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { # forces replacement - + computed = "non-computed-val5" - + nested = "val5" + + prop { # forces replacement + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { # forces replacement - + computed = "non-computed-val6" - + nested = "val6" + + prop { # forces replacement + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[1]": map[string]interface{}{"kind": "ADD_REPLACE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_removed.golden index fa8851ce6..d59c38a45 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_and_nested_force_new_computed_specified/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: +/- resource "crossprovider_test_res" "example" { ~ id = "id" -> (known after apply) - - test { # forces replacement - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { # forces replacement + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { # forces replacement - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { # forces replacement + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 1 to add, 0 to change, 1 to destroy. +-crossprovider:index/testRes:TestRes: (replace) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[2]": map[string]interface{}{"kind": "DELETE_REPLACE"}, + "props[3]": map[string]interface{}{"kind": "DELETE_REPLACE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added.golden index 8a0de2272..c1796dacc 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = (known after apply) - + nested = "value" + + prop { + + computed = (known after apply) + + nested_prop = "value" } } @@ -27,14 +27,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end.golden index f16128f51..6abe57ea4 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end_unordered.golden index ae509e972..d5dfc9005 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,13 +50,13 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -64,8 +64,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front.golden index 1ee158309..3e25e9978 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front_unordered.golden index 485cf9314..c369bbf48 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle.golden index be8c5fc65..fb2634af0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle_unordered.golden index 5dcd42ada..34380e77f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/added_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null.golden index 0170773e4..eb6fe82c1 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "value1" + + prop { + + computed = (known after apply) + + nested_prop = "value1" } } @@ -33,9 +33,9 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "value" => "value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -43,7 +43,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null_to_null.golden index d86f5ce73..f29147148 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_non-null_to_null.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_null_to_non-null.golden index d9a3f3f7d..5a6adc46d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = (known after apply) - + nested = "value" + + prop { + + computed = (known after apply) + + nested_prop = "value" } } @@ -28,14 +28,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed.golden index 9d2c980b9..c11dad020 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed.golden @@ -14,8 +14,8 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "value" -> null + - prop { + - nested_prop = "value" -> null # (1 unchanged attribute hidden) } } @@ -29,15 +29,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "" - - nested : "value" + - computed : "" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end.golden index cb5cf4ece..e14092f23 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -65,8 +65,8 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end_unordered.golden index 899c8114b..af66c220e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_end_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front.golden index f3b02f42d..4a3902ddf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front_unordered.golden index c1f45d3dc..87679f365 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_front_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle.golden index d799448f4..20a947571 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val3" + ~ nestedProp: "val2" => "val3" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle_unordered.golden index 81b888971..17e203ae2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/removed_middle_unordered.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated.golden index ef4fe3047..fe88e4b08 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,11 +55,11 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { } @@ -69,9 +69,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated_unordered.golden index d683f9400..43e98ac9a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/same_element_updated_unordered.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,15 +55,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val4" + ~ nestedProp: "val2" => "val4" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ] Resources: @@ -71,11 +71,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_end.golden index 9b2ffd6ec..7135908e8 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } + [2]: { - + nested : "val3" + + nestedProp: "val3" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_front.golden index 719761f3c..3daa5fb6c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,14 +50,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } ~ [1]: { } + [2]: { - + nested : "val2" + + nestedProp: "val2" } ] Resources: @@ -65,9 +65,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_middle.golden index 71fb4ed7f..aaf9ac1cf 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_added_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val3" => "val2" + ~ nestedProp: "val3" => "val2" } + [2]: { - + nested : "val1" + + nestedProp: "val1" } ] Resources: @@ -66,10 +66,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_end.golden index 2e433d674..02973167f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_end.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val2" + ~ nestedProp: "val1" => "val2" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_front.golden index c04626257..0ac40ebbb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_front.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,15 +50,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_middle.golden index c3a451e7d..05dd7b0a3 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/shuffled_removed_middle.golden @@ -19,25 +19,25 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } } @@ -50,16 +50,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val3" + ~ nestedProp: "val1" => "val3" } ~ [1]: { - ~ nested : "val2" => "val1" + ~ nestedProp: "val2" => "val1" } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } ] Resources: @@ -67,10 +67,10 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added.golden index 1637ef233..e7dc17241 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val3" + + prop { + + computed = (known after apply) + + nested_prop = "val3" } - + test { - + computed = (known after apply) - + nested = "val4" + + prop { + + computed = (known after apply) + + nested_prop = "val4" } } @@ -55,16 +55,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } + [2]: { - + nested : "val3" + + nestedProp: "val3" } + [3]: { - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed.golden index 78e89cb3f..81ba1993f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,16 +65,16 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } ~ [2]: { - ~ nested : "val3" => "val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ nested : "val4" => "val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -82,11 +82,11 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden index 5c1cb78b8..3b1ef3297 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,18 +65,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ nested : "val1" => "val5" + ~ nestedProp: "val1" => "val5" } ~ [1]: { - ~ nested : "val2" => "val6" + ~ nestedProp: "val2" => "val6" } ~ [2]: { - ~ nested : "val3" => "val1" + ~ nestedProp: "val3" => "val1" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -84,13 +84,13 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden index b733ba7f7..12eb4ba2c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,37 +22,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -65,17 +65,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -83,12 +83,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3ecef9514..b0390bc5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,37 +24,37 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } - + test { - + computed = (known after apply) - + nested = "val5" + + prop { + + computed = (known after apply) + + nested_prop = "val5" } - + test { - + computed = (known after apply) - + nested = "val6" + + prop { + + computed = (known after apply) + + nested_prop = "val6" } } @@ -67,17 +67,17 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { - ~ nested : "val2" => "val5" + ~ nestedProp: "val2" => "val5" } ~ [2]: { - ~ nested : "val3" => "val6" + ~ nestedProp: "val3" => "val6" } ~ [3]: { - ~ nested : "val4" => "val2" + ~ nestedProp: "val4" => "val2" } ] Resources: @@ -85,12 +85,12 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_removed.golden index 6677548c8..de189334f 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace/two_removed.golden @@ -20,29 +20,29 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - nested = "val1" -> null + - prop { + - nested_prop = "val1" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val2" -> null + - prop { + - nested_prop = "val2" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val3" -> null + - prop { + - nested_prop = "val3" -> null # (1 unchanged attribute hidden) } - - test { - - nested = "val4" -> null + - prop { + - nested_prop = "val4" -> null # (1 unchanged attribute hidden) } - + test { - + computed = (known after apply) - + nested = "val1" + + prop { + + computed = (known after apply) + + nested_prop = "val1" } - + test { - + computed = (known after apply) - + nested = "val2" + + prop { + + computed = (known after apply) + + nested_prop = "val2" } } @@ -55,18 +55,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { } ~ [1]: { } - [2]: { - - computed: "" - - nested : "val3" + - computed : "" + - nestedProp: "val3" } - [3]: { - - computed: "" - - nested : "val4" + - computed : "" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added.golden index 9c107c39e..7ca1c48b0 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added.golden @@ -12,9 +12,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-value" - + nested = "value" + + prop { + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -27,15 +27,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end.golden index 66fbc1c2d..bc0919160 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end_unordered.golden index 698ac8437..05804ab7b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front.golden index 9a8683764..95adb9648 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front_unordered.golden index eb66a56e2..de0995169 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle.golden index 3fa147fc4..2fbd662f2 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden index 7742de733..593758212 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/added_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null.golden index 89c888348..aab1363ae 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null.golden @@ -14,13 +14,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } - + test { - + computed = "non-computed-value1" - + nested = "value1" + + prop { + + computed = "non-computed-value1" + + nested_prop = "value1" } } @@ -33,10 +33,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [0]: { - ~ computed: "non-computed-value" => "non-computed-value1" - ~ nested : "value" => "value1" + ~ computed : "non-computed-value" => "non-computed-value1" + ~ nestedProp: "value" => "value1" } ] Resources: @@ -44,7 +44,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[0].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[0].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[0].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null_to_null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null_to_null.golden index 834a96ca3..cc5535c5d 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null_to_null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_non-null_to_null.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden index 15a585c5a..3c54b777b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/changed_null_to_non-null.golden @@ -13,9 +13,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-value" - + nested = "value" + + prop { + + computed = "non-computed-value" + + nested_prop = "value" } } @@ -28,15 +28,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - + tests: [ + + props: [ + [0]: { + computed : "non-computed-value" - + nested : "value" + + nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed.golden index 5246ebfdc..79f6b51ff 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed.golden @@ -14,9 +14,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-value" -> null - - nested = "value" -> null + - prop { + - computed = "non-computed-value" -> null + - nested_prop = "value" -> null } } @@ -29,15 +29,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - - tests: [ + - props: [ - [0]: { - - computed: "non-computed-value" - - nested : "value" + - computed : "non-computed-value" + - nestedProp: "value" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end.golden index 101d829f4..7c6bfae1c 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden index d3921213c..56adeda63 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_end_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front.golden index 95cec62f9..7bed80977 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden index 4ce1bb1bb..25f5a65de 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_front_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle.golden index e27759e65..842094cfd 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden index 71aca2ff6..99f870899 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/removed_middle_unordered.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated.golden index f6696642d..9038e34eb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,10 +41,10 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [1]: { - ~ computed: "non-computed-val2" => "non-computed-val4" - ~ nested : "val2" => "val4" + ~ computed : "non-computed-val2" => "non-computed-val4" + ~ nestedProp: "val2" => "val4" } ] Resources: @@ -52,7 +52,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[1].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[1].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[1].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden index 8a21d2bb9..9e846f4ce 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/same_element_updated_unordered.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden index ae58b0bcc..2ecc6b303 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden index c73db179d..7ee108159 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val1" - + nested = "val1" + + prop { + + computed = "non-computed-val1" + + nested_prop = "val1" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val1" - + nested : "val1" + + nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden index ccd82694b..6e5995141 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_added_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val2" - + nested = "val2" + + prop { + + computed = "non-computed-val2" + + nested_prop = "val2" } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val2" - + nested : "val2" + + nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden index 8741a83c6..4b575c80e 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_end.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[2]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[2]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden index e0d9d13c4..d9d3ef76b 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_front.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val1" -> null - - nested = "val1" -> null + - prop { + - computed = "non-computed-val1" -> null + - nested_prop = "val1" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [0]: { - - computed: "non-computed-val1" - - nested : "val1" + - computed : "non-computed-val1" + - nestedProp: "val1" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[0]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[0]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden index 19dd48fb4..13f64c6c7 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/shuffled_removed_middle.golden @@ -19,9 +19,9 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val2" -> null - - nested = "val2" -> null + - prop { + - computed = "non-computed-val2" -> null + - nested_prop = "val2" -> null } # (2 unchanged blocks hidden) @@ -36,15 +36,15 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [1]: { - - computed: "non-computed-val2" - - nested : "val2" + - computed : "non-computed-val2" + - nestedProp: "val2" } ] Resources: ~ 1 to update 1 unchanged `, - detailedDiff: map[string]interface{}{"tests[1]": map[string]interface{}{"kind": "DELETE"}}, + detailedDiff: map[string]interface{}{"props[1]": map[string]interface{}{"kind": "DELETE"}}, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added.golden index e43424e12..8d64ed893 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - + test { - + computed = "non-computed-val3" - + nested = "val3" + + prop { + + computed = "non-computed-val3" + + nested_prop = "val3" } - + test { - + computed = "non-computed-val4" - + nested = "val4" + + prop { + + computed = "non-computed-val4" + + nested_prop = "val4" } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [2]: { + computed : "non-computed-val3" - + nested : "val3" + + nestedProp: "val3" } + [3]: { + computed : "non-computed-val4" - + nested : "val4" + + nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{}, - "tests[3]": map[string]interface{}{}, + "props[2]": map[string]interface{}{}, + "props[3]": map[string]interface{}{}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden index fc533b2c3..3dc7c244a 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,14 +51,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val5" - ~ nested : "val3" => "val5" + ~ computed : "non-computed-val3" => "non-computed-val5" + ~ nestedProp: "val3" => "val5" } ~ [3]: { - ~ computed: "non-computed-val4" => "non-computed-val6" - ~ nested : "val4" => "val6" + ~ computed : "non-computed-val4" => "non-computed-val6" + ~ nestedProp: "val4" => "val6" } ] Resources: @@ -66,9 +66,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[3].nested": map[string]interface{}{"kind": "UPDATE"}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[3].nestedProp": map[string]interface{}{"kind": "UPDATE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden index 95ac81c70..42c1c57f9 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_no_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,22 +51,22 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [0]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } + [1]: { + computed : "non-computed-val6" - + nested : "val6" + + nestedProp: "val6" } - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -74,9 +74,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[0]": map[string]interface{}{}, - "tests[1]": map[string]interface{}{}, - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[0]": map[string]interface{}{}, + "props[1]": map[string]interface{}{}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden index db9ebe90d..cf55e86d5 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_one_overlaps.golden @@ -22,21 +22,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -51,18 +51,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -70,9 +70,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden index 3e1d56263..4c558fe90 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_added_and_two_removed_shuffled,_with_duplicates.golden @@ -24,21 +24,21 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } - + test { - + computed = "non-computed-val5" - + nested = "val5" + + prop { + + computed = "non-computed-val5" + + nested_prop = "val5" } - + test { - + computed = "non-computed-val6" - + nested = "val6" + + prop { + + computed = "non-computed-val6" + + nested_prop = "val6" } # (2 unchanged blocks hidden) @@ -53,18 +53,18 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ + [1]: { + computed : "non-computed-val5" - + nested : "val5" + + nestedProp: "val5" } ~ [2]: { - ~ computed: "non-computed-val3" => "non-computed-val6" - ~ nested : "val3" => "val6" + ~ computed : "non-computed-val3" => "non-computed-val6" + ~ nestedProp: "val3" => "val6" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -72,9 +72,9 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[1]": map[string]interface{}{}, - "tests[2].computed": map[string]interface{}{"kind": "UPDATE"}, - "tests[2].nested": map[string]interface{}{"kind": "UPDATE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[1]": map[string]interface{}{}, + "props[2].computed": map[string]interface{}{"kind": "UPDATE"}, + "props[2].nestedProp": map[string]interface{}{"kind": "UPDATE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_removed.golden b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_removed.golden index b811014c9..c063ef5fb 100644 --- a/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_removed.golden +++ b/pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffSetNestedComputedBlock/block_with_nested_computed_no_replace_computed_specified_in_program/two_removed.golden @@ -20,13 +20,13 @@ Terraform will perform the following actions: ~ resource "crossprovider_test_res" "example" { id = "id" - - test { - - computed = "non-computed-val3" -> null - - nested = "val3" -> null + - prop { + - computed = "non-computed-val3" -> null + - nested_prop = "val3" -> null } - - test { - - computed = "non-computed-val4" -> null - - nested = "val4" -> null + - prop { + - computed = "non-computed-val4" -> null + - nested_prop = "val4" -> null } # (2 unchanged blocks hidden) @@ -41,14 +41,14 @@ Plan: 0 to add, 1 to change, 0 to destroy. ~ crossprovider:index/testRes:TestRes: (update) [id=id] [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example] - ~ tests: [ + ~ props: [ - [2]: { - - computed: "non-computed-val3" - - nested : "val3" + - computed : "non-computed-val3" + - nestedProp: "val3" } - [3]: { - - computed: "non-computed-val4" - - nested : "val4" + - computed : "non-computed-val4" + - nestedProp: "val4" } ] Resources: @@ -56,7 +56,7 @@ Resources: 1 unchanged `, detailedDiff: map[string]interface{}{ - "tests[2]": map[string]interface{}{"kind": "DELETE"}, - "tests[3]": map[string]interface{}{"kind": "DELETE"}, + "props[2]": map[string]interface{}{"kind": "DELETE"}, + "props[3]": map[string]interface{}{"kind": "DELETE"}, }, } diff --git a/pkg/tests/diff_test/value_makers.go b/pkg/tests/diff_test/value_makers.go index d919e088e..844ec34d5 100644 --- a/pkg/tests/diff_test/value_makers.go +++ b/pkg/tests/diff_test/value_makers.go @@ -17,10 +17,12 @@ func ref[T any](v T) *T { return &v } +type valueMaker[T any] func(v *T) map[string]cty.Value + type diffSchemaValueMakerPair[T any] struct { name string schema schema.Resource - valueMaker func(v *T) map[string]cty.Value + valueMaker valueMaker[T] } type diffScenario[T any] struct { @@ -225,61 +227,75 @@ func generateBaseTests[T any]( } } -func listValueMaker(arr *[]string) cty.Value { +func listValueMaker(arr *[]string) map[string]cty.Value { if arr == nil { - return cty.NullVal(cty.DynamicPseudoType) + return map[string]cty.Value{} + } + + if len(*arr) == 0 { + return map[string]cty.Value{ + "prop": cty.ListValEmpty(cty.String), + } } + slice := make([]cty.Value, len(*arr)) for i, v := range *arr { slice[i] = cty.StringVal(v) } - if len(slice) == 0 { - return cty.ListValEmpty(cty.String) + return map[string]cty.Value{ + "prop": cty.ListVal(slice), } - return cty.ListVal(slice) } -func nestedListValueMaker(arr *[]string) cty.Value { +var _ valueMaker[[]string] = listValueMaker + +func nestedListValueMaker(arr *[]string) map[string]cty.Value { if arr == nil { - return cty.NullVal(cty.DynamicPseudoType) + return map[string]cty.Value{} + } + + if len(*arr) == 0 { + return map[string]cty.Value{ + "prop": cty.ListValEmpty(cty.DynamicPseudoType), + } } + slice := make([]cty.Value, len(*arr)) for i, v := range *arr { - slice[i] = cty.ObjectVal( - map[string]cty.Value{ - "nested": cty.StringVal(v), - }, - ) + slice[i] = cty.ObjectVal(map[string]cty.Value{"nested_prop": cty.StringVal(v)}) } - if len(slice) == 0 { - return cty.ListValEmpty(cty.Object(map[string]cty.Type{"nested": cty.String})) + return map[string]cty.Value{ + "prop": cty.ListVal(slice), } - return cty.ListVal(slice) } -func nestedListValueMakerWithComputedSpecified(arr *[]string) cty.Value { +var _ valueMaker[[]string] = nestedListValueMaker + +func nestedListValueMakerWithComputedSpecified(arr *[]string) map[string]cty.Value { if arr == nil { - return cty.NullVal(cty.DynamicPseudoType) + return map[string]cty.Value{} + } + + if len(*arr) == 0 { + return map[string]cty.Value{ + "prop": cty.ListValEmpty(cty.DynamicPseudoType), + } } slice := make([]cty.Value, len(*arr)) for i, v := range *arr { - slice[i] = cty.ObjectVal( - map[string]cty.Value{ - "nested": cty.StringVal(v), - "computed": cty.StringVal("non-computed-" + v), - }, - ) + slice[i] = cty.ObjectVal(map[string]cty.Value{ + "nested_prop": cty.StringVal(v), + "computed": cty.StringVal("non-computed-" + v), + }) } - if len(slice) == 0 { - return cty.ListValEmpty(cty.Object(map[string]cty.Type{ - "nested": cty.String, - "computed": cty.String, - })) + return map[string]cty.Value{ + "prop": cty.ListVal(slice), } - return cty.ListVal(slice) } +var _ valueMaker[[]string] = nestedListValueMakerWithComputedSpecified + type testOutput struct { initialValue any changeValue any