backport of commit 84f226c

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,84 @@
+---
+name: Bug report
+about: Let us know about an unexpected error, a crash, or an incorrect behavior.
+labels: bug, new
+
+---
+
+<!--
+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://registry.terraform.io/browse/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. 
+
+* A short example can be directly copy-pasteable; longer examples should be in separate git repositories, especially if multiple files are needed
+* Please include all needed context. For example, if you figured out that an expression can cause a crash, put the expression in a variable definition or a resource
+* Set defaults on (or omit) any variables. The person reproducing it should not need to invent variable settings
+* If multiple steps are required, such as running terraform twice, consider scripting it in a simple shell script. Providing a script can be easier than explaining what changes to make to the config between runs.
+* Omit any unneeded complexity: remove variables, conditional statements, functions, modules, providers, and resources that are not needed to trigger the bug
+* When possible, use the [null resource](https://www.terraform.io/docs/providers/null/resource.html) provider rather than a real provider in order to minimize external dependencies. We know this isn't always feasible. The Terraform Core team doesn't have deep domain knowledge in every provider, or access to every cloud platform for reproduction cases.
+
+-->
+
+### Terraform Version
+<!---
+Run `terraform version` to show the version, and paste the result between the ``` marks below.
+
+If you are not running the latest version of Terraform, please try upgrading because your issue may have already been fixed.
+-->
+
+```
+...
+```
+
+### Terraform Configuration Files
+<!--
+Paste the relevant parts of your Terraform configuration between the ``` marks below.
+
+For Terraform configs larger than a few resources, or that involve multiple files, please make a GitHub repository that we can clone, rather than copy-pasting multiple files in here. For security, you can also encrypt the files using our GPG public key at https://www.hashicorp.com/security.
+-->
+
+```terraform
+...
+```
+
+### Debug Output
+<!--
+Full debug output can be obtained by running Terraform with the environment variable `TF_LOG=trace`. Please create a GitHub Gist containing the debug output. Please do _not_ paste the debug output in the issue, since debug output is long.
+
+Debug output may contain sensitive information. Please review it before posting publicly, and if you are concerned feel free to encrypt the files using the HashiCorp security public key.
+-->
+
+### Expected Behavior
+<!--
+What should have happened?
+-->
+
+### Actual Behavior
+<!--
+What actually happened?
+-->
+
+### Steps to Reproduce
+<!--
+Please list the full steps required to reproduce the issue, for example:
+1. `terraform init`
+2. `terraform apply`
+-->
+
+### Additional Context
+<!--
+Are there anything atypical about your situation that we should know? For example: is Terraform running in a wrapper script or in a CI system? Are you passing any unusual command line options or environment variables to opt-in to non-default behavior?
+-->
+
+### References
+<!--
+Are there any other GitHub issues (open or closed) or Pull Requests that should be linked here? For example:
+
+- #6017
+
+-->

.github/ISSUE_TEMPLATE/config.yml

@@ -3,18 +3,12 @@ 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: 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.
-  - name: Azure Terraform Provider Feedback and Questions
-    url: https://github.com/hashicorp/terraform-provider-azurerm
-    about: The Azure Terraform Provider has its own repository, any provider related issues or questions should be directed there.
-  - name: Other Provider-related Feedback and Questions
+  - name: Provider-related Feedback and Questions
     url: https://registry.terraform.io/browse/providers
-    about: Each provider (e.g. GCP, Oracle, K8S, etc.) has its own repository, any provider related issues or questions should be directed to the appropriate issue tracker linked from the Registry.
+    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 the appropriate issue tracker linked from the Registry.
   - name: Provider Development Feedback and Questions
     url: https://github.com/hashicorp/terraform-plugin-sdk/issues/new/choose
     about: Plugin SDK has its own repository, any SDK and provider development related issues or questions should be directed there.
-  - name: Terraform Usage, Language, or Workflow Questions
+  - name: Terraform Language or Workflow Questions
     url: https://discuss.hashicorp.com/c/terraform-core
-    about: Please ask and answer language or workflow related questions through the Terraform Core Community Forum.
+    about: Please ask and answer language or workflow related questions through the Terraform Core Community Forum.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,62 @@
+---
+name: Feature request
+about: Suggest a new feature or other enhancement.
+labels: enhancement, new
+
+---
+
+<!--
+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.
+-->
+
+### Current Terraform Version
+<!---
+Run `terraform version` to show the version, and paste the result between the ``` marks below. This will record which version was current at the time of your feature request, to help manage the request backlog.
+
+If you're not using the latest version, please check to see if something related to your request has already been implemented in a later version.
+-->
+
+```
+...
+```
+
+### Use-cases
+<!---
+In order to properly evaluate a feature request, it is necessary to understand the use-cases for it.
+
+Please describe below the _end goal_ you are trying to achieve that has led you to request this feature.
+
+Please keep this section focused on the problem and not on the suggested solution. We'll get to that in a moment, below!
+-->
+
+### Attempted Solutions
+<!---
+If you've already tried to solve the problem within Terraform's existing features and found a limitation that prevented you from succeeding, please describe it below in as much detail as possible.
+
+Ideally, this would include real configuration snippets that you tried, real Terraform command lines you ran, and what results you got in each case.
+
+Please remove any sensitive information such as passwords before sharing configuration snippets and command lines.
+--->
+
+### Proposal
+<!---
+If you have an idea for a way to address the problem via a change to Terraform features, please describe it below.
+
+In this section, it's helpful to include specific examples of how what you are suggesting might look in configuration files, or on the command line, since that allows us to understand the full picture of what you are proposing.
+
+If you're not sure of some details, don't worry! When we evaluate the feature request we may suggest modifications as necessary to work within the design constraints of Terraform Core.
+-->
+
+### References
+<!--
+Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above or to the suggested solution? If so, please create a list below that mentions each of them. For example:
+
+- #6017
+
+-->

.github/workflows/build-Dockerfile

@@ -24,10 +24,10 @@ ARG TARGETARCH
 LABEL maintainer="HashiCorp Terraform Team <terraform@hashicorp.com>"
 
 # New standard version label.
-LABEL version=$PRODUCT_VERSION
+LABEL version=$VERSION
 
 # Historical Terraform-specific label preserved for backward compatibility.
-LABEL "com.hashicorp.terraform.version"="${PRODUCT_VERSION}"
+LABEL "com.hashicorp.terraform.version"="${VERSION}"
 
 RUN apk add --no-cache git openssh