From 1b5966dd507b813101de6dfd46a5c4a51d43147d Mon Sep 17 00:00:00 2001 From: Rose Date: Fri, 19 Apr 2024 06:58:43 -0700 Subject: [PATCH] Small TFC fixes in md files --- .github/CONTRIBUTING.md | 4 ++-- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- docs/architecture.md | 2 +- docs/dependency-upgrades.md | 4 ++-- tools/terraform-bundle/README.md | 4 ++-- website/data/cli-nav-data.json | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bd1b009290..3b2644a03c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -156,7 +156,7 @@ Terraform providers are not maintained in this repository; you can find relevant repository and relevant issue tracker for each provider within the [Terraform Registry index](https://registry.terraform.io/browse/providers). -This repository also does not include the source code for some other parts of the Terraform product including Terraform Cloud, Terraform Enterprise, and the Terraform Registry. The source for those components is not publicly available. If you have feedback about these products, including bug reports, please email [tf-cloud@hashicorp.support](mailto:tf-cloud@hashicorp.support) or [open a support request](https://support.hashicorp.com/hc/en-us/requests/new). +This repository also does not include the source code for some other parts of the Terraform product including HCP Terraform, Terraform Enterprise, and the Terraform Registry. The source for those components is not publicly available. If you have feedback about these products, including bug reports, please email [tf-cloud@hashicorp.support](mailto:tf-cloud@hashicorp.support) or [open a support request](https://support.hashicorp.com/hc/en-us/requests/new). --- @@ -200,7 +200,7 @@ go test ./internal/addrs Terraform's unit test suite is self-contained, using mocks and local files to help ensure that it can run offline and is unlikely to be broken by changes to outside systems. -However, several Terraform components interact with external services, such as the automatic provider installation mechanism, the Terraform Registry, Terraform Cloud, etc. +However, several Terraform components interact with external services, such as the automatic provider installation mechanism, the Terraform Registry, HCP Terraform, etc. There are some optional tests in the Terraform CLI codebase that *do* interact with external services, which we collectively refer to as "acceptance tests". You can enable these by setting the environment variable `TF_ACC=1` when running the tests. We recommend focusing only on the specific package you are working on when enabling acceptance tests, both because it can help the test run to complete faster and because you are less likely to encounter failures due to drift in systems unrelated to your current goal: diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a1d6b5441c..58f1577125 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -15,7 +15,7 @@ body: For general usage questions, please see: https://www.terraform.io/community.html. ## If your issue relates to: - * **Terraform Cloud/Enterprise**: please email tf-cloud@hashicorp.support or [open a new request](https://support.hashicorp.com/hc/en-us/requests/new). + * **HCP Terraform or Enterprise**: please email tf-cloud@hashicorp.support or [open a new request](https://support.hashicorp.com/hc/en-us/requests/new). * **AWS Terraform Provider**: Open an issue at [hashicorp/terraform-provider-aws](https://github.com/hashicorp/terraform-provider-aws/issues/new/choose). * **Azure Terraform Provider**: Open an issue at [hashicorp/terraform-provider-azurerm](https://github.com/hashicorp/terraform-provider-azurerm/issues/new/choose). * **Other Terraform Providers**: Please open an issue in the provider's own repository, which can be found by searching the [Terraform Registry](https://registry.terraform.io/browse/providers). diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index f23698401b..4e284dfe54 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,9 +3,9 @@ blank_issues_enabled: false contact_links: - - name: Terraform Cloud/Enterprise Troubleshooting and Feature Requests + - name: HCP Terraform or Enterprise Troubleshooting and Feature Requests url: https://support.hashicorp.com/hc/en-us/requests/new - about: For issues and feature requests related to the Terraform Cloud/Enterprise platform, please submit a HashiCorp support request or email tf-cloud@hashicorp.support + about: For issues and feature requests related to the HCP Terraform/Enterprise platform, please submit a HashiCorp support request or email tf-cloud@hashicorp.support - name: AWS Terraform Provider Feedback and Questions url: https://github.com/hashicorp/terraform-provider-aws about: The AWS Terraform Provider has its own repository, any provider related issues or questions should be directed there. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index fbc820b95f..c99a13d3a2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -15,7 +15,7 @@ body: For general usage questions, please see: https://www.terraform.io/community.html. ## If your feature request relates to: - * **Terraform Cloud/Enterprise**: please email tf-cloud@hashicorp.support or [open a new request](https://support.hashicorp.com/hc/en-us/requests/new). + * **HCP Terraform or Enterprise**: please email tf-cloud@hashicorp.support or [open a new request](https://support.hashicorp.com/hc/en-us/requests/new). * **AWS Terraform Provider**: Open an issue at [hashicorp/terraform-provider-aws](https://github.com/hashicorp/terraform-provider-aws/issues/new/choose). * **Azure Terraform Provider**: Open an issue at [hashicorp/terraform-provider-azurerm](https://github.com/hashicorp/terraform-provider-azurerm/issues/new/choose). * **Other Terraform Providers**: Please open an issue in the provider's own repository, which can be found by searching the [Terraform Registry](https://registry.terraform.io/browse/providers). diff --git a/docs/architecture.md b/docs/architecture.md index 0c93b16f1d..69f68231eb 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -64,7 +64,7 @@ constructed, and then the backend is responsible for executing that action. Backends that execute operations, however, do so as an architectural implementation detail and not a general feature of backends. That is, the term 'backend' as a Terraform feature is used to refer to a plugin that determines where Terraform stores its state snapshots - only the default `local` -backend and Terraform Cloud's backends (`remote`, `cloud`) perform operations. +backend and HCP Terraform's backends (`remote`, `cloud`) perform operations. Thus, most backends do _not_ implement this interface, and so the `command` package wraps these backends in an instance of diff --git a/docs/dependency-upgrades.md b/docs/dependency-upgrades.md index 226f5eefeb..bd373c1818 100644 --- a/docs/dependency-upgrades.md +++ b/docs/dependency-upgrades.md @@ -130,8 +130,8 @@ special constraints due to how Terraform uses them: prevent adoption of changes made to pre-existing functionality that Terraform already exposes. -* `github.com/hashicorp/go-tfe` -- the client library for the Terraform Cloud - API -- includes various types corresponding to Terraform Cloud API +* `github.com/hashicorp/go-tfe` -- the client library for the HCP Terraform + API -- includes various types corresponding to HCP Terraform API requests and responses. The internal package `internal/cloud` contains mock implementations of some of those types, which may need to be updated when the client library is upgraded. diff --git a/tools/terraform-bundle/README.md b/tools/terraform-bundle/README.md index 4df28c5a01..3dd823cb08 100644 --- a/tools/terraform-bundle/README.md +++ b/tools/terraform-bundle/README.md @@ -18,7 +18,7 @@ to this need: current Terraform configuration, serving a similar (though not identical) purpose than `terraform-bundle` had served. -For those using Terraform CLI alone, without Terraform Cloud, we recommend +For those using Terraform CLI alone, without HCP Terraform, we recommend planning to transition to the above features instead of using `terraform-bundle`. @@ -53,7 +53,7 @@ Terraform v0.13's introduction of automatic third-party provider installation. ## Terraform Enterprise Users If you use Terraform Enterprise, the self-hosted distribution of -Terraform Cloud, you can use `terraform-bundle` as described above to build +HCP Terraform, you can use `terraform-bundle` as described above to build custom Terraform packages with bundled provider plugins. For more information, see diff --git a/website/data/cli-nav-data.json b/website/data/cli-nav-data.json index b7dd8f0342..f7043dab65 100644 --- a/website/data/cli-nav-data.json +++ b/website/data/cli-nav-data.json @@ -229,10 +229,10 @@ ] }, { - "title": "Using Terraform Cloud", + "title": "Using HCP Terraform", "routes": [ { "title": "Overview", "path": "cloud" }, - { "title": "Terraform Cloud Settings", "path": "cloud/settings" }, + { "title": "HCP Terraform Settings", "path": "cloud/settings" }, { "title": "Initializing and Migrating", "path": "cloud/migrating"