backport of commit a6a08fe

.github/workflows/checks.yml

@@ -141,8 +141,6 @@ jobs:
     steps:
       - name: "Fetch source code"
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # We need to do comparisons against the main branch.
 
       - name: Determine Go version
         id: go
@@ -180,13 +178,9 @@ jobs:
           restore-keys: |
             protobuf-tools-
 
-      - name: Install CI tooling
-        run: |
-          go install golang.org/x/tools/cmd/goimports@v0.1.11
-
       - name: "Code consistency checks"
         run: |
-          make fmtcheck importscheck generate staticcheck exhaustive protobuf
+          make fmtcheck generate staticcheck exhaustive protobuf
           if [[ -n "$(git status --porcelain)" ]]; then
             echo >&2 "ERROR: Generated files are inconsistent. Run 'make generate' and 'make protobuf' locally and then commit the updated files."
             git >&2 status --porcelain

Makefile

@@ -35,9 +35,6 @@ protobuf:
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 
-importscheck:
-	@sh -c "'$(CURDIR)/scripts/goimportscheck.sh'"
-
 staticcheck:
 	@sh -c "'$(CURDIR)/scripts/staticcheck.sh'"
 
@@ -66,4 +63,4 @@ website/build-local:
 # under parallel conditions.
 .NOTPARALLEL:
 
-.PHONY: fmtcheck importscheck generate protobuf website website-test staticcheck website/local website/build-local
+.PHONY: fmtcheck generate protobuf website website-test staticcheck website/local website/build-local

README.md

@@ -1,4 +1,5 @@
-# Terraform
+Terraform
+=========
 
 - Website: https://www.terraform.io
 - Forums: [HashiCorp Discuss](https://discuss.hashicorp.com/c/terraform-core)
@@ -14,35 +15,32 @@ The key features of Terraform are:
 
 - **Infrastructure as Code**: Infrastructure is described using a high-level configuration syntax. This allows a blueprint of your datacenter to be versioned and treated as you would any other code. Additionally, infrastructure can be shared and re-used.
 
-- **Execution Plans**: Terraform has a "planning" step where it generates an execution plan. The execution plan shows what Terraform will do when you call apply. This lets you avoid any surprises when Terraform manipulates infrastructure.
+- **Execution Plans**: Terraform has a "planning" step where it generates an *execution plan*. The execution plan shows what Terraform will do when you call apply. This lets you avoid any surprises when Terraform manipulates infrastructure.
 
 - **Resource Graph**: Terraform builds a graph of all your resources, and parallelizes the creation and modification of any non-dependent resources. Because of this, Terraform builds infrastructure as efficiently as possible, and operators get insight into dependencies in their infrastructure.
 
 - **Change Automation**: Complex changesets can be applied to your infrastructure with minimal human interaction. With the previously mentioned execution plan and resource graph, you know exactly what Terraform will change and in what order, avoiding many possible human errors.
 
-For more information, refer to the [What is Terraform?](https://www.terraform.io/intro) page on the Terraform website.
-
-## Getting Started & Documentation
+For more information, see the [introduction section](https://www.terraform.io/intro) of the Terraform website.
 
+Getting Started & Documentation
+-------------------------------
 Documentation is available on the [Terraform website](https://www.terraform.io):
-
-- [Introduction](https://www.terraform.io/intro)
-- [Documentation](https://www.terraform.io/docs)
+  - [Intro](https://www.terraform.io/intro/index.html)
+  - [Docs](https://www.terraform.io/docs/index.html)
 
 If you're new to Terraform and want to get started creating infrastructure, please check out our [Getting Started guides](https://learn.hashicorp.com/terraform#getting-started) on HashiCorp's learning platform. There are also [additional guides](https://learn.hashicorp.com/terraform#operations-and-development) to continue your learning.
 
 Show off your Terraform knowledge by passing a certification exam. Visit the [certification page](https://www.hashicorp.com/certification/) for information about exams and find [study materials](https://learn.hashicorp.com/terraform/certification/terraform-associate) on HashiCorp's learning platform.
 
-## Developing Terraform
+Developing Terraform
+--------------------
 
 This repository contains only Terraform core, which includes the command line interface and the main graph engine. Providers are implemented as plugins, and Terraform can automatically download providers that are published on [the Terraform Registry](https://registry.terraform.io). HashiCorp develops some providers, and others are developed by other organizations. For more information, see [Extending Terraform](https://www.terraform.io/docs/extend/index.html).
 
-- To learn more about compiling Terraform and contributing suggested changes, refer to [the contributing guide](.github/CONTRIBUTING.md).
+To learn more about compiling Terraform and contributing suggested changes, please refer to [the contributing guide](.github/CONTRIBUTING.md).
 
-- To learn more about how we handle bug reports, refer to the [bug triage guide](./BUGPROCESS.md).
-
-- To learn how to contribute to the Terraform documentation in this repository, refer to the [Terraform Documentation README](/website/README.md).
+To learn more about how we handle bug reports, please read the [bug triage guide](./BUGPROCESS.md).
 
 ## License
-
 [Mozilla Public License v2.0](https://github.com/hashicorp/terraform/blob/main/LICENSE)

commands.go

@@ -100,8 +100,6 @@ func initCommands(
 		ProviderSource:       providerSrc,
 		ProviderDevOverrides: providerDevOverrides,
 		UnmanagedProviders:   unmanagedProviders,
-
-		AllowExperimentalFeatures: ExperimentsAllowed(),
 	}
 
 	// The command list is included in the terraform -help