From b30711ac4c89799ac38d5a727c40790a9a79d95c Mon Sep 17 00:00:00 2001 From: Elbaz Date: Wed, 23 Aug 2023 15:55:12 +0300 Subject: [PATCH 1/4] updates --- .../equivalence-tests/outputs/basic_json_string_update/plan | 2 +- testing/equivalence-tests/outputs/basic_list/plan | 6 +++--- testing/equivalence-tests/outputs/basic_list_empty/plan | 6 +++--- testing/equivalence-tests/outputs/basic_list_null/plan | 6 +++--- testing/equivalence-tests/outputs/basic_list_update/plan | 6 +++--- testing/equivalence-tests/outputs/basic_map/plan | 6 +++--- testing/equivalence-tests/outputs/basic_map_empty/plan | 6 +++--- testing/equivalence-tests/outputs/basic_map_null/plan | 6 +++--- testing/equivalence-tests/outputs/basic_map_update/plan | 6 +++--- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/plan b/testing/equivalence-tests/outputs/basic_json_string_update/plan index 654a7f1c9c..522e66cff2 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_json_string_update/plan @@ -35,4 +35,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_list/plan b/testing/equivalence-tests/outputs/basic_list/plan index dee4008613..8b51bba4e6 100644 --- a/testing/equivalence-tests/outputs/basic_list/plan +++ b/testing/equivalence-tests/outputs/basic_list/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_list.list will be created + resource "tfcoremock_list" "list" { @@ -22,4 +22,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_list_empty/plan b/testing/equivalence-tests/outputs/basic_list_empty/plan index 8f4de24a1d..9181b358e9 100644 --- a/testing/equivalence-tests/outputs/basic_list_empty/plan +++ b/testing/equivalence-tests/outputs/basic_list_empty/plan @@ -1,10 +1,10 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_list.list will be updated in-place ~ resource "tfcoremock_list" "list" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_list_null/plan b/testing/equivalence-tests/outputs/basic_list_null/plan index a9f8617c0d..8a7c211506 100644 --- a/testing/equivalence-tests/outputs/basic_list_null/plan +++ b/testing/equivalence-tests/outputs/basic_list_null/plan @@ -1,10 +1,10 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_list.list will be updated in-place ~ resource "tfcoremock_list" "list" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_list_update/plan b/testing/equivalence-tests/outputs/basic_list_update/plan index 6263c293b0..6fd85a54e7 100644 --- a/testing/equivalence-tests/outputs/basic_list_update/plan +++ b/testing/equivalence-tests/outputs/basic_list_update/plan @@ -1,10 +1,10 @@ tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_list.list will be updated in-place ~ resource "tfcoremock_list" "list" { @@ -24,4 +24,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_map/plan b/testing/equivalence-tests/outputs/basic_map/plan index d4b18d5471..47e587b3ba 100644 --- a/testing/equivalence-tests/outputs/basic_map/plan +++ b/testing/equivalence-tests/outputs/basic_map/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_map.map will be created + resource "tfcoremock_map" "map" { @@ -22,4 +22,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_map_empty/plan b/testing/equivalence-tests/outputs/basic_map_empty/plan index 0eae681e96..ff82fa0bb3 100644 --- a/testing/equivalence-tests/outputs/basic_map_empty/plan +++ b/testing/equivalence-tests/outputs/basic_map_empty/plan @@ -1,10 +1,10 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_map.map will be updated in-place ~ resource "tfcoremock_map" "map" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_map_null/plan b/testing/equivalence-tests/outputs/basic_map_null/plan index 4fbdf38143..f86cb5b5f1 100644 --- a/testing/equivalence-tests/outputs/basic_map_null/plan +++ b/testing/equivalence-tests/outputs/basic_map_null/plan @@ -1,10 +1,10 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_map.map will be updated in-place ~ resource "tfcoremock_map" "map" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_map_update/plan b/testing/equivalence-tests/outputs/basic_map_update/plan index 122d000556..0f2a275a0b 100644 --- a/testing/equivalence-tests/outputs/basic_map_update/plan +++ b/testing/equivalence-tests/outputs/basic_map_update/plan @@ -1,10 +1,10 @@ tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_map.map will be updated in-place ~ resource "tfcoremock_map" "map" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" From 680419d9491c20f0d507c67c01346068666e6d55 Mon Sep 17 00:00:00 2001 From: Elbaz Date: Wed, 23 Aug 2023 17:41:48 +0300 Subject: [PATCH 2/4] updates --- .github/CONTRIBUTING.md | 2 +- .github/actions/equivalence-test/action.yml | 14 +++++++------- .github/scripts/equivalence-test.sh | 6 +++--- .github/scripts/get_product_version.sh | 2 +- .github/workflows/build-Dockerfile | 2 +- main.go | 14 +++++++------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f337094d2d..db6ea4c097 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -22,7 +22,7 @@ The contribution guideline will change in the near future, as the management of ## Proposing a Change -In order to be respectful of the time of community contributors, we aim to discuss potential changes in GitHub issues prior to implementation. That will allow us to give design feedback up front and set expectations about the scope of the change, and, for larger changes, how best to approach the work such that the Terraform team can review it and merge it along with other concurrent work. +In order to be respectful of the time of community contributors, we aim to discuss potential changes in GitHub issues prior to implementation. That will allow us to give design feedback up front and set expectations about the scope of the change, and, for larger changes, how best to approach the work such that the OpenTF team can review it and merge it along with other concurrent work. If the bug you wish to fix or enhancement you wish to implement isn't already covered by a GitHub issue, please do start a discussion (either in [a new GitHub issue](https://github.com/placeholderplaceholderplaceholder/opentf/issues/new/choose) or an existing one, as appropriate) before you invest significant development time. diff --git a/.github/actions/equivalence-test/action.yml b/.github/actions/equivalence-test/action.yml index 95b30105b9..f73f764e9f 100644 --- a/.github/actions/equivalence-test/action.yml +++ b/.github/actions/equivalence-test/action.yml @@ -2,16 +2,16 @@ # SPDX-License-Identifier: MPL-2.0 name: equivalence-test -description: "Execute the suite of Terraform equivalence tests in testing/equivalence-tests" +description: "Execute the suite of OpenTF equivalence tests in testing/equivalence-tests" inputs: - target-terraform-version: - description: "The version of Terraform to use in execution." + target-opentf-version: + description: "The version of OpenTF to use in execution." required: true - target-terraform-branch: + target-opentf-branch: description: "The branch within this repository to update and compare." required: true target-equivalence-test-version: - description: "The version of the Terraform equivalence tests to use." + description: "The version of the OpenTF equivalence tests to use." default: "0.3.0" target-os: description: "Current operating system" @@ -30,7 +30,7 @@ runs: ./bin/equivalence-tests \ ${{ inputs.target-os }} \ ${{ inputs.target-arch }} - - name: "download terraform binary" + - name: "download opentf binary" shell: bash run: | ./.github/scripts/equivalence-test.sh download_terraform_binary \ @@ -51,7 +51,7 @@ runs: echo "found changes, and pushing new golden files into branch ${{ inputs.target-terraform-branch }}." git config user.email "52939924+teamterraform@users.noreply.github.com" - git config user.name "The Terraform Team" + git config user.name "The OpenTF Team" git add ./testing/equivalence-tests/outputs git commit -m "Automated equivalence test golden file update for release ${{ inputs.target-terraform-version }}." diff --git a/.github/scripts/equivalence-test.sh b/.github/scripts/equivalence-test.sh index e82ce32637..c9ce659fda 100755 --- a/.github/scripts/equivalence-test.sh +++ b/.github/scripts/equivalence-test.sh @@ -10,11 +10,11 @@ Usage: ./equivalence-test.sh [] [] Description: This script will handle various commands related to the execution of the - Terraform equivalence tests. + OpenTF equivalence tests. Commands: get_target_branch - get_target_branch returns the default target branch for a given Terraform + get_target_branch returns the default target branch for a given OpenTF version. target_branch=$(./equivalence-test.sh get_target_branch v1.4.3); target_branch=v1.4 @@ -27,7 +27,7 @@ Commands: ./equivalence-test.sh download_equivalence_test_binary 0.3.0 ./bin/terraform-equivalence-testing linux amd64 download_terraform_binary - download_terraform_binary downloads the terraform release binary for a given + download_terraform_binary downloads the opentf release binary for a given version and places it at the target path. ./equivalence-test.sh download_terraform_binary 1.4.3 ./bin/terraform linux amd64 diff --git a/.github/scripts/get_product_version.sh b/.github/scripts/get_product_version.sh index a3a5a71add..ff12d3f4df 100755 --- a/.github/scripts/get_product_version.sh +++ b/.github/scripts/get_product_version.sh @@ -30,7 +30,7 @@ LDFLAGS="${LDFLAGS} -X 'main.experimentsAllowed=yes'" fi LDFLAGS="${LDFLAGS} -X 'github.com/placeholderplaceholderplaceholder/opentf/version.dev=no'" -echo "Building Terraform CLI ${VERSION}" +echo "Building OpenTF CLI ${VERSION}" if [[ "$EXPERIMENTS_ENABLED" == 1 ]]; then echo "This build allows use of experimental features" fi diff --git a/.github/workflows/build-Dockerfile b/.github/workflows/build-Dockerfile index e4b4658512..12056da148 100644 --- a/.github/workflows/build-Dockerfile +++ b/.github/workflows/build-Dockerfile @@ -4,7 +4,7 @@ # # If you want to test this locally you'll need to set the three arguments # to values realistic for what the hashicorp/actions-docker-build GitHub -# action would set, and ensure that there's a suitable "terraform" executable +# action would set, and ensure that there's a suitable "opentf" executable # in the dist/linux/${TARGETARCH} directory. FROM docker.mirror.hashicorp.services/alpine:latest AS default diff --git a/main.go b/main.go index c3bd9a4a51..835da48f22 100644 --- a/main.go +++ b/main.go @@ -75,7 +75,7 @@ func realMain() int { // explicit environment variable to enable telemetry collection, // so in typical use we cannot get here. Ui.Error(fmt.Sprintf("Could not initialize telemetry: %s", err)) - Ui.Error(fmt.Sprintf("Unset environment variable %s if you don't intend to collect telemetry from Terraform.", openTelemetryExporterEnvVar)) + Ui.Error(fmt.Sprintf("Unset environment variable %s if you don't intend to collect telemetry from OpenTF.", openTelemetryExporterEnvVar)) return 1 } var ctx context.Context @@ -83,7 +83,7 @@ func realMain() int { { // At minimum we emit a span covering the entire command execution. _, displayArgs := shquot.POSIXShellSplit(os.Args) - ctx, otelSpan = tracer.Start(context.Background(), fmt.Sprintf("terraform %s", displayArgs)) + ctx, otelSpan = tracer.Start(context.Background(), fmt.Sprintf("opentf %s", displayArgs)) defer otelSpan.End() } @@ -101,7 +101,7 @@ func realMain() int { } log.Printf( - "[INFO] Terraform version: %s %s", + "[INFO] OpenTF version: %s %s", Version, VersionPrerelease) for _, depMod := range version.InterestingDependencies() { log.Printf("[DEBUG] using %s %s", depMod.Path, depMod.Version) @@ -109,7 +109,7 @@ func realMain() int { log.Printf("[INFO] Go runtime version: %s", runtime.Version()) log.Printf("[INFO] CLI args: %#v", os.Args) if ExperimentsAllowed() { - log.Printf("[INFO] This build of Terraform allows using experimental features") + log.Printf("[INFO] This build of OpenTF allows using experimental features") } streams, err := terminal.Init() @@ -157,7 +157,7 @@ func realMain() int { Ui.Error(format.Diagnostic(diag, nil, earlyColor, 78)) } if diags.HasErrors() { - Ui.Error("As a result of the above problems, Terraform may not behave as intended.\n\n") + Ui.Error("As a result of the above problems, OpenTF may not behave as intended.\n\n") // We continue to run anyway, since Terraform has reasonable defaults. } } @@ -195,7 +195,7 @@ func realMain() int { Ui.Error(format.Diagnostic(diag, nil, earlyColor, 78)) } if diags.HasErrors() { - Ui.Error("As a result of the above problems, Terraform's provider installer may not behave as intended.\n\n") + Ui.Error("As a result of the above problems, OpenTF's provider installer may not behave as intended.\n\n") // We continue to run anyway, because most commands don't do provider installation. } } @@ -331,7 +331,7 @@ func realMain() int { if suggestion != "" { suggestion = fmt.Sprintf(" Did you mean %q?", suggestion) } - fmt.Fprintf(os.Stderr, "Terraform has no command named %q.%s\n\nTo see all of Terraform's top-level commands, run:\n terraform -help\n\n", cmd, suggestion) + fmt.Fprintf(os.Stderr, "OpenTF has no command named %q.%s\n\nTo see all of OpenTF's top-level commands, run:\n opentf -help\n\n", cmd, suggestion) return 1 } } From b3fac1e45ee2e753cb93af43cc7180c3b48fa12d Mon Sep 17 00:00:00 2001 From: Elbaz Date: Thu, 24 Aug 2023 10:13:27 +0300 Subject: [PATCH 3/4] all changes --- .../outputs/basic_json_string_update/plan | 4 ++-- .../outputs/basic_multiline_string_update/plan | 6 +++--- testing/equivalence-tests/outputs/basic_set/plan | 6 +++--- .../equivalence-tests/outputs/basic_set_empty/plan | 6 +++--- .../equivalence-tests/outputs/basic_set_null/plan | 6 +++--- .../equivalence-tests/outputs/basic_set_update/plan | 6 +++--- testing/equivalence-tests/outputs/data_read/plan | 6 +++--- .../outputs/drift_refresh_only/plan | 12 ++++++------ .../outputs/drift_relevant_attributes/plan | 2 +- testing/equivalence-tests/outputs/drift_simple/plan | 6 +++--- .../outputs/fully_populated_complex/plan | 6 +++--- .../outputs/fully_populated_complex_destroy/plan | 6 +++--- .../outputs/fully_populated_complex_update/plan | 6 +++--- .../outputs/local_provider_basic/plan | 6 +++--- .../outputs/local_provider_delete/plan | 2 +- .../outputs/local_provider_update/plan | 6 +++--- testing/equivalence-tests/outputs/moved_simple/plan | 4 ++-- .../equivalence-tests/outputs/moved_with_drift/plan | 2 +- .../outputs/moved_with_refresh_only/plan | 10 +++++----- .../equivalence-tests/outputs/moved_with_update/plan | 6 +++--- .../outputs/multiple_block_types/plan | 6 +++--- .../outputs/multiple_block_types_update/plan | 6 +++--- testing/equivalence-tests/outputs/nested_list/plan | 6 +++--- .../outputs/nested_list_update/plan | 6 +++--- testing/equivalence-tests/outputs/nested_map/plan | 2 +- .../equivalence-tests/outputs/nested_map_update/plan | 6 +++--- .../equivalence-tests/outputs/nested_objects/plan | 2 +- .../outputs/nested_objects_update/plan | 6 +++--- testing/equivalence-tests/outputs/nested_set/plan | 6 +++--- .../equivalence-tests/outputs/nested_set_update/plan | 2 +- .../outputs/null_provider_basic/plan | 6 +++--- .../outputs/null_provider_delete/plan | 6 +++--- .../outputs/replace_within_list/plan | 6 +++--- .../outputs/replace_within_map/plan | 6 +++--- .../outputs/replace_within_object/plan | 6 +++--- .../outputs/replace_within_set/plan | 6 +++--- testing/equivalence-tests/outputs/simple_object/plan | 6 +++--- .../outputs/simple_object_empty/plan | 6 +++--- .../outputs/simple_object_null/plan | 6 +++--- .../outputs/simple_object_replace/plan | 6 +++--- .../outputs/simple_object_update/plan | 6 +++--- .../outputs/variables_and_outputs/plan | 4 ++-- .../basic_json_string_update/.terraform.lock.hcl | 2 +- .../.terraform.lock.hcl | 2 +- .../tests/drift_refresh_only/.terraform.lock.hcl | 2 +- .../drift_relevant_attributes/.terraform.lock.hcl | 2 +- .../tests/drift_simple/.terraform.lock.hcl | 2 +- .../equivalence-tests/tests/drift_simple/spec.json | 2 +- .../tests/fully_populated_complex/spec.json | 2 +- .../.terraform.lock.hcl | 2 +- .../.terraform.lock.hcl | 2 +- .../tests/local_provider_delete/.terraform.lock.hcl | 2 +- .../tests/local_provider_update/.terraform.lock.hcl | 2 +- .../tests/moved_simple/.terraform.lock.hcl | 2 +- .../tests/moved_with_drift/.terraform.lock.hcl | 2 +- .../moved_with_refresh_only/.terraform.lock.hcl | 2 +- .../tests/moved_with_update/.terraform.lock.hcl | 2 +- .../tests/null_provider_delete/.terraform.lock.hcl | 2 +- .../tests/replace_within_list/.terraform.lock.hcl | 2 +- .../tests/replace_within_map/.terraform.lock.hcl | 2 +- .../tests/replace_within_object/.terraform.lock.hcl | 2 +- .../tests/replace_within_set/.terraform.lock.hcl | 2 +- 62 files changed, 136 insertions(+), 136 deletions(-) diff --git a/testing/equivalence-tests/outputs/basic_json_string_update/plan b/testing/equivalence-tests/outputs/basic_json_string_update/plan index 522e66cff2..ccf2bacb1e 100644 --- a/testing/equivalence-tests/outputs/basic_json_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_json_string_update/plan @@ -1,10 +1,10 @@ tfcoremock_simple_resource.json: Refreshing state... [id=5a3fd9b3-e852-8956-8c0a-255d47eda645] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.json will be updated in-place ~ resource "tfcoremock_simple_resource" "json" { diff --git a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan index 665d430b20..d59a962cd7 100644 --- a/testing/equivalence-tests/outputs/basic_multiline_string_update/plan +++ b/testing/equivalence-tests/outputs/basic_multiline_string_update/plan @@ -1,10 +1,10 @@ tfcoremock_simple_resource.multiline: Refreshing state... [id=69fe5233-e77a-804f-0dac-115c949540bc] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.multiline will be updated in-place ~ resource "tfcoremock_simple_resource" "multiline" { @@ -28,4 +28,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_set/plan b/testing/equivalence-tests/outputs/basic_set/plan index f6629e419f..625c3193be 100644 --- a/testing/equivalence-tests/outputs/basic_set/plan +++ b/testing/equivalence-tests/outputs/basic_set/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_set.set will be created + resource "tfcoremock_set" "set" { @@ -22,4 +22,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_set_empty/plan b/testing/equivalence-tests/outputs/basic_set_empty/plan index 9953cff989..933b88e80d 100644 --- a/testing/equivalence-tests/outputs/basic_set_empty/plan +++ b/testing/equivalence-tests/outputs/basic_set_empty/plan @@ -1,10 +1,10 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_set.set will be updated in-place ~ resource "tfcoremock_set" "set" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_set_null/plan b/testing/equivalence-tests/outputs/basic_set_null/plan index 37c9921403..6aafc19f99 100644 --- a/testing/equivalence-tests/outputs/basic_set_null/plan +++ b/testing/equivalence-tests/outputs/basic_set_null/plan @@ -1,10 +1,10 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_set.set will be updated in-place ~ resource "tfcoremock_set" "set" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/basic_set_update/plan b/testing/equivalence-tests/outputs/basic_set_update/plan index ad8fbb7e9c..c215d2d5b2 100644 --- a/testing/equivalence-tests/outputs/basic_set_update/plan +++ b/testing/equivalence-tests/outputs/basic_set_update/plan @@ -1,10 +1,10 @@ tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_set.set will be updated in-place ~ resource "tfcoremock_set" "set" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/data_read/plan b/testing/equivalence-tests/outputs/data_read/plan index 5d01597a9f..36ad0040fd 100644 --- a/testing/equivalence-tests/outputs/data_read/plan +++ b/testing/equivalence-tests/outputs/data_read/plan @@ -1,10 +1,10 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create <= read (data resources) -Terraform will perform the following actions: +OpenTF will perform the following actions: # data.tfcoremock_simple_resource.read will be read during apply # (config refers to values not yet known) @@ -42,4 +42,4 @@ Plan: 3 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/drift_refresh_only/plan b/testing/equivalence-tests/outputs/drift_refresh_only/plan index b03117055c..bc57e7c4dc 100644 --- a/testing/equivalence-tests/outputs/drift_refresh_only/plan +++ b/testing/equivalence-tests/outputs/drift_refresh_only/plan @@ -1,9 +1,9 @@ tfcoremock_simple_resource.drift: Refreshing state... [id=cb79269e-dc39-1e68-0a9c-63cb392afda9] -Note: Objects have changed outside of Terraform +Note: Objects have changed outside of OpenTF -Terraform detected the following changes made outside of Terraform since the -last "terraform apply" which may have affected this plan: +OpenTF detected the following changes made outside of OpenTF since the +last "opentf apply" which may have affected this plan: # tfcoremock_simple_resource.drift has changed ~ resource "tfcoremock_simple_resource" "drift" { @@ -12,9 +12,9 @@ last "terraform apply" which may have affected this plan: } -This is a refresh-only plan, so Terraform will not take any actions to undo +This is a refresh-only plan, so OpenTF will not take any actions to undo these. If you were expecting these changes then you can apply this plan to -record the updated values in the Terraform state without changing any remote +record the updated values in the OpenTF state without changing any remote objects. ───────────────────────────────────────────────────────────────────────────── @@ -22,4 +22,4 @@ objects. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan index 7e4738aafa..d54843a0d2 100644 --- a/testing/equivalence-tests/outputs/drift_relevant_attributes/plan +++ b/testing/equivalence-tests/outputs/drift_relevant_attributes/plan @@ -24,7 +24,7 @@ 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.base will be updated in-place ~ resource "tfcoremock_simple_resource" "base" { diff --git a/testing/equivalence-tests/outputs/drift_simple/plan b/testing/equivalence-tests/outputs/drift_simple/plan index 266a142e10..ea8de61087 100644 --- a/testing/equivalence-tests/outputs/drift_simple/plan +++ b/testing/equivalence-tests/outputs/drift_simple/plan @@ -1,10 +1,10 @@ tfcoremock_simple_resource.drift: Refreshing state... [id=f3c6ddc5-37d5-0170-64ff-518ad421385a] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.drift will be updated in-place ~ resource "tfcoremock_simple_resource" "drift" { @@ -19,4 +19,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/fully_populated_complex/plan b/testing/equivalence-tests/outputs/fully_populated_complex/plan index 86fb3ae3ed..3e72167009 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex/plan +++ b/testing/equivalence-tests/outputs/fully_populated_complex/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_complex_resource.complex will be created + resource "tfcoremock_complex_resource" "complex" { @@ -225,4 +225,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan index 194ca98269..20acc7728a 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan +++ b/testing/equivalence-tests/outputs/fully_populated_complex_destroy/plan @@ -1,10 +1,10 @@ tfcoremock_complex_resource.complex: Refreshing state... [id=64564E36-BFCB-458B-9405-EBBF6A3CAC7A] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - destroy -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_complex_resource.complex will be destroyed - resource "tfcoremock_complex_resource" "complex" { @@ -226,4 +226,4 @@ Plan: 0 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan index 3d00db8d87..d075160991 100644 --- a/testing/equivalence-tests/outputs/fully_populated_complex_update/plan +++ b/testing/equivalence-tests/outputs/fully_populated_complex_update/plan @@ -1,10 +1,10 @@ tfcoremock_complex_resource.complex: Refreshing state... [id=64564E36-BFCB-458B-9405-EBBF6A3CAC7A] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_complex_resource.complex will be updated in-place ~ resource "tfcoremock_complex_resource" "complex" { @@ -128,4 +128,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/local_provider_basic/plan b/testing/equivalence-tests/outputs/local_provider_basic/plan index ab85756411..f879f50f84 100644 --- a/testing/equivalence-tests/outputs/local_provider_basic/plan +++ b/testing/equivalence-tests/outputs/local_provider_basic/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # local_file.local_file will be created + resource "local_file" "local_file" { @@ -25,4 +25,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/local_provider_delete/plan b/testing/equivalence-tests/outputs/local_provider_delete/plan index dedcf5cd7c..c69a5f76fe 100644 --- a/testing/equivalence-tests/outputs/local_provider_delete/plan +++ b/testing/equivalence-tests/outputs/local_provider_delete/plan @@ -4,7 +4,7 @@ Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - destroy -Terraform will perform the following actions: +OpenTF will perform the following actions: # local_file.local_file will be destroyed # (because local_file.local_file is not in configuration) diff --git a/testing/equivalence-tests/outputs/local_provider_update/plan b/testing/equivalence-tests/outputs/local_provider_update/plan index 6cadae46cc..605ced2102 100644 --- a/testing/equivalence-tests/outputs/local_provider_update/plan +++ b/testing/equivalence-tests/outputs/local_provider_update/plan @@ -1,10 +1,10 @@ local_file.local_file: Refreshing state... [id=2248ee2fa0aaaad99178531f924bf00b4b0a8f4e] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # local_file.local_file must be replaced -/+ resource "local_file" "local_file" { @@ -25,4 +25,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/moved_simple/plan b/testing/equivalence-tests/outputs/moved_simple/plan index 083308b345..ac6cfad17b 100644 --- a/testing/equivalence-tests/outputs/moved_simple/plan +++ b/testing/equivalence-tests/outputs/moved_simple/plan @@ -1,6 +1,6 @@ tfcoremock_simple_resource.second: Refreshing state... [id=70c47571-66c3-b1dc-2474-47a74b9c7886] -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_simple_resource.first has moved to tfcoremock_simple_resource.second resource "tfcoremock_simple_resource" "second" { @@ -15,4 +15,4 @@ Plan: 0 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/moved_with_drift/plan b/testing/equivalence-tests/outputs/moved_with_drift/plan index 0293566d57..5a73a8ce94 100644 --- a/testing/equivalence-tests/outputs/moved_with_drift/plan +++ b/testing/equivalence-tests/outputs/moved_with_drift/plan @@ -24,7 +24,7 @@ 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.base_after will be updated in-place # (moved from tfcoremock_simple_resource.base_before) diff --git a/testing/equivalence-tests/outputs/moved_with_refresh_only/plan b/testing/equivalence-tests/outputs/moved_with_refresh_only/plan index 441ec4994c..0f24d6381d 100644 --- a/testing/equivalence-tests/outputs/moved_with_refresh_only/plan +++ b/testing/equivalence-tests/outputs/moved_with_refresh_only/plan @@ -1,9 +1,9 @@ tfcoremock_simple_resource.second: Refreshing state... [id=70c47571-66c3-b1dc-2474-47a74b9c7886] -Note: Objects have changed outside of Terraform +Note: Objects have changed outside of OpenTF -Terraform detected the following changes made outside of Terraform since the -last "terraform apply" which may have affected this plan: +OpenTF detected the following changes made outside of OpenTF since the +last "opentf apply" which may have affected this plan: # tfcoremock_simple_resource.first has moved to tfcoremock_simple_resource.second resource "tfcoremock_simple_resource" "second" { @@ -12,7 +12,7 @@ last "terraform apply" which may have affected this plan: } -This is a refresh-only plan, so Terraform will not take any actions to undo +This is a refresh-only plan, so OpenTF will not take any actions to undo these. If you were expecting these changes then you can apply this plan to -record the updated values in the Terraform state without changing any remote +record the updated values in the OpenTF state without changing any remote objects. diff --git a/testing/equivalence-tests/outputs/moved_with_update/plan b/testing/equivalence-tests/outputs/moved_with_update/plan index eab173770c..76a10f311d 100644 --- a/testing/equivalence-tests/outputs/moved_with_update/plan +++ b/testing/equivalence-tests/outputs/moved_with_update/plan @@ -1,10 +1,10 @@ tfcoremock_simple_resource.moved: Refreshing state... [id=7da63aeb-f908-a112-9886-f29a0b0bd4ad] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_simple_resource.moved will be updated in-place # (moved from tfcoremock_simple_resource.base) @@ -20,4 +20,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/multiple_block_types/plan b/testing/equivalence-tests/outputs/multiple_block_types/plan index 4d8be6b642..f0cecff1fc 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types/plan +++ b/testing/equivalence-tests/outputs/multiple_block_types/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_multiple_blocks.multiple_blocks will be created + resource "tfcoremock_multiple_blocks" "multiple_blocks" { @@ -34,4 +34,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/multiple_block_types_update/plan b/testing/equivalence-tests/outputs/multiple_block_types_update/plan index f65e01a932..bd4cc1283c 100644 --- a/testing/equivalence-tests/outputs/multiple_block_types_update/plan +++ b/testing/equivalence-tests/outputs/multiple_block_types_update/plan @@ -1,10 +1,10 @@ tfcoremock_multiple_blocks.multiple_blocks: Refreshing state... [id=DA051126-BAD6-4EB2-92E5-F0250DAF0B92] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_multiple_blocks.multiple_blocks will be updated in-place ~ resource "tfcoremock_multiple_blocks" "multiple_blocks" { @@ -28,4 +28,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_list/plan b/testing/equivalence-tests/outputs/nested_list/plan index eca0a0954a..5a68c15b3e 100644 --- a/testing/equivalence-tests/outputs/nested_list/plan +++ b/testing/equivalence-tests/outputs/nested_list/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_nested_list.nested_list will be created + resource "tfcoremock_nested_list" "nested_list" { @@ -27,4 +27,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_list_update/plan b/testing/equivalence-tests/outputs/nested_list_update/plan index facc226a51..b01ab310f9 100644 --- a/testing/equivalence-tests/outputs/nested_list_update/plan +++ b/testing/equivalence-tests/outputs/nested_list_update/plan @@ -1,10 +1,10 @@ tfcoremock_nested_list.nested_list: Refreshing state... [id=DA051126-BAD6-4EB2-92E5-F0250DAF0B92] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_nested_list.nested_list will be updated in-place ~ resource "tfcoremock_nested_list" "nested_list" { @@ -34,4 +34,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_map/plan b/testing/equivalence-tests/outputs/nested_map/plan index d0bcf5f7f0..3106d6765f 100644 --- a/testing/equivalence-tests/outputs/nested_map/plan +++ b/testing/equivalence-tests/outputs/nested_map/plan @@ -3,7 +3,7 @@ Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_nested_map.nested_map will be created + resource "tfcoremock_nested_map" "nested_map" { diff --git a/testing/equivalence-tests/outputs/nested_map_update/plan b/testing/equivalence-tests/outputs/nested_map_update/plan index ef2185de58..067580322a 100644 --- a/testing/equivalence-tests/outputs/nested_map_update/plan +++ b/testing/equivalence-tests/outputs/nested_map_update/plan @@ -1,10 +1,10 @@ tfcoremock_nested_map.nested_map: Refreshing state... [id=502B0348-B796-4F6A-8694-A5A397237B85] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_nested_map.nested_map will be updated in-place ~ resource "tfcoremock_nested_map" "nested_map" { @@ -29,4 +29,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_objects/plan b/testing/equivalence-tests/outputs/nested_objects/plan index bb70728ffc..dcd5962542 100644 --- a/testing/equivalence-tests/outputs/nested_objects/plan +++ b/testing/equivalence-tests/outputs/nested_objects/plan @@ -3,7 +3,7 @@ Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_nested_object.nested_object will be created + resource "tfcoremock_nested_object" "nested_object" { diff --git a/testing/equivalence-tests/outputs/nested_objects_update/plan b/testing/equivalence-tests/outputs/nested_objects_update/plan index fe763de498..bcddf61a81 100644 --- a/testing/equivalence-tests/outputs/nested_objects_update/plan +++ b/testing/equivalence-tests/outputs/nested_objects_update/plan @@ -1,10 +1,10 @@ tfcoremock_nested_object.nested_object: Refreshing state... [id=B2491EF0-9361-40FD-B25A-0332A1A5E052] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_nested_object.nested_object will be updated in-place ~ resource "tfcoremock_nested_object" "nested_object" { @@ -28,4 +28,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_set/plan b/testing/equivalence-tests/outputs/nested_set/plan index 819b7bf805..7c4380eb98 100644 --- a/testing/equivalence-tests/outputs/nested_set/plan +++ b/testing/equivalence-tests/outputs/nested_set/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_nested_set.nested_set will be created + resource "tfcoremock_nested_set" "nested_set" { @@ -27,4 +27,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/nested_set_update/plan b/testing/equivalence-tests/outputs/nested_set_update/plan index 643ad107f1..f7048566a6 100644 --- a/testing/equivalence-tests/outputs/nested_set_update/plan +++ b/testing/equivalence-tests/outputs/nested_set_update/plan @@ -4,7 +4,7 @@ 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: +OpenTF will perform the following actions: # tfcoremock_nested_set.nested_set will be updated in-place ~ resource "tfcoremock_nested_set" "nested_set" { diff --git a/testing/equivalence-tests/outputs/null_provider_basic/plan b/testing/equivalence-tests/outputs/null_provider_basic/plan index 79e0f32343..6d8625f09e 100644 --- a/testing/equivalence-tests/outputs/null_provider_basic/plan +++ b/testing/equivalence-tests/outputs/null_provider_basic/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # null_resource.null_resource will be created + resource "null_resource" "null_resource" { @@ -17,4 +17,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/null_provider_delete/plan b/testing/equivalence-tests/outputs/null_provider_delete/plan index 4c799e4876..42e8a1784c 100644 --- a/testing/equivalence-tests/outputs/null_provider_delete/plan +++ b/testing/equivalence-tests/outputs/null_provider_delete/plan @@ -1,10 +1,10 @@ null_resource.null_resource: Refreshing state... [id=7115293105928418144] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: - destroy -Terraform will perform the following actions: +OpenTF will perform the following actions: # null_resource.null_resource will be destroyed # (because null_resource.null_resource is not in configuration) @@ -19,4 +19,4 @@ Plan: 0 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/replace_within_list/plan b/testing/equivalence-tests/outputs/replace_within_list/plan index e5c73a3fe3..2fe82fff9c 100644 --- a/testing/equivalence-tests/outputs/replace_within_list/plan +++ b/testing/equivalence-tests/outputs/replace_within_list/plan @@ -1,10 +1,10 @@ tfcoremock_list.list: Refreshing state... [id=F40F2AB4-100C-4AE8-BFD0-BF332A158415] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_list.list must be replaced -/+ resource "tfcoremock_list" "list" { @@ -24,4 +24,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/replace_within_map/plan b/testing/equivalence-tests/outputs/replace_within_map/plan index 46ab58c665..ff0514cf1a 100644 --- a/testing/equivalence-tests/outputs/replace_within_map/plan +++ b/testing/equivalence-tests/outputs/replace_within_map/plan @@ -1,10 +1,10 @@ tfcoremock_map.map: Refreshing state... [id=F40F2AB4-100C-4AE8-BFD0-BF332A158415] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_map.map must be replaced -/+ resource "tfcoremock_map" "map" { @@ -24,4 +24,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/replace_within_object/plan b/testing/equivalence-tests/outputs/replace_within_object/plan index 2df539c6e4..6c8383de87 100644 --- a/testing/equivalence-tests/outputs/replace_within_object/plan +++ b/testing/equivalence-tests/outputs/replace_within_object/plan @@ -1,10 +1,10 @@ tfcoremock_object.object: Refreshing state... [id=F40F2AB4-100C-4AE8-BFD0-BF332A158415] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_object.object must be replaced -/+ resource "tfcoremock_object" "object" { @@ -21,4 +21,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/replace_within_set/plan b/testing/equivalence-tests/outputs/replace_within_set/plan index 252d0b4648..50513a973d 100644 --- a/testing/equivalence-tests/outputs/replace_within_set/plan +++ b/testing/equivalence-tests/outputs/replace_within_set/plan @@ -1,10 +1,10 @@ tfcoremock_set.set: Refreshing state... [id=F40F2AB4-100C-4AE8-BFD0-BF332A158415] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_set.set must be replaced -/+ resource "tfcoremock_set" "set" { @@ -27,4 +27,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/simple_object/plan b/testing/equivalence-tests/outputs/simple_object/plan index 9d5ef63405..cf3eb91ee8 100644 --- a/testing/equivalence-tests/outputs/simple_object/plan +++ b/testing/equivalence-tests/outputs/simple_object/plan @@ -1,9 +1,9 @@ -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: + create -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_object.object will be created + resource "tfcoremock_object" "object" { @@ -22,4 +22,4 @@ Plan: 1 to add, 0 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/simple_object_empty/plan b/testing/equivalence-tests/outputs/simple_object_empty/plan index 2144d18d06..036c1704b1 100644 --- a/testing/equivalence-tests/outputs/simple_object_empty/plan +++ b/testing/equivalence-tests/outputs/simple_object_empty/plan @@ -1,10 +1,10 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555376e3f] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_object.object will be updated in-place ~ resource "tfcoremock_object" "object" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/simple_object_null/plan b/testing/equivalence-tests/outputs/simple_object_null/plan index 35d37fc9ce..d987cb17d7 100644 --- a/testing/equivalence-tests/outputs/simple_object_null/plan +++ b/testing/equivalence-tests/outputs/simple_object_null/plan @@ -1,10 +1,10 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555376e3f] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_object.object will be updated in-place ~ resource "tfcoremock_object" "object" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/simple_object_replace/plan b/testing/equivalence-tests/outputs/simple_object_replace/plan index cbd97123b8..e88e9e942b 100644 --- a/testing/equivalence-tests/outputs/simple_object_replace/plan +++ b/testing/equivalence-tests/outputs/simple_object_replace/plan @@ -1,10 +1,10 @@ tfcoremock_object.object: Refreshing state... [id=a0ed13ec-116b-14c4-7437-418e217d3659] -Terraform used the selected providers to generate the following execution +OpenTF used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols: -/+ destroy and then create replacement -Terraform will perform the following actions: +OpenTF will perform the following actions: # tfcoremock_object.object must be replaced -/+ resource "tfcoremock_object" "object" { @@ -19,4 +19,4 @@ Plan: 1 to add, 0 to change, 1 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/simple_object_update/plan b/testing/equivalence-tests/outputs/simple_object_update/plan index 0e1e6e1726..8fdf4d31b1 100644 --- a/testing/equivalence-tests/outputs/simple_object_update/plan +++ b/testing/equivalence-tests/outputs/simple_object_update/plan @@ -1,10 +1,10 @@ tfcoremock_object.object: Refreshing state... [id=00e14fba-4d56-6cc5-b685-633555376e3f] -Terraform used the selected providers to generate the following execution +OpenTF 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: +OpenTF will perform the following actions: # tfcoremock_object.object will be updated in-place ~ resource "tfcoremock_object" "object" { @@ -23,4 +23,4 @@ Plan: 0 to add, 1 to change, 0 to destroy. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/outputs/variables_and_outputs/plan b/testing/equivalence-tests/outputs/variables_and_outputs/plan index 8b8a9f0a74..b21ca20532 100644 --- a/testing/equivalence-tests/outputs/variables_and_outputs/plan +++ b/testing/equivalence-tests/outputs/variables_and_outputs/plan @@ -32,7 +32,7 @@ Changes to Outputs: } } -You can apply this plan to save these new output values to the Terraform +You can apply this plan to save these new output values to the OpenTF state, without changing any real infrastructure. ───────────────────────────────────────────────────────────────────────────── @@ -40,4 +40,4 @@ state, without changing any real infrastructure. Saved the plan to: equivalence_test_plan To perform exactly these actions, run the following command to apply: - terraform apply "equivalence_test_plan" + opentf apply "equivalence_test_plan" diff --git a/testing/equivalence-tests/tests/basic_json_string_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/basic_json_string_update/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/basic_json_string_update/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/basic_json_string_update/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/basic_multiline_string_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/basic_multiline_string_update/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/basic_multiline_string_update/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/basic_multiline_string_update/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/drift_refresh_only/.terraform.lock.hcl b/testing/equivalence-tests/tests/drift_refresh_only/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/drift_refresh_only/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/drift_refresh_only/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/drift_relevant_attributes/.terraform.lock.hcl b/testing/equivalence-tests/tests/drift_relevant_attributes/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/drift_relevant_attributes/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/drift_relevant_attributes/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/drift_simple/.terraform.lock.hcl b/testing/equivalence-tests/tests/drift_simple/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/drift_simple/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/drift_simple/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/drift_simple/spec.json b/testing/equivalence-tests/tests/drift_simple/spec.json index 71d921b3b8..767dbef7af 100644 --- a/testing/equivalence-tests/tests/drift_simple/spec.json +++ b/testing/equivalence-tests/tests/drift_simple/spec.json @@ -1,5 +1,5 @@ { - "description": "a simple test that models drift in a single resource by updating an existing resource outside of Terraform", + "description": "a simple test that models drift in a single resource by updating an existing resource outside of OpenTF", "include_files": [], "ignore_fields": {} } diff --git a/testing/equivalence-tests/tests/fully_populated_complex/spec.json b/testing/equivalence-tests/tests/fully_populated_complex/spec.json index 8fc0b7b188..8e8bbfbf69 100644 --- a/testing/equivalence-tests/tests/fully_populated_complex/spec.json +++ b/testing/equivalence-tests/tests/fully_populated_complex/spec.json @@ -1,5 +1,5 @@ { - "description": "this test creates an almost fully populated tfcoremock_complex_resource, which should cover most basic Terraform use cases", + "description": "this test creates an almost fully populated tfcoremock_complex_resource, which should cover most basic OpenTF use cases", "include_files": [], "ignore_fields": {} } diff --git a/testing/equivalence-tests/tests/fully_populated_complex_destroy/.terraform.lock.hcl b/testing/equivalence-tests/tests/fully_populated_complex_destroy/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/fully_populated_complex_destroy/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/fully_populated_complex_destroy/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/fully_populated_complex_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/fully_populated_complex_update/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/fully_populated_complex_update/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/fully_populated_complex_update/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/local_provider_delete/.terraform.lock.hcl b/testing/equivalence-tests/tests/local_provider_delete/.terraform.lock.hcl index 7379b9c53b..6dd0656050 100644 --- a/testing/equivalence-tests/tests/local_provider_delete/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/local_provider_delete/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/local" { diff --git a/testing/equivalence-tests/tests/local_provider_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/local_provider_update/.terraform.lock.hcl index 7379b9c53b..6dd0656050 100644 --- a/testing/equivalence-tests/tests/local_provider_update/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/local_provider_update/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/local" { diff --git a/testing/equivalence-tests/tests/moved_simple/.terraform.lock.hcl b/testing/equivalence-tests/tests/moved_simple/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/moved_simple/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/moved_simple/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/moved_with_drift/.terraform.lock.hcl b/testing/equivalence-tests/tests/moved_with_drift/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/moved_with_drift/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/moved_with_drift/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/moved_with_refresh_only/.terraform.lock.hcl b/testing/equivalence-tests/tests/moved_with_refresh_only/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/moved_with_refresh_only/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/moved_with_refresh_only/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/moved_with_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/moved_with_update/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/moved_with_update/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/moved_with_update/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/null_provider_delete/.terraform.lock.hcl b/testing/equivalence-tests/tests/null_provider_delete/.terraform.lock.hcl index 6ed19d1db2..472523daee 100644 --- a/testing/equivalence-tests/tests/null_provider_delete/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/null_provider_delete/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/null" { diff --git a/testing/equivalence-tests/tests/replace_within_list/.terraform.lock.hcl b/testing/equivalence-tests/tests/replace_within_list/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/replace_within_list/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/replace_within_list/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/replace_within_map/.terraform.lock.hcl b/testing/equivalence-tests/tests/replace_within_map/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/replace_within_map/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/replace_within_map/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/replace_within_object/.terraform.lock.hcl b/testing/equivalence-tests/tests/replace_within_object/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/replace_within_object/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/replace_within_object/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { diff --git a/testing/equivalence-tests/tests/replace_within_set/.terraform.lock.hcl b/testing/equivalence-tests/tests/replace_within_set/.terraform.lock.hcl index d2d6193ccb..a7521fb438 100644 --- a/testing/equivalence-tests/tests/replace_within_set/.terraform.lock.hcl +++ b/testing/equivalence-tests/tests/replace_within_set/.terraform.lock.hcl @@ -1,4 +1,4 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "opentf init". # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfcoremock" { From 92bbf22332ba01f4e0853684c1726b5ef01e5513 Mon Sep 17 00:00:00 2001 From: Elbaz Date: Thu, 24 Aug 2023 10:25:25 +0300 Subject: [PATCH 4/4] rollback irrlevant changes --- .github/CONTRIBUTING.md | 4 ++-- .github/actions/equivalence-test/action.yml | 10 +++++----- .github/scripts/equivalence-test.sh | 6 +++--- .github/scripts/get_product_version.sh | 2 +- .github/workflows/build-Dockerfile | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index db6ea4c097..6356649771 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ This repository contains OpenTF core, which includes the command line interface and the main graph engine -This document provides guidance on OpenTF contribution recommended practices. It covers what we're looking for in order to help set some expectations and help you get the most out of participation in this project. +This document provides guidance on OpenTF contribution recommended practices. It covers what we're looking for in order to help set some expectations and help you get the most out of participation in this project. To record a bug report, enhancement proposal, or give any other product feedback, please [open a GitHub issue](https://github.com/placeholderplaceholderplaceholder/opentf/issues/new/choose) using the most appropriate issue template @@ -22,7 +22,7 @@ The contribution guideline will change in the near future, as the management of ## Proposing a Change -In order to be respectful of the time of community contributors, we aim to discuss potential changes in GitHub issues prior to implementation. That will allow us to give design feedback up front and set expectations about the scope of the change, and, for larger changes, how best to approach the work such that the OpenTF team can review it and merge it along with other concurrent work. +In order to be respectful of the time of community contributors, we aim to discuss potential changes in GitHub issues prior to implementation. That will allow us to give design feedback up front and set expectations about the scope of the change, and, for larger changes, how best to approach the work such that the Terraform team can review it and merge it along with other concurrent work. If the bug you wish to fix or enhancement you wish to implement isn't already covered by a GitHub issue, please do start a discussion (either in [a new GitHub issue](https://github.com/placeholderplaceholderplaceholder/opentf/issues/new/choose) or an existing one, as appropriate) before you invest significant development time. diff --git a/.github/actions/equivalence-test/action.yml b/.github/actions/equivalence-test/action.yml index f73f764e9f..83355f4bac 100644 --- a/.github/actions/equivalence-test/action.yml +++ b/.github/actions/equivalence-test/action.yml @@ -2,16 +2,16 @@ # SPDX-License-Identifier: MPL-2.0 name: equivalence-test -description: "Execute the suite of OpenTF equivalence tests in testing/equivalence-tests" +description: "Execute the suite of Terraform equivalence tests in testing/equivalence-tests" inputs: - target-opentf-version: - description: "The version of OpenTF to use in execution." + target-terraform-version: + description: "The version of Terraform to use in execution." required: true - target-opentf-branch: + target-terraform-branch: description: "The branch within this repository to update and compare." required: true target-equivalence-test-version: - description: "The version of the OpenTF equivalence tests to use." + description: "The version of the Terraform equivalence tests to use." default: "0.3.0" target-os: description: "Current operating system" diff --git a/.github/scripts/equivalence-test.sh b/.github/scripts/equivalence-test.sh index c9ce659fda..e82ce32637 100755 --- a/.github/scripts/equivalence-test.sh +++ b/.github/scripts/equivalence-test.sh @@ -10,11 +10,11 @@ Usage: ./equivalence-test.sh [] [] Description: This script will handle various commands related to the execution of the - OpenTF equivalence tests. + Terraform equivalence tests. Commands: get_target_branch - get_target_branch returns the default target branch for a given OpenTF + get_target_branch returns the default target branch for a given Terraform version. target_branch=$(./equivalence-test.sh get_target_branch v1.4.3); target_branch=v1.4 @@ -27,7 +27,7 @@ Commands: ./equivalence-test.sh download_equivalence_test_binary 0.3.0 ./bin/terraform-equivalence-testing linux amd64 download_terraform_binary - download_terraform_binary downloads the opentf release binary for a given + download_terraform_binary downloads the terraform release binary for a given version and places it at the target path. ./equivalence-test.sh download_terraform_binary 1.4.3 ./bin/terraform linux amd64 diff --git a/.github/scripts/get_product_version.sh b/.github/scripts/get_product_version.sh index ff12d3f4df..a3a5a71add 100755 --- a/.github/scripts/get_product_version.sh +++ b/.github/scripts/get_product_version.sh @@ -30,7 +30,7 @@ LDFLAGS="${LDFLAGS} -X 'main.experimentsAllowed=yes'" fi LDFLAGS="${LDFLAGS} -X 'github.com/placeholderplaceholderplaceholder/opentf/version.dev=no'" -echo "Building OpenTF CLI ${VERSION}" +echo "Building Terraform CLI ${VERSION}" if [[ "$EXPERIMENTS_ENABLED" == 1 ]]; then echo "This build allows use of experimental features" fi diff --git a/.github/workflows/build-Dockerfile b/.github/workflows/build-Dockerfile index 12056da148..e4b4658512 100644 --- a/.github/workflows/build-Dockerfile +++ b/.github/workflows/build-Dockerfile @@ -4,7 +4,7 @@ # # If you want to test this locally you'll need to set the three arguments # to values realistic for what the hashicorp/actions-docker-build GitHub -# action would set, and ensure that there's a suitable "opentf" executable +# action would set, and ensure that there's a suitable "terraform" executable # in the dist/linux/${TARGETARCH} directory. FROM docker.mirror.hashicorp.services/alpine:latest AS default