backport of commit aaf03d3

Author: jbardin

.circleci/config.yml

@@ -141,14 +141,6 @@ jobs:
       XC_OS: "linux"
       XC_ARCH: "arm"
 
-  # build all arm64 architecture supported OS binaries
-  build-arm64:
-    <<: *build-distros
-    environment:
-      <<: *build-env
-      XC_OS: "darwin"
-      XC_ARCH: "arm64"
-
   test-docker-full:
     executor:
       name: go
@@ -272,7 +264,6 @@ workflows:
     jobs:
       - build-amd64
       - build-arm
-      - build-arm64
 
   website-test:
     jobs:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,6 @@ Hi there,
 
 Thank you for opening an issue. Please note that we try to keep the Terraform issue tracker reserved for bug reports and feature requests. For general usage questions, please see: https://www.terraform.io/community.html.
 
-If your issue relates to Terraform Cloud/Enterprise, please contact tf-cloud@hashicorp.support.
 If your issue relates to a specific Terraform provider, please open it in the provider's own repository. The index of providers is at https://github.com/terraform-providers.
 
 To fix problems, we need clear reproduction cases - we need to be able to see it happen locally. A reproduction case is ideally something a Terraform Core engineer can git-clone or copy-paste and run immediately, without inventing any details or context. 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Terraform Cloud/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
   - name: Provider-related Feedback and Questions
     url: https://github.com/terraform-providers
     about: Each provider (e.g. AWS, Azure, GCP, Oracle, K8S, etc.) has its own repository, any provider related issues or questions should be directed to appropriate provider repository.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,9 +10,7 @@ Hi there,
 
 Thank you for opening an issue. Please note that we try to keep the Terraform issue tracker reserved for bug reports and feature requests. For general usage questions, please see: https://www.terraform.io/community.html.
 
-For feature requests concerning Terraform Cloud/Enterprise, please contact tf-cloud@hashicorp.support
-
-If your issue relates to a specific Terraform provider, please open it in the provider's own repository. The index of providers is at https://github.com/terraform-providers.
+If your issue relates to a specific Terraform provider, please open it in the provider's own repository. The index of providers is at https://github.com/terraform-providers .
 -->
 
 ### Current Terraform Version

.github/workflows/issue-comment-created.yml

@@ -0,0 +1,39 @@
+behavior "remove_labels_on_reply" "remove_stale" {
+  labels               = ["waiting-response", "stale"]
+  only_non_maintainers = true
+}
+
+poll "label_issue_migrater" "provider_migrater" {
+  schedule                = "0 20 * * * *"
+  new_owner               = env.PROVIDERS_OWNER
+  repo_prefix             = "terraform-provider-"
+  label_prefix            = "provider/"
+  excluded_label_prefixes = ["backend/", "provisioner/"]
+  excluded_labels         = ["build", "cli", "config", "core", "new-provider", "new-provisioner", "new-remote-state", "provider/terraform"]
+  aliases = {
+    "provider/google-cloud" = "provider/google"
+    "provider/influx"       = "provider/influxdb"
+    "provider/vcloud"       = "provider/vcd"
+  }
+  issue_header     = <<-EOF
+    _This issue was originally opened by @${var.user} as ${var.repository}#${var.issue_number}. It was migrated here as a result of the [provider split](https://www.hashicorp.com/blog/upcoming-provider-changes-in-terraform-0-10/). The original body of the issue is below._
+    
+    <hr>
+    
+    EOF
+  migrated_comment = "This issue has been automatically migrated to ${var.repository}#${var.issue_number} because it looks like an issue with that provider. If you believe this is _not_ an issue with the provider, please reply to ${var.repository}#${var.issue_number}."
+}
+
+poll "closed_issue_locker" "locker" {
+  schedule                      = "0 50 1 * * *"
+  closed_for                    = "720h" # 30 days
+  no_comment_if_no_activity_for = "1440h" # 60 days
+  max_issues                    = 500
+  sleep_between_issues          = "5s"
+
+  message = <<-EOF
+    I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
+
+    If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
+  EOF
+}

.github/workflows/lock.yml

@@ -1,24 +1,54 @@
-## 1.1.0 (Unreleased)
+## 1.0.3 (Unreleased)
 
-NEW FEATURES:
+ENHANCEMENTS
 
