diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/apply.json b/testing/equivalence-tests/outputs/basic_json_string_update/apply.json index 060b285be0d2..3129e2619b17 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/apply.json +++ b/testing/equivalence-tests/outputs/basic_json_string_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/plan b/testing/equivalence-tests/outputs/basic_json_string_update/plan index 654a7f1c9c5f..fb5ba9f58c08 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_json_string_update/plan @@ -13,8 +13,7 @@ Terraform will perform the following actions: ~ { ~ list-attribute = [ "one", - - "two", - + "four", + ~ "two" -> "four", "three", ] ~ object-attribute = { diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/plan.json b/testing/equivalence-tests/outputs/basic_json_string_update/plan.json index 8b4ec55f182b..851574f77914 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/plan.json +++ b/testing/equivalence-tests/outputs/basic_json_string_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_list/apply.json b/testing/equivalence-tests/outputs/basic_list/apply.json index 3021e969ea0a..932f4f5d86c4 100644 --- a/testing/equivalence-tests/outputs/basic_list/apply.json +++ b/testing/equivalence-tests/outputs/basic_list/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_list/plan.json b/testing/equivalence-tests/outputs/basic_list/plan.json index d3dfd95a6396..84be55a5fae1 100644 --- a/testing/equivalence-tests/outputs/basic_list/plan.json +++ b/testing/equivalence-tests/outputs/basic_list/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_list_empty/apply.json b/testing/equivalence-tests/outputs/basic_list_empty/apply.json index 9fcecaf4267c..ed89b851d95e 100644 --- a/testing/equivalence-tests/outputs/basic_list_empty/apply.json +++ b/testing/equivalence-tests/outputs/basic_list_empty/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_list_empty/plan.json b/testing/equivalence-tests/outputs/basic_list_empty/plan.json index 7f5fca208390..ca5704a83307 100644 --- a/testing/equivalence-tests/outputs/basic_list_empty/plan.json +++ b/testing/equivalence-tests/outputs/basic_list_empty/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -28,7 +30,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_list_null/apply.json b/testing/equivalence-tests/outputs/basic_list_null/apply.json index 9fcecaf4267c..ed89b851d95e 100644 --- a/testing/equivalence-tests/outputs/basic_list_null/apply.json +++ b/testing/equivalence-tests/outputs/basic_list_null/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_list_null/plan.json b/testing/equivalence-tests/outputs/basic_list_null/plan.json index 4797bfe7d9a0..80e94385394c 100644 --- a/testing/equivalence-tests/outputs/basic_list_null/plan.json +++ b/testing/equivalence-tests/outputs/basic_list_null/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_list_update/apply.json b/testing/equivalence-tests/outputs/basic_list_update/apply.json index 9fcecaf4267c..ed89b851d95e 100644 --- a/testing/equivalence-tests/outputs/basic_list_update/apply.json +++ b/testing/equivalence-tests/outputs/basic_list_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_list_update/plan b/testing/equivalence-tests/outputs/basic_list_update/plan index 6263c293b02f..e17c34087fc0 100644 --- a/testing/equivalence-tests/outputs/basic_list_update/plan +++ b/testing/equivalence-tests/outputs/basic_list_update/plan @@ -11,9 +11,8 @@ Terraform will perform the following actions: id = "985820B3-ACF9-4F00-94AD-F81C5EA33663" ~ list = [ "9C2BE420-042D-440A-96E9-75565341C994", - - "3EC6EB1F-E372-46C3-A069-00D6E82EC1E1", - "D01290F6-2D3A-45FA-B006-DAA80F6D31F6", - + "9B9F3ADF-8AD4-4E8C-AFE4-7BC2413E9AC0", + ~ "3EC6EB1F-E372-46C3-A069-00D6E82EC1E1" -> "D01290F6-2D3A-45FA-B006-DAA80F6D31F6", + ~ "D01290F6-2D3A-45FA-B006-DAA80F6D31F6" -> "9B9F3ADF-8AD4-4E8C-AFE4-7BC2413E9AC0", ] } diff --git a/testing/equivalence-tests/outputs/basic_list_update/plan.json b/testing/equivalence-tests/outputs/basic_list_update/plan.json index 9b99a1d26f05..1b8c00fa0a4d 100644 --- a/testing/equivalence-tests/outputs/basic_list_update/plan.json +++ b/testing/equivalence-tests/outputs/basic_list_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_map/apply.json b/testing/equivalence-tests/outputs/basic_map/apply.json index 76abb6af0897..6a8c7e002a65 100644 --- a/testing/equivalence-tests/outputs/basic_map/apply.json +++ b/testing/equivalence-tests/outputs/basic_map/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_map/plan.json b/testing/equivalence-tests/outputs/basic_map/plan.json index e854747637a5..0cb676d4dbd7 100644 --- a/testing/equivalence-tests/outputs/basic_map/plan.json +++ b/testing/equivalence-tests/outputs/basic_map/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_map_empty/apply.json b/testing/equivalence-tests/outputs/basic_map_empty/apply.json index e9654e7e6536..28e766c2dbc9 100644 --- a/testing/equivalence-tests/outputs/basic_map_empty/apply.json +++ b/testing/equivalence-tests/outputs/basic_map_empty/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_map_empty/plan.json b/testing/equivalence-tests/outputs/basic_map_empty/plan.json index e2b601ed3d8f..58ccb7db9a1e 100644 --- a/testing/equivalence-tests/outputs/basic_map_empty/plan.json +++ b/testing/equivalence-tests/outputs/basic_map_empty/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -28,7 +30,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_map_null/apply.json b/testing/equivalence-tests/outputs/basic_map_null/apply.json index e9654e7e6536..28e766c2dbc9 100644 --- a/testing/equivalence-tests/outputs/basic_map_null/apply.json +++ b/testing/equivalence-tests/outputs/basic_map_null/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_map_null/plan.json b/testing/equivalence-tests/outputs/basic_map_null/plan.json index e851f7f3e451..c8aeeab72c27 100644 --- a/testing/equivalence-tests/outputs/basic_map_null/plan.json +++ b/testing/equivalence-tests/outputs/basic_map_null/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_map_update/apply.json b/testing/equivalence-tests/outputs/basic_map_update/apply.json index e9654e7e6536..28e766c2dbc9 100644 --- a/testing/equivalence-tests/outputs/basic_map_update/apply.json +++ b/testing/equivalence-tests/outputs/basic_map_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_map_update/plan.json b/testing/equivalence-tests/outputs/basic_map_update/plan.json index e5a5d8a704b7..39ecd07d4c8b 100644 --- a/testing/equivalence-tests/outputs/basic_map_update/plan.json +++ b/testing/equivalence-tests/outputs/basic_map_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_multiline_string_update/apply.json b/testing/equivalence-tests/outputs/basic_multiline_string_update/apply.json index 982df2c18e4c..94e08ea450ca 100644 --- a/testing/equivalence-tests/outputs/basic_multiline_string_update/apply.json +++ b/testing/equivalence-tests/outputs/basic_multiline_string_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan.json b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan.json index 3a3770e29bb9..dcf819199dca 100644 --- a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan.json +++ b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_set/apply.json b/testing/equivalence-tests/outputs/basic_set/apply.json index 874e7b1d0726..34765d5e4e9f 100644 --- a/testing/equivalence-tests/outputs/basic_set/apply.json +++ b/testing/equivalence-tests/outputs/basic_set/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_set/plan.json b/testing/equivalence-tests/outputs/basic_set/plan.json index be26b68c8db6..eddd4b5e392a 100644 --- a/testing/equivalence-tests/outputs/basic_set/plan.json +++ b/testing/equivalence-tests/outputs/basic_set/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_set_empty/apply.json b/testing/equivalence-tests/outputs/basic_set_empty/apply.json index e756e6a434d4..b76d69cc2aa4 100644 --- a/testing/equivalence-tests/outputs/basic_set_empty/apply.json +++ b/testing/equivalence-tests/outputs/basic_set_empty/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_set_empty/plan.json b/testing/equivalence-tests/outputs/basic_set_empty/plan.json index 445b137c18df..297996972ec0 100644 --- a/testing/equivalence-tests/outputs/basic_set_empty/plan.json +++ b/testing/equivalence-tests/outputs/basic_set_empty/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -28,7 +30,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_set_null/apply.json b/testing/equivalence-tests/outputs/basic_set_null/apply.json index e756e6a434d4..b76d69cc2aa4 100644 --- a/testing/equivalence-tests/outputs/basic_set_null/apply.json +++ b/testing/equivalence-tests/outputs/basic_set_null/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_set_null/plan.json b/testing/equivalence-tests/outputs/basic_set_null/plan.json index 7009693fe9bd..929b2f33ed3a 100644 --- a/testing/equivalence-tests/outputs/basic_set_null/plan.json +++ b/testing/equivalence-tests/outputs/basic_set_null/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/basic_set_update/apply.json b/testing/equivalence-tests/outputs/basic_set_update/apply.json index e756e6a434d4..b76d69cc2aa4 100644 --- a/testing/equivalence-tests/outputs/basic_set_update/apply.json +++ b/testing/equivalence-tests/outputs/basic_set_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/basic_set_update/plan.json b/testing/equivalence-tests/outputs/basic_set_update/plan.json index fec737465243..85be31fa3f12 100644 --- a/testing/equivalence-tests/outputs/basic_set_update/plan.json +++ b/testing/equivalence-tests/outputs/basic_set_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/data_read/plan.json b/testing/equivalence-tests/outputs/data_read/plan.json index 592339d4d603..fcb9d75b84e0 100644 --- a/testing/equivalence-tests/outputs/data_read/plan.json +++ b/testing/equivalence-tests/outputs/data_read/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "local": { @@ -124,7 +126,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "child_modules": [ @@ -137,7 +140,9 @@ "name": "data_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content_base64": null, diff --git a/testing/equivalence-tests/outputs/drift_refresh_only/apply.json b/testing/equivalence-tests/outputs/drift_refresh_only/apply.json index 073332914909..42438bd2f70b 100644 --- a/testing/equivalence-tests/outputs/drift_refresh_only/apply.json +++ b/testing/equivalence-tests/outputs/drift_refresh_only/apply.json @@ -6,6 +6,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/drift_refresh_only/plan.json b/testing/equivalence-tests/outputs/drift_refresh_only/plan.json index afb164f2c8a6..1ae0755bdd25 100644 --- a/testing/equivalence-tests/outputs/drift_refresh_only/plan.json +++ b/testing/equivalence-tests/outputs/drift_refresh_only/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": {} }, diff --git a/testing/equivalence-tests/outputs/drift_relevant_attributes/apply.json b/testing/equivalence-tests/outputs/drift_relevant_attributes/apply.json index 68a135562cd9..5fafc91ca90a 100644 --- a/testing/equivalence-tests/outputs/drift_relevant_attributes/apply.json +++ b/testing/equivalence-tests/outputs/drift_relevant_attributes/apply.json @@ -124,6 +124,7 @@ "changes": { "add": 0, "change": 2, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan.json b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan.json index 3e7296d12535..253ad1eb2b97 100644 --- a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan.json +++ b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -44,7 +46,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/drift_simple/apply.json b/testing/equivalence-tests/outputs/drift_simple/apply.json index 08353bc21072..6bcf899845f8 100644 --- a/testing/equivalence-tests/outputs/drift_simple/apply.json +++ b/testing/equivalence-tests/outputs/drift_simple/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/drift_simple/plan.json b/testing/equivalence-tests/outputs/drift_simple/plan.json index 3eb6d3f241f8..fea4e9309d25 100644 --- a/testing/equivalence-tests/outputs/drift_simple/plan.json +++ b/testing/equivalence-tests/outputs/drift_simple/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/fully_populated_complex/apply.json b/testing/equivalence-tests/outputs/fully_populated_complex/apply.json index 3d2f7d659ff2..c3fc9932f91c 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex/apply.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/fully_populated_complex/plan.json b/testing/equivalence-tests/outputs/fully_populated_complex/plan.json index 8fab5cd66ea3..adae4e868246 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex/plan.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -237,7 +239,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/apply.json b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/apply.json index 9ed1915a3c81..701f9b918014 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/apply.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/apply.json @@ -62,6 +62,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "plan", "remove": 1 }, @@ -113,6 +114,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "destroy", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan.json b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan.json index a5132b27949b..a3d72e039814 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -232,7 +234,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": {} }, diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_update/apply.json b/testing/equivalence-tests/outputs/fully_populated_complex_update/apply.json index fd7aacaad6d8..845c722a9762 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_update/apply.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan.json b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan.json index 1cb34fd16305..f8b41bf7df3f 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan.json +++ b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -232,7 +234,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/local_provider_basic/apply.json b/testing/equivalence-tests/outputs/local_provider_basic/apply.json index ce14e02b02d6..9e72bd80b08e 100644 --- a/testing/equivalence-tests/outputs/local_provider_basic/apply.json +++ b/testing/equivalence-tests/outputs/local_provider_basic/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/local_provider_basic/plan.json b/testing/equivalence-tests/outputs/local_provider_basic/plan.json index 8bfe5d460994..df3c40c9e086 100644 --- a/testing/equivalence-tests/outputs/local_provider_basic/plan.json +++ b/testing/equivalence-tests/outputs/local_provider_basic/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "local": { @@ -30,7 +32,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ @@ -40,7 +43,9 @@ "name": "local_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content": "{\"hello\":\"world\"}", diff --git a/testing/equivalence-tests/outputs/local_provider_basic/state.json b/testing/equivalence-tests/outputs/local_provider_basic/state.json index df88d44efc56..7963a7ac535a 100644 --- a/testing/equivalence-tests/outputs/local_provider_basic/state.json +++ b/testing/equivalence-tests/outputs/local_provider_basic/state.json @@ -9,7 +9,9 @@ "name": "local_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content": "{\"hello\":\"world\"}", diff --git a/testing/equivalence-tests/outputs/local_provider_delete/apply.json b/testing/equivalence-tests/outputs/local_provider_delete/apply.json index 4e9246ee0c68..6598d86f6e73 100644 --- a/testing/equivalence-tests/outputs/local_provider_delete/apply.json +++ b/testing/equivalence-tests/outputs/local_provider_delete/apply.json @@ -64,6 +64,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/local_provider_delete/plan.json b/testing/equivalence-tests/outputs/local_provider_delete/plan.json index dc2b43987944..6cdf4199a3ae 100644 --- a/testing/equivalence-tests/outputs/local_provider_delete/plan.json +++ b/testing/equivalence-tests/outputs/local_provider_delete/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "local": { @@ -9,7 +11,8 @@ }, "root_module": {} }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": {} }, @@ -24,7 +27,9 @@ "name": "local_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content": "{\"hello\":\"world\"}", @@ -71,5 +76,46 @@ "provider_name": "registry.terraform.io/hashicorp/local", "type": "local_file" } + ], + "resource_drift": [ + { + "address": "local_file.local_file", + "change": { + "actions": [ + "update" + ], + "after": { + "content": "{\"hello\":\"world\"}", + "content_base64": null, + "directory_permission": "0777", + "file_permission": "0777", + "filename": "output.json", + "id": "2248ee2fa0aaaad99178531f924bf00b4b0a8f4e", + "sensitive_content": null, + "source": null + }, + "after_sensitive": { + "sensitive_content": true + }, + "after_unknown": {}, + "before": { + "content": "{\"hello\":\"world\"}", + "content_base64": null, + "directory_permission": "0777", + "file_permission": "0777", + "filename": "output.json", + "id": "2248ee2fa0aaaad99178531f924bf00b4b0a8f4e", + "sensitive_content": null, + "source": null + }, + "before_sensitive": { + "sensitive_content": true + } + }, + "mode": "managed", + "name": "local_file", + "provider_name": "registry.terraform.io/hashicorp/local", + "type": "local_file" + } ] } \ No newline at end of file diff --git a/testing/equivalence-tests/outputs/local_provider_update/apply.json b/testing/equivalence-tests/outputs/local_provider_update/apply.json index 6c69fe47a433..3adabc70638c 100644 --- a/testing/equivalence-tests/outputs/local_provider_update/apply.json +++ b/testing/equivalence-tests/outputs/local_provider_update/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/local_provider_update/plan.json b/testing/equivalence-tests/outputs/local_provider_update/plan.json index 519b53702da0..e4f137d61a77 100644 --- a/testing/equivalence-tests/outputs/local_provider_update/plan.json +++ b/testing/equivalence-tests/outputs/local_provider_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "local": { @@ -30,7 +32,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ @@ -66,7 +69,9 @@ "name": "local_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content": "{\"hello\":\"world\"}", @@ -131,5 +136,46 @@ "provider_name": "registry.terraform.io/hashicorp/local", "type": "local_file" } + ], + "resource_drift": [ + { + "address": "local_file.local_file", + "change": { + "actions": [ + "update" + ], + "after": { + "content": "{\"hello\":\"world\"}", + "content_base64": null, + "directory_permission": "0777", + "file_permission": "0777", + "filename": "output.json", + "id": "2248ee2fa0aaaad99178531f924bf00b4b0a8f4e", + "sensitive_content": null, + "source": null + }, + "after_sensitive": { + "sensitive_content": true + }, + "after_unknown": {}, + "before": { + "content": "{\"hello\":\"world\"}", + "content_base64": null, + "directory_permission": "0777", + "file_permission": "0777", + "filename": "output.json", + "id": "2248ee2fa0aaaad99178531f924bf00b4b0a8f4e", + "sensitive_content": null, + "source": null + }, + "before_sensitive": { + "sensitive_content": true + } + }, + "mode": "managed", + "name": "local_file", + "provider_name": "registry.terraform.io/hashicorp/local", + "type": "local_file" + } ] } \ No newline at end of file diff --git a/testing/equivalence-tests/outputs/local_provider_update/state.json b/testing/equivalence-tests/outputs/local_provider_update/state.json index 037c92a9da68..e8c649c25596 100644 --- a/testing/equivalence-tests/outputs/local_provider_update/state.json +++ b/testing/equivalence-tests/outputs/local_provider_update/state.json @@ -9,7 +9,9 @@ "name": "local_file", "provider_name": "registry.terraform.io/hashicorp/local", "schema_version": 0, - "sensitive_values": {}, + "sensitive_values": { + "sensitive_content": true + }, "type": "local_file", "values": { "content": "{\"goodbye\":\"world\"}", diff --git a/testing/equivalence-tests/outputs/moved_simple/apply.json b/testing/equivalence-tests/outputs/moved_simple/apply.json index 073332914909..42438bd2f70b 100644 --- a/testing/equivalence-tests/outputs/moved_simple/apply.json +++ b/testing/equivalence-tests/outputs/moved_simple/apply.json @@ -6,6 +6,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/moved_simple/plan.json b/testing/equivalence-tests/outputs/moved_simple/plan.json index bf2df76059f4..2aefad14ee05 100644 --- a/testing/equivalence-tests/outputs/moved_simple/plan.json +++ b/testing/equivalence-tests/outputs/moved_simple/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/moved_with_drift/apply.json b/testing/equivalence-tests/outputs/moved_with_drift/apply.json index 55dc6104ddca..272591eed8a4 100644 --- a/testing/equivalence-tests/outputs/moved_with_drift/apply.json +++ b/testing/equivalence-tests/outputs/moved_with_drift/apply.json @@ -133,6 +133,7 @@ "changes": { "add": 0, "change": 2, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/moved_with_drift/plan.json b/testing/equivalence-tests/outputs/moved_with_drift/plan.json index 8f5bb0c81d49..f0411ed53745 100644 --- a/testing/equivalence-tests/outputs/moved_with_drift/plan.json +++ b/testing/equivalence-tests/outputs/moved_with_drift/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -41,7 +43,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/moved_with_refresh_only/apply.json b/testing/equivalence-tests/outputs/moved_with_refresh_only/apply.json index 073332914909..42438bd2f70b 100644 --- a/testing/equivalence-tests/outputs/moved_with_refresh_only/apply.json +++ b/testing/equivalence-tests/outputs/moved_with_refresh_only/apply.json @@ -6,6 +6,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/moved_with_refresh_only/plan.json b/testing/equivalence-tests/outputs/moved_with_refresh_only/plan.json index 9b99965a1139..cf7d4969f0ff 100644 --- a/testing/equivalence-tests/outputs/moved_with_refresh_only/plan.json +++ b/testing/equivalence-tests/outputs/moved_with_refresh_only/plan.json @@ -1,4 +1,6 @@ { + "applyable": false, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": {} }, diff --git a/testing/equivalence-tests/outputs/moved_with_update/apply.json b/testing/equivalence-tests/outputs/moved_with_update/apply.json index 259c7f8b8146..fd673b3501ac 100644 --- a/testing/equivalence-tests/outputs/moved_with_update/apply.json +++ b/testing/equivalence-tests/outputs/moved_with_update/apply.json @@ -74,6 +74,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/moved_with_update/plan.json b/testing/equivalence-tests/outputs/moved_with_update/plan.json index 3c6cf7bd12fd..b588fdcba8a4 100644 --- a/testing/equivalence-tests/outputs/moved_with_update/plan.json +++ b/testing/equivalence-tests/outputs/moved_with_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/multiple_block_types/apply.json b/testing/equivalence-tests/outputs/multiple_block_types/apply.json index 4c50475d7e73..bfec2a1e3eb9 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types/apply.json +++ b/testing/equivalence-tests/outputs/multiple_block_types/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/multiple_block_types/plan.json b/testing/equivalence-tests/outputs/multiple_block_types/plan.json index 2ee106a9f989..392c7e042056 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types/plan.json +++ b/testing/equivalence-tests/outputs/multiple_block_types/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -54,7 +56,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/multiple_block_types_update/apply.json b/testing/equivalence-tests/outputs/multiple_block_types_update/apply.json index bcca9a997e78..ed9b3a9f9a41 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types_update/apply.json +++ b/testing/equivalence-tests/outputs/multiple_block_types_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/multiple_block_types_update/plan.json b/testing/equivalence-tests/outputs/multiple_block_types_update/plan.json index e85385049dda..e6b0578ba898 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types_update/plan.json +++ b/testing/equivalence-tests/outputs/multiple_block_types_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -54,7 +56,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_list/apply.json b/testing/equivalence-tests/outputs/nested_list/apply.json index 0632d9554f08..48d3386a955a 100644 --- a/testing/equivalence-tests/outputs/nested_list/apply.json +++ b/testing/equivalence-tests/outputs/nested_list/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_list/plan.json b/testing/equivalence-tests/outputs/nested_list/plan.json index 0b8aca58109d..9848f3f6634d 100644 --- a/testing/equivalence-tests/outputs/nested_list/plan.json +++ b/testing/equivalence-tests/outputs/nested_list/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_list_update/apply.json b/testing/equivalence-tests/outputs/nested_list_update/apply.json index f1a10ce68995..5ffd1a5ad7a6 100644 --- a/testing/equivalence-tests/outputs/nested_list_update/apply.json +++ b/testing/equivalence-tests/outputs/nested_list_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_list_update/plan b/testing/equivalence-tests/outputs/nested_list_update/plan index facc226a51ab..be5e788baa93 100644 --- a/testing/equivalence-tests/outputs/nested_list_update/plan +++ b/testing/equivalence-tests/outputs/nested_list_update/plan @@ -10,19 +10,15 @@ Terraform will perform the following actions: ~ resource "tfcoremock_nested_list" "nested_list" { id = "DA051126-BAD6-4EB2-92E5-F0250DAF0B92" ~ lists = [ - - [], - [ - "44E1C623-7B70-4D78-B4D3-D9CFE8A6D982", + ~ [ + + "44E1C623-7B70-4D78-B4D3-D9CFE8A6D982", ], - - [ - - "13E3B154-7B85-4EAA-B3D0-E295E7D71D7F", - - "8B031CD1-01F7-422C-BBE6-FF8A0E18CDFD", - ], - + [ - + "8B031CD1-01F7-422C-BBE6-FF8A0E18CDFD", + ~ [ + ~ "44E1C623-7B70-4D78-B4D3-D9CFE8A6D982" -> "8B031CD1-01F7-422C-BBE6-FF8A0E18CDFD", ], - + [ - + "13E3B154-7B85-4EAA-B3D0-E295E7D71D7F", + ~ [ + "13E3B154-7B85-4EAA-B3D0-E295E7D71D7F", + - "8B031CD1-01F7-422C-BBE6-FF8A0E18CDFD", ], ] } diff --git a/testing/equivalence-tests/outputs/nested_list_update/plan.json b/testing/equivalence-tests/outputs/nested_list_update/plan.json index 3f4a1bb403eb..0409d03658ee 100644 --- a/testing/equivalence-tests/outputs/nested_list_update/plan.json +++ b/testing/equivalence-tests/outputs/nested_list_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -38,7 +40,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_map/apply.json b/testing/equivalence-tests/outputs/nested_map/apply.json index 761b25f7d564..019b069d799c 100644 --- a/testing/equivalence-tests/outputs/nested_map/apply.json +++ b/testing/equivalence-tests/outputs/nested_map/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_map/plan.json b/testing/equivalence-tests/outputs/nested_map/plan.json index ad4f49ce9337..2d4783e7086d 100644 --- a/testing/equivalence-tests/outputs/nested_map/plan.json +++ b/testing/equivalence-tests/outputs/nested_map/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_map_update/apply.json b/testing/equivalence-tests/outputs/nested_map_update/apply.json index 5969c5a25916..552c2d7bdf57 100644 --- a/testing/equivalence-tests/outputs/nested_map_update/apply.json +++ b/testing/equivalence-tests/outputs/nested_map_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_map_update/plan.json b/testing/equivalence-tests/outputs/nested_map_update/plan.json index a47fb5e5dfa1..208f839c59e9 100644 --- a/testing/equivalence-tests/outputs/nested_map_update/plan.json +++ b/testing/equivalence-tests/outputs/nested_map_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_objects/apply.json b/testing/equivalence-tests/outputs/nested_objects/apply.json index 82977fb0ba58..c920704636e0 100644 --- a/testing/equivalence-tests/outputs/nested_objects/apply.json +++ b/testing/equivalence-tests/outputs/nested_objects/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_objects/plan.json b/testing/equivalence-tests/outputs/nested_objects/plan.json index f1700b6903ba..20dfa2bffbef 100644 --- a/testing/equivalence-tests/outputs/nested_objects/plan.json +++ b/testing/equivalence-tests/outputs/nested_objects/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_objects_update/apply.json b/testing/equivalence-tests/outputs/nested_objects_update/apply.json index 285c304c20fe..447dd24e9f78 100644 --- a/testing/equivalence-tests/outputs/nested_objects_update/apply.json +++ b/testing/equivalence-tests/outputs/nested_objects_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_objects_update/plan.json b/testing/equivalence-tests/outputs/nested_objects_update/plan.json index 1aedd959ed97..6fa46265d92f 100644 --- a/testing/equivalence-tests/outputs/nested_objects_update/plan.json +++ b/testing/equivalence-tests/outputs/nested_objects_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_set/apply.json b/testing/equivalence-tests/outputs/nested_set/apply.json index 2e9eef4b073b..63a6cadc56ba 100644 --- a/testing/equivalence-tests/outputs/nested_set/apply.json +++ b/testing/equivalence-tests/outputs/nested_set/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_set/plan.json b/testing/equivalence-tests/outputs/nested_set/plan.json index 68b0bfa3e408..aa90c453a9ce 100644 --- a/testing/equivalence-tests/outputs/nested_set/plan.json +++ b/testing/equivalence-tests/outputs/nested_set/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -37,7 +39,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/nested_set_update/apply.json b/testing/equivalence-tests/outputs/nested_set_update/apply.json index 0241b89904f4..505efe8e7e91 100644 --- a/testing/equivalence-tests/outputs/nested_set_update/apply.json +++ b/testing/equivalence-tests/outputs/nested_set_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/nested_set_update/plan.json b/testing/equivalence-tests/outputs/nested_set_update/plan.json index e357a21e7363..8317feb74d04 100644 --- a/testing/equivalence-tests/outputs/nested_set_update/plan.json +++ b/testing/equivalence-tests/outputs/nested_set_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -38,7 +40,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/null_provider_basic/apply.json b/testing/equivalence-tests/outputs/null_provider_basic/apply.json index 7a3a73a0f984..fc6c3494684c 100644 --- a/testing/equivalence-tests/outputs/null_provider_basic/apply.json +++ b/testing/equivalence-tests/outputs/null_provider_basic/apply.json @@ -61,6 +61,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/null_provider_basic/plan.json b/testing/equivalence-tests/outputs/null_provider_basic/plan.json index fdbdfa8202af..f34bfa46e549 100644 --- a/testing/equivalence-tests/outputs/null_provider_basic/plan.json +++ b/testing/equivalence-tests/outputs/null_provider_basic/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "null": { @@ -20,7 +22,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/null_provider_basic/state b/testing/equivalence-tests/outputs/null_provider_basic/state index 1484fc6a9ed7..e719844c60c3 100644 --- a/testing/equivalence-tests/outputs/null_provider_basic/state +++ b/testing/equivalence-tests/outputs/null_provider_basic/state @@ -1,4 +1,4 @@ # null_resource.null_resource: resource "null_resource" "null_resource" { - id = "8145960078408660399" + id = "5363570677767575363" } diff --git a/testing/equivalence-tests/outputs/null_provider_delete/apply.json b/testing/equivalence-tests/outputs/null_provider_delete/apply.json index 5aeecbfb981a..3c8364b01fbf 100644 --- a/testing/equivalence-tests/outputs/null_provider_delete/apply.json +++ b/testing/equivalence-tests/outputs/null_provider_delete/apply.json @@ -64,6 +64,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/null_provider_delete/plan.json b/testing/equivalence-tests/outputs/null_provider_delete/plan.json index 911d8401c654..72ca35c4850c 100644 --- a/testing/equivalence-tests/outputs/null_provider_delete/plan.json +++ b/testing/equivalence-tests/outputs/null_provider_delete/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "null": { @@ -9,7 +11,8 @@ }, "root_module": {} }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": {} }, diff --git a/testing/equivalence-tests/outputs/replace_within_list/apply.json b/testing/equivalence-tests/outputs/replace_within_list/apply.json index c22e4cda9d9a..8ea8b6e82a4e 100644 --- a/testing/equivalence-tests/outputs/replace_within_list/apply.json +++ b/testing/equivalence-tests/outputs/replace_within_list/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/replace_within_list/plan.json b/testing/equivalence-tests/outputs/replace_within_list/plan.json index 4918f9a87c5a..2b954ce8de4c 100644 --- a/testing/equivalence-tests/outputs/replace_within_list/plan.json +++ b/testing/equivalence-tests/outputs/replace_within_list/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -38,7 +40,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/replace_within_map/apply.json b/testing/equivalence-tests/outputs/replace_within_map/apply.json index 70c8f8db75e1..0723cca15da7 100644 --- a/testing/equivalence-tests/outputs/replace_within_map/apply.json +++ b/testing/equivalence-tests/outputs/replace_within_map/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/replace_within_map/plan.json b/testing/equivalence-tests/outputs/replace_within_map/plan.json index f0e1a08f0167..bd795d7f48fa 100644 --- a/testing/equivalence-tests/outputs/replace_within_map/plan.json +++ b/testing/equivalence-tests/outputs/replace_within_map/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -38,7 +40,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/replace_within_object/apply.json b/testing/equivalence-tests/outputs/replace_within_object/apply.json index c780128155a0..65ddae991c2d 100644 --- a/testing/equivalence-tests/outputs/replace_within_object/apply.json +++ b/testing/equivalence-tests/outputs/replace_within_object/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/replace_within_object/plan.json b/testing/equivalence-tests/outputs/replace_within_object/plan.json index 2ab59e9d05ef..e85424ca7dd4 100644 --- a/testing/equivalence-tests/outputs/replace_within_object/plan.json +++ b/testing/equivalence-tests/outputs/replace_within_object/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -30,7 +32,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/replace_within_set/apply.json b/testing/equivalence-tests/outputs/replace_within_set/apply.json index ce4614109f94..57c5530a8476 100644 --- a/testing/equivalence-tests/outputs/replace_within_set/apply.json +++ b/testing/equivalence-tests/outputs/replace_within_set/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/replace_within_set/plan.json b/testing/equivalence-tests/outputs/replace_within_set/plan.json index 26f8794eaf17..68f81b341fab 100644 --- a/testing/equivalence-tests/outputs/replace_within_set/plan.json +++ b/testing/equivalence-tests/outputs/replace_within_set/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -38,7 +40,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/simple_object/apply.json b/testing/equivalence-tests/outputs/simple_object/apply.json index dae7915be65e..feb1234976fa 100644 --- a/testing/equivalence-tests/outputs/simple_object/apply.json +++ b/testing/equivalence-tests/outputs/simple_object/apply.json @@ -63,6 +63,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/simple_object/plan.json b/testing/equivalence-tests/outputs/simple_object/plan.json index bfb61b5789c4..230245c9c86b 100644 --- a/testing/equivalence-tests/outputs/simple_object/plan.json +++ b/testing/equivalence-tests/outputs/simple_object/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/simple_object_empty/apply.json b/testing/equivalence-tests/outputs/simple_object_empty/apply.json index fb10e7e9aaf7..6071cb9d9f08 100644 --- a/testing/equivalence-tests/outputs/simple_object_empty/apply.json +++ b/testing/equivalence-tests/outputs/simple_object_empty/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/simple_object_empty/plan.json b/testing/equivalence-tests/outputs/simple_object_empty/plan.json index 1b55d0127fdd..98c76c3eab37 100644 --- a/testing/equivalence-tests/outputs/simple_object_empty/plan.json +++ b/testing/equivalence-tests/outputs/simple_object_empty/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -25,7 +27,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/simple_object_null/apply.json b/testing/equivalence-tests/outputs/simple_object_null/apply.json index fb10e7e9aaf7..6071cb9d9f08 100644 --- a/testing/equivalence-tests/outputs/simple_object_null/apply.json +++ b/testing/equivalence-tests/outputs/simple_object_null/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/simple_object_null/plan.json b/testing/equivalence-tests/outputs/simple_object_null/plan.json index fe72bd359840..df7695adcf07 100644 --- a/testing/equivalence-tests/outputs/simple_object_null/plan.json +++ b/testing/equivalence-tests/outputs/simple_object_null/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -20,7 +22,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/simple_object_replace/apply.json b/testing/equivalence-tests/outputs/simple_object_replace/apply.json index 8bfffb30a519..10845820aa56 100644 --- a/testing/equivalence-tests/outputs/simple_object_replace/apply.json +++ b/testing/equivalence-tests/outputs/simple_object_replace/apply.json @@ -103,6 +103,7 @@ "changes": { "add": 1, "change": 0, + "import": 0, "operation": "apply", "remove": 1 }, diff --git a/testing/equivalence-tests/outputs/simple_object_replace/plan.json b/testing/equivalence-tests/outputs/simple_object_replace/plan.json index 1ba2211b122f..5dc83cdaadfa 100644 --- a/testing/equivalence-tests/outputs/simple_object_replace/plan.json +++ b/testing/equivalence-tests/outputs/simple_object_replace/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -32,7 +34,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/simple_object_update/apply.json b/testing/equivalence-tests/outputs/simple_object_update/apply.json index fb10e7e9aaf7..6071cb9d9f08 100644 --- a/testing/equivalence-tests/outputs/simple_object_update/apply.json +++ b/testing/equivalence-tests/outputs/simple_object_update/apply.json @@ -65,6 +65,7 @@ "changes": { "add": 0, "change": 1, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/simple_object_update/plan.json b/testing/equivalence-tests/outputs/simple_object_update/plan.json index bffedb803fd6..76bc1bcc2224 100644 --- a/testing/equivalence-tests/outputs/simple_object_update/plan.json +++ b/testing/equivalence-tests/outputs/simple_object_update/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "provider_config": { "tfcoremock": { @@ -29,7 +31,8 @@ ] } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "planned_values": { "root_module": { "resources": [ diff --git a/testing/equivalence-tests/outputs/variables_and_outputs/apply.json b/testing/equivalence-tests/outputs/variables_and_outputs/apply.json index 5a4b8b73db94..2f267f861dbf 100644 --- a/testing/equivalence-tests/outputs/variables_and_outputs/apply.json +++ b/testing/equivalence-tests/outputs/variables_and_outputs/apply.json @@ -6,6 +6,7 @@ "changes": { "add": 0, "change": 0, + "import": 0, "operation": "apply", "remove": 0 }, diff --git a/testing/equivalence-tests/outputs/variables_and_outputs/plan.json b/testing/equivalence-tests/outputs/variables_and_outputs/plan.json index afba1f99766c..8560bac370cf 100644 --- a/testing/equivalence-tests/outputs/variables_and_outputs/plan.json +++ b/testing/equivalence-tests/outputs/variables_and_outputs/plan.json @@ -1,4 +1,6 @@ { + "applyable": true, + "complete": true, "configuration": { "root_module": { "outputs": { @@ -65,7 +67,8 @@ } } }, - "format_version": "1.1", + "errored": false, + "format_version": "1.2", "output_changes": { "list_empty_default": { "actions": [