fix merge conflicts due to reorg

.circleci/config.yml

@@ -10,7 +10,7 @@ references:
 executors:
   go:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+      - image: docker.mirror.hashicorp.services/cimg/go:1.16
     environment:
       CONSUL_VERSION: 1.7.2
       GOMAXPROCS: 4
@@ -93,7 +93,7 @@ jobs:
       - run:
           name: Run Go E2E Tests
           command: |
-            gotestsum --format=short-verbose --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- -p 2 -cover -coverprofile=cov_e2e.part ./command/e2etest ./tools/terraform-bundle/e2etest
+            gotestsum --format=short-verbose --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- -p 2 -cover -coverprofile=cov_e2e.part ./internal/command/e2etest ./tools/terraform-bundle/e2etest
 
       # save coverage report parts
       - persist_to_workspace:
@@ -110,27 +110,6 @@ jobs:
           fail_only: true
           only_for_branches: main
 
-  # combine code coverage results from the parallel circleci executors
-  coverage-merge:
-    executor:
-      name: go
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: mkdir -p $TEST_RESULTS_DIR
-      - run:
-          name: merge coverage reports
-          command: |
-            echo "mode: set" > coverage.out
-            grep -h -v "mode: set" cov_*.part >> coverage.out
-            go tool cover -html=coverage.out -o $TEST_RESULTS_DIR/coverage.html
-      - run:
-          name: codecov upload
-          command: bash <(curl -s https://codecov.io/bash) -v -C $CIRCLE_SHA1
-      - store_artifacts:
-          path: *TEST_RESULTS_DIR
-
   # build all distros
   build-distros: &build-distros
     executor: go
@@ -146,28 +125,20 @@ jobs:
       - store_artifacts:
           path: *ARTIFACTS_DIR
 
-  # build all 386 architecture supported OS binaries
-  build-386:
-    <<: *build-distros
-    environment:
-      <<: *build-env
-      XC_OS: "freebsd linux openbsd windows"
-      XC_ARCH: "386"
-
   # build all amd64 architecture supported OS binaries
   build-amd64:
     <<: *build-distros
     environment:
       <<: *build-env
-      XC_OS: "darwin freebsd linux solaris windows"
+      XC_OS: "darwin linux windows"
       XC_ARCH: "amd64"
 
   # build all arm architecture supported OS binaries
   build-arm:
     <<: *build-distros
     environment:
       <<: *build-env
-      XC_OS: "freebsd linux"
+      XC_OS: "linux"
       XC_ARCH: "arm"
 
   test-docker-full:
@@ -282,10 +253,6 @@ workflows:
       - go-test-e2e:
           requires:
             - go-checks
-      - coverage-merge:
-          requires:
-            - go-test
-            - go-test-e2e
       - test-docker-full:
           filters:
             branches:
@@ -295,7 +262,6 @@ workflows:
 
   build-distros:
     jobs:
-      - build-386
       - build-amd64
       - build-arm
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,6 +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.
 
+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,5 +1,8 @@
 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,7 +10,9 @@ 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 a specific Terraform provider, please open it in the provider's own repository. The index of providers is at https://github.com/terraform-providers .
+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

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

@@ -0,0 +1,15 @@
+name: Issue Comment Created Triage
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  issue_comment_triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: |
+            stale
+            waiting-reply

.github/workflows/lock.yml

@@ -0,0 +1,23 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '50 1 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-comment: >
+            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.
+          issue-lock-inactive-days: '30'
+          pr-lock-comment: >
+            I'm going to lock this pull request because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active contributions.
+
+            If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
+          pr-lock-inactive-days: '30'

.go-version

@@ -1 +1 @@
-1.16.0
+1.16.4

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Next Major Release
 
-(nothing yet)
+NEW FEATURES:
+
+* lang/funcs: add a new `type()` function, only available in `terraform console` [GH-28501]
 
 ## Previous Releases
 

CODEOWNERS

@@ -2,20 +2,20 @@
 # More on CODEOWNERS files: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
 # Remote-state backend                  # Maintainer
-/backend/remote-state/artifactory       Unmaintained
-/backend/remote-state/azure             @hashicorp/terraform-azure
-/backend/remote-state/consul            @hashicorp/consul @remilapeyre
-/backend/remote-state/cos               @likexian
-/backend/remote-state/etcdv2            Unmaintained
-/backend/remote-state/etcdv3            @bmcustodio
-/backend/remote-state/gcs               @hashicorp/terraform-google
-/backend/remote-state/http              @hashicorp/terraform-core
-/backend/remote-state/manta             Unmaintained
-/backend/remote-state/oss               @xiaozhu36
-/backend/remote-state/pg                @remilapeyre
-/backend/remote-state/s3                @hashicorp/terraform-aws
-/backend/remote-state/swift             Unmaintained
-/backend/remote-state/kubernetes        @jrhouston @alexsomesan 
+/internal/backend/remote-state/artifactory       Unmaintained
+/internal/backend/remote-state/azure             @hashicorp/terraform-azure
+/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            @bmcustodio
+/internal/backend/remote-state/gcs               @hashicorp/terraform-google
+/internal/backend/remote-state/http              @hashicorp/terraform-core
+/internal/backend/remote-state/manta             Unmaintained
+/internal/backend/remote-state/oss               @xiaozhu36
+/internal/backend/remote-state/pg                @remilapeyre
+/internal/backend/remote-state/s3                @hashicorp/terraform-aws
+/internal/backend/remote-state/swift             Unmaintained
+/internal/backend/remote-state/kubernetes        @jrhouston @alexsomesan
 
 # Provisioners
 builtin/provisioners/chef               Deprecated
@@ -25,4 +25,3 @@ builtin/provisioners/local-exec         @hashicorp/terraform-core
 builtin/provisioners/puppet             Deprecated
 builtin/provisioners/remote-exec        @hashicorp/terraform-core
 builtin/provisioners/salt-masterless    Deprecated
-

Makefile

@@ -16,7 +16,7 @@ generate:
 protobuf:
 	bash scripts/protobuf-check.sh
 	bash internal/tfplugin5/generate.sh
-	bash plans/internal/planproto/generate.sh
+	bash internal/plans/internal/planproto/generate.sh
 
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"

checkpoint.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/go-checkpoint"
-	"github.com/hashicorp/terraform/command"
-	"github.com/hashicorp/terraform/command/cliconfig"
+	"github.com/hashicorp/terraform/internal/command"
+	"github.com/hashicorp/terraform/internal/command/cliconfig"
 )
 
 func init() {