merge upstream/main and deconflict - hashicorp#9556

.circleci/config.yml

@@ -10,7 +10,7 @@ references:
 executors:
   go:
     docker:
-      - image: docker.mirror.hashicorp.services/cimg/go:1.17
+      - image: docker.mirror.hashicorp.services/cimg/go:1.17.2
     environment:
       CONSUL_VERSION: 1.7.2
       GOMAXPROCS: 4
@@ -26,7 +26,9 @@ jobs:
     steps:
       - checkout
       - run: go mod verify
-      - run: make fmtcheck generate
+      - run: go install honnef.co/go/tools/cmd/staticcheck
+      - run: go install github.com/nishanths/exhaustive/...
+      - run: make fmtcheck generate staticcheck exhaustive
       - run:
           name: verify no code was generated
           command: |
@@ -173,97 +175,6 @@ jobs:
           name: test docker build for 'full' image
           command: docker build -t test-docker-full .
 
-  # Based on a similar job in terraform-website repo.
-  website-link-check:
-    docker:
-      - image: *MIDDLEMAN_IMAGE
-    steps:
-      - checkout:
-          path: terraform
-
-      - run:
-          name: Determine changed website files, if any
-          working_directory: terraform
-          command: |
-            # Figure out what the current branch forked from. Compare against
-            # main and the set of "vX.Y" branches, and choose whichever branch
-            # we're the *fewest* commits ahead of.
-            # The point here isn't to perfectly predict where this will be
-            # merged; all we really care about is determining which commits are
-            # *unique to this PR,* so we don't accidentally complain about
-            # problems you had nothing to do with.
-            PARENT_BRANCH=$(
-              for br in $(git branch -rl --format='%(refname:short)' | grep -E '^origin/(main|v\d+\.\d+)$'); do
-                new_commits=$(git rev-list --first-parent ^${br} HEAD | wc -l);
-                echo "${br} ${new_commits}";
-              done \
-              | sort -n -k2 \
-              | head -n1 \
-              | awk '{print $1}';
-            )
-            echo "Checking current branch against: ${PARENT_BRANCH}"
-            MERGE_BASE=$(git merge-base HEAD ${PARENT_BRANCH})
-            git diff --name-only -z --diff-filter=AMRCT ${MERGE_BASE}..HEAD -- ./website/ > /tmp/changed-website-files.txt
-              # --name-only: Return a list of affected files but don't show the changes.
-              # -z: Make that a null-separated list (instead of newline-separated), and
-              #     DON'T mangle non-ASCII characters.
-              # --diff-filter=AMRCT: Only list files that were added, modified, renamed,
-              #     copied, or had their type changed (file, symlink, etc.). In
-              #     particular, we don't want to check deleted files.
-              # ${MERGE_BASE}..HEAD: Only consider files that have
-              #     changed since this branch diverged from its parent branch.
-              # -- ./website/: Only consider files in the website directory.
-            echo "Changed website files:"
-            cat /tmp/changed-website-files.txt | tr '\0' '\n'
-              # Need to use "tr" for display because it's a null-separated list.
-
-      - run:
-          name: Exit early if there's nothing to check
-          command: |
-            if [ ! -s /tmp/changed-website-files.txt ]; then
-              circleci-agent step halt
-            fi
-
-      - run:
-          name: Check out terraform-website repo
-          command: git clone [email protected]:hashicorp/terraform-website.git
-
-      - run:
-          name: Use local checkout for terraform submodule, instead of cloning again
-          working_directory: terraform-website
-          command: |
-            # Set submodule's URL to our existing checkout.
-            # (Using `pwd` because git's behavior with strictly relative paths is unreliable.)
-            git config --file=.gitmodules submodule.ext/terraform.url $(pwd)/../terraform/.git
-            # Make it so `make sync` will grab our current branch instead of stable-website.
-            git config --file=.gitmodules submodule.ext/terraform.branch HEAD
-
-      - run:
-          name: Init/update terraform-website submodules
-          working_directory: terraform-website
-          command: make sync
-
-      - run:
-          name: Set up terraform-website dependencies
-          working_directory: terraform-website/content
-          # If this does anything interesting, then the container needs an update.
-          command: bundle check || bundle install --path vendor/bundle --retry=3
-
-      - run:
-          name: Run middleman in background
-          working_directory: terraform-website/content
-          background: true
-          command: bundle exec middleman server
-
-      - run:
-          name: Wait for server to start
-          command: until curl -sS http://localhost:4567/ > /dev/null; do sleep 1; done
-
-      - run:
-          name: Check links in changed pages
-          working_directory: terraform-website/content
-          command: cat /tmp/changed-website-files.txt | bundle exec ./scripts/check-pr-links.rb
-
 workflows:
   version: 2
   test:
