From 92bbf22332ba01f4e0853684c1726b5ef01e5513 Mon Sep 17 00:00:00 2001 From: Elbaz Date: Thu, 24 Aug 2023 10:25:25 +0300 Subject: [PATCH] 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