-* cli: `terraform add` generates resource configuration templates ([#28874](https://github.com/hashicorp/terraform/issues/28874))
-* config: a new `type()` function, only available in `terraform console` ([#28501](https://github.com/hashicorp/terraform/issues/28501))
+* `terraform plan`: The JSON logs (`-json` option) will now include `resource_drift`, showing changes detected outside of Terraform during the refresh step. [GH-29072]
+* core: The automatic provider installer will now accept providers that are recorded in their registry as using provider protocol version 6. [GH-29153]
+* backend/etcdv3: New argument `max_request_bytes` allows larger requests and for the client, to match the server request limit. [GH-28078]
+
+BUG FIXES:
+
+* `terraform plan`: Will no longer panic when trying to render null maps. [GH-29207]
+* backend/pg: Prevent the creation of multiple workspaces with the same name. [GH-29157]
+* backend/oss: STS auth is now supported. [GH-29167]
+
+## 1.0.2 (July 07, 2021)
+
+BUG FIXES:
+
+* `terraform show`: Fix crash when rendering JSON plan with sensitive values in state ([#29049](https://github.com/hashicorp/terraform/issues/29049))
+* config: The `floor` and `ceil` functions no longer lower the precision of arguments to what would fit inside a 64-bit float, instead preserving precision in a similar way as most other arithmetic functions. ([#29110](https://github.com/hashicorp/terraform/issues/29110))
+* config: The `flatten` function was incorrectly treating null values of an unknown type as if they were unknown values. Now it will treat them the same as any other non-list/non-tuple value, flattening them down into the result as-is. ([#29110](https://github.com/hashicorp/terraform/issues/29110))
+
+## 1.0.1 (June 24, 2021)
 
 ENHANCEMENTS:
 
-* config: Terraform now checks the syntax of and normalizes module source addresses (the `source` argument in `module` blocks) during configuration decoding rather than only at module installation time. This is largely just an internal refactoring, but a visible benefit of this change is that the `terraform init` messages about module downloading will now show the canonical module package address Terraform is downloading from, after interpreting the special shorthands for common cases like GitHub URLs. ([#28854](https://github.com/hashicorp/terraform/issues/28854))
+* `terraform show`: The JSON plan output now indicates which state values are sensitive. ([#28889](https://github.com/hashicorp/terraform/issues/28889))
+* cli: The macOS builds will now resolve hostnames using the system's DNS resolver, rather than the Go library's (incomplete) emulation of it. In particular, this will allow for the more complex resolver configurations often created by VPN clients on macOS, such as when a particular domain must be resolved using different nameservers while VPN connection is active.
 
 BUG FIXES:
 
-* core: Fixed an issue where provider configuration input variables were not properly merging with values in configuration ([#29000](https://github.com/hashicorp/terraform/issues/29000))
-* cli: Fixed a crashing bug with some edge-cases when reporting syntax errors that happen to be reported at the position of a newline. ([#29048](https://github.com/hashicorp/terraform/issues/29048))
+* `terraform show`: Fix crash with deposed instances in json plan output. ([#28922](https://github.com/hashicorp/terraform/issues/28922))
+* `terraform show`: Fix an issue where the JSON configuration representation was missing fully-unwrapped references. ([#28884](https://github.com/hashicorp/terraform/issues/28884))
+* `terraform show`: Fix JSON plan resource drift to remove unchanged resources. ([#28975](https://github.com/hashicorp/terraform/issues/28975))
+* core: Fix crash when provider modifies and unknown block during plan. ([#28941](https://github.com/hashicorp/terraform/issues/28941))
+* core: Diagnostic context was missing for some errors when validating blocks. ([#28979](https://github.com/hashicorp/terraform/issues/28979))
+* core: Fix crash when calling `setproduct` with unknown values. ([#28984](https://github.com/hashicorp/terraform/issues/28984))
+* backend/remote: Fix faulty Terraform Cloud version check when migrating state to the remote backend with multiple local workspaces. ([#28864](https://github.com/hashicorp/terraform/issues/28864))
+
+## 1.0.0 (June 08, 2021)
+
+Terraform v1.0 is an unusual release in that its primary focus is on stability, and it represents the culmination of several years of work in previous major releases to make sure that the Terraform language and internal architecture will be a suitable foundation for forthcoming additions that will remain backward compatible.
+
+Terraform v1.0.0 intentionally has no significant changes compared to Terraform v0.15.5. You can consider the v1.0 series as a direct continuation of the v0.15 series; we do not intend to issue any further releases in the v0.15 series, because all of the v1.0 releases will be only minor updates to address bugs.
+
+For all future minor releases with major version 1, we intend to preserve backward compatibility as described in detail in [the Terraform v1.0 Compatibility Promises](https://www.terraform.io/docs/language/v1-compatibility-promises.html). The later Terraform v1.1.0 will, therefore, be the first minor release with new features that we will implement with consideration of those promises.
 
 ## Previous Releases
 
-For information on prior major and minor releases, see their changelogs:
+For information on prior major releases, see their changelogs:
 
-* [v1.0](https://github.com/hashicorp/terraform/blob/v1.0/CHANGELOG.md)
 * [v0.15](https://github.com/hashicorp/terraform/blob/v0.15/CHANGELOG.md)
 * [v0.14](https://github.com/hashicorp/terraform/blob/v0.14/CHANGELOG.md)
 * [v0.13](https://github.com/hashicorp/terraform/blob/v0.13/CHANGELOG.md)

.hashibot.hcl

@@ -7,7 +7,7 @@
 /internal/backend/remote-state/consul            @hashicorp/consul @remilapeyre
 /internal/backend/remote-state/cos               @likexian
 /internal/backend/remote-state/etcdv2            Unmaintained
-/internal/backend/remote-state/etcdv3            Unmaintained
+/internal/backend/remote-state/etcdv3            @bmcustodio
 /internal/backend/remote-state/gcs               @hashicorp/terraform-google
 /internal/backend/remote-state/http              @hashicorp/terraform-core
 /internal/backend/remote-state/manta             Unmaintained

CHANGELOG.md

@@ -110,12 +110,6 @@ func initCommands(
 	// that to match.
 
 	Commands = map[string]cli.CommandFactory{
-		"add": func() (cli.Command, error) {
-			return &command.AddCommand{
-				Meta: meta,
-			}, nil
-		},
-
 		"apply": func() (cli.Command, error) {
 			return &command.ApplyCommand{
 				Meta: meta,