@@ -287,7 +198,3 @@ workflows:
       - build-amd64
       - build-arm
       - build-arm64
-
-  website-test:
-    jobs:
-      - website-link-check

.github/CONTRIBUTING.md

@@ -4,6 +4,12 @@ This repository contains only Terraform core, which includes the command line in
 
 ---
 
+**Note:** Due to current low staffing on the Terraform Core team at HashiCorp, **we are not routinely reviewing and merging community-submitted pull requests**. We do hope to begin processing them again soon once we're back up to full staffing again, but for the moment we need to ask for patience. Thanks!
+
+**Additional note:**  The intent of the prior comment was to provide clarity for the community around what to expect for a small part of the work related to Terraform. This does not affect other PR reviews, such as those for Terraform providers. We expect that the relevant team will be appropriately staffed within the coming weeks, which should allow us to get back to normal community PR review practices. For the broader context and information on HashiCorp’s continued commitment to and investment in Terraform, see [this blog post](https://www.hashicorp.com/blog/terraform-community-contributions).
+
+---
+
 **All communication on GitHub, the community forum, and other HashiCorp-provided communication channels is subject to [the HashiCorp community guidelines](https://www.hashicorp.com/community-guidelines).**
 
 This document provides guidance on Terraform 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. 
@@ -166,8 +172,8 @@ go test ./...
 As you make your changes, you can re-run the above command to ensure that the tests are *still* passing. If you are working only on a specific Go package, you can speed up your testing cycle by testing only that single package, or packages under a particular package prefix:
 
 ```
-go test ./command/...
-go test ./addrs
+go test ./internal/command/...
+go test ./internal/addrs
 ```
 
 ## Acceptance Tests: Testing interactions with external services

.github/ISSUE_TEMPLATE/bug_report.md

@@ -53,11 +53,6 @@ Full debug output can be obtained by running Terraform with the environment vari
 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.
 -->
 
-### Crash Output
-<!--
-If the console output indicates that Terraform crashed, please share a link to a GitHub Gist containing the output of the `crash.log` file.
--->
-
 ### Expected Behavior
 <!--
 What should have happened?

.github/workflows/build-Dockerfile

@@ -0,0 +1,41 @@
+# This Dockerfile is not intended for general use, but is rather used to
+# produce our "light" release packages as part of our official release
+# pipeline.
+#
+# 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 "terraform" executable
+# in the dist/linux/${TARGETARCH} directory.
+
+FROM docker.mirror.hashicorp.services/alpine:latest AS default
+
+# This is intended to be run from the hashicorp/actions-docker-build GitHub
+# action, which sets these appropriately based on context.
+ARG PRODUCT_VERSION=UNSPECIFIED
+ARG PRODUCT_REVISION=UNSPECIFIED
+ARG BIN_NAME=terraform
+
+# This argument is set by the Docker toolchain itself, to the name
+# of the CPU architecture we're building an image for.
+# Our caller should've extracted the corresponding "terraform" executable
+# into dist/linux/${TARGETARCH} for us to use.
+ARG TARGETARCH
+
+LABEL maintainer="HashiCorp Terraform Team <[email protected]>"
+
+# New standard version label.
+LABEL version=$VERSION
+
+# Historical Terraform-specific label preserved for backward compatibility.
+LABEL "com.hashicorp.terraform.version"="${VERSION}"
+
+RUN apk add --no-cache git openssh
+
+# The hashicorp/actions-docker-build GitHub Action extracts the appropriate
+# release package for our target architecture into the current working
+# directory before running "docker build", which we'll then copy into the
+# Docker image to make sure that we use an identical binary as all of the
+# other official release channels.
+COPY ["dist/linux/${TARGETARCH}/terraform", "/bin/terraform"]
+
+ENTRYPOINT ["/bin/terraform"]