Merge branch 'main' into patch-1

Author: jar-b

.copywrite.hcl

@@ -2,7 +2,7 @@ schema_version = 1
 
 project {
   license        = "BUSL-1.1"
-  copyright_year = 2023
+  copyright_year = 2024
 
   # (OPTIONAL) A list of globs that should not have copyright/license headers.
   # Supports doublestar glob patterns for more flexibility in defining which

.github/pull_request_template.md

@@ -31,7 +31,7 @@ label to enable the backport bot.
 
 -->
 
-1.5.x
+1.8.x
 
 ## Draft CHANGELOG entry
 

.github/workflows/checks.yml

@@ -19,9 +19,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
-      - 'v[0-9]+.[0-9]+'
-      - checks-workflow-dev/*
+      - '*'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
 
@@ -62,7 +60,10 @@ jobs:
 
       - name: "Unit tests"
         run: |
-          go test ./...
+          # We run tests for all packages from all modules in this repository.
+          for dir in $(go list -m -f '{{.Dir}}' github.com/hashicorp/terraform/...); do
+              (cd $dir && go test "./...")
+          done
 
   race-tests:
     name: "Race Tests"
@@ -166,9 +167,12 @@ jobs:
 
       - name: "go.mod and go.sum consistency check"
         run: |
-          go mod tidy
-          if [[ -n "$(git status --porcelain)" ]]; then
-            echo >&2 "ERROR: go.mod/go.sum are not up-to-date. Run 'go mod tidy' and then commit the updated files."
+          make syncdeps
+          CHANGED="$(git status --porcelain)"
+          if [[ -n "$CHANGED" ]]; then
+            git diff
+            echo >&2 "ERROR: go.mod/go.sum files are not up-to-date. Run 'make syncdeps' and then commit the updated files."
+            echo >&2 $'Affected files:\n'"$CHANGED"
             exit 1
           fi
 
@@ -182,7 +186,7 @@ jobs:
 
       - name: "Code consistency checks"
         run: |
-          make fmtcheck importscheck generate staticcheck exhaustive protobuf
+          make fmtcheck importscheck copyright 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

.gitignore

@@ -18,6 +18,8 @@ website/node_modules
 *.test
 *.iml
 
+go.work*
+
 /terraform
 
 website/vendor

.go-version

@@ -1 +1 @@
-1.21.5
+1.22.1

.release/ci.hcl

@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-schema = "1"
+schema = "2"
 
 project "terraform" {
   // the team key is not used by CRT currently
@@ -69,32 +69,6 @@ event "promote-staging" {
   }
 }
 
-event "promote-staging-docker" {
-  depends = ["promote-staging"]
-  action "promote-staging-docker" {
-    organization = "hashicorp"
-    repository = "crt-workflows-common"
-    workflow = "promote-staging-docker"
-  }
-
-  notification {
-    on = "always"
-  }
-}
-
-event "promote-staging-packaging" {
-  depends = ["promote-staging-docker"]
-  action "promote-staging-packaging" {
-    organization = "hashicorp"
-    repository = "crt-workflows-common"
-    workflow = "promote-staging-packaging"
-  }
-
-  notification {
-    on = "always"
-  }
-}
-
 event "trigger-production" {
 // This event is dispatched by the bob trigger-promotion command
 // and is required - do not delete.
@@ -108,56 +82,13 @@ event "promote-production" {
     workflow = "promote-production"
   }
 
-  notification {
-    on = "always"
-  }
-}
-
-event "crt-hook-tfc-upload" {
-  depends = ["promote-production"]
-  action "crt-hook-tfc-upload" {
-    organization = "hashicorp"
-    repository = "terraform-releases"
-    workflow = "crt-hook-tfc-upload"
-  }
-
-  notification {
-    on = "always"
-  }
-}
-
-event "promote-production-docker" {
-  depends = ["crt-hook-tfc-upload"]
-  action "promote-production-docker" {
-    organization = "hashicorp"
-    repository = "crt-workflows-common"
-    workflow = "promote-production-docker"
-  }
-
-  notification {
-    on = "always"
-  }
-}
-
-event "promote-production-packaging" {
-  depends = ["promote-production-docker"]
-  action "promote-production-packaging" {
-    organization = "hashicorp"
-    repository = "crt-workflows-common"
-    workflow = "promote-production-packaging"
-  }
-
-  notification {
-    on = "always"
-  }
-}
-
-event "update-ironbank" {
-  depends = ["promote-production-packaging"]
-  action "update-ironbank" {
-    organization = "hashicorp"
-    repository = "crt-workflows-common"
-    workflow = "update-ironbank"
+  promotion-events  {
+    update-ironbank = true
+    post-promotion {
+      organization = "hashicorp"
+      repository = "terraform-releases"
+      workflow = "crt-hook-tfc-upload"
+    }
   }
 
   notification {

CHANGELOG.md

@@ -1,9 +1,30 @@
-## 1.8.0 (Unreleased)
+## 1.9.0 (Unreleased)
+
+ENHANCEMENTS:
+
+* `terraform console`: Now has basic support for multi-line input in interactive mode. ([#34822](https://github.com/hashicorp/terraform/pull/34822))
+
+    If an entered line contains opening paretheses/etc that are not closed, Terraform will await another line of input to complete the expression. This initial implementation is primarily intended to support pasting in multi-line expressions from elsewhere, rather than for manual multi-line editing, so the interactive editing support is currently limited.
+
+BUG FIXES:
+
+* `remote-exec`: Each remote connection will be closed immediately after use [GH-34137]
+
+EXPERIMENTS:
+
+Experiments are only enabled in alpha releases of Terraform CLI. The following features are not yet available in stable releases.
+
+* `terraform test` accepts a new option `-junit-xml=FILENAME`. If specified, and if the test configuration is valid enough to begin executing, then Terraform writes a JUnit XML test result report to the given filename, describing similar information as included in the normal test output. ([#34291](https://github.com/hashicorp/terraform/issues/34291))
+* The new command `terraform rpcapi` exposes some Terraform Core functionality through an RPC interface compatible with [`go-plugin`](https://github.com/hashicorp/go-plugin). The exact RPC API exposed here is currently subject to change at any time, because it's here primarily as a vehicle to support the [Terraform Stacks](https://www.hashicorp.com/blog/terraform-stacks-explained) private preview and so will be broken if necessary to respond to feedback from private preview participants, or possibly for other reasons. Do not use this mechanism yet outside of Terraform Stacks private preview.
+* The [language-level experiment](https://developer.hashicorp.com/terraform/language/settings#experimental-language-features) `unknown_instances` permits `count` and `for_each` arguments in `module`, `resource`, and `data` blocks to have unknown values.
+
+    This is at an early stage and so currently setting these arguments to unknown values will only yield broken behavior, and so it's not yet useful to participate in this experiment. Future work will improve support for this new possibility, gradually making this experiment viable.
 
 ## Previous Releases
 
 For information on prior major and minor releases, see their changelogs:
 
+* [v1.8](https://github.com/hashicorp/terraform/blob/v1.8/CHANGELOG.md)
 * [v1.7](https://github.com/hashicorp/terraform/blob/v1.7/CHANGELOG.md)
 * [v1.6](https://github.com/hashicorp/terraform/blob/v1.6/CHANGELOG.md)
 * [v1.5](https://github.com/hashicorp/terraform/blob/v1.5/CHANGELOG.md)

CODEOWNERS

@@ -1,27 +1,35 @@
 # Each line is a file pattern followed by one or more owners.
 # More on CODEOWNERS files: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
+# Entries that are commented out have maintainers that are not in the
+# HashiCorp organization and so cannot be automatically added as reviewers.
+#
+# We retain those as documentation of who agreed to maintain, but they
+# cannot be used automatically by GitHub's pull request workflow and would
+# make GitHub consider this file invalid if not commented.
+
 # Remote-state backend                  # Maintainer
-/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            Unmaintained
-/internal/backend/remote-state/gcs               @hashicorp/terraform-google @hashicorp/terraform-ecosystem-strategic
+#/internal/backend/remote-state/consul           Unmaintained
+#/internal/backend/remote-state/cos              @likexian
+/internal/backend/remote-state/gcs               @hashicorp/tf-eco-hybrid-cloud
 /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/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
+/internal/backend/remote-state/kubernetes        @hashicorp/tf-eco-hybrid-cloud
 
 # Provisioners
-builtin/provisioners/chef               Deprecated
 builtin/provisioners/file               @hashicorp/terraform-core
-builtin/provisioners/habitat            Deprecated
 builtin/provisioners/local-exec         @hashicorp/terraform-core
-builtin/provisioners/puppet             Deprecated
 builtin/provisioners/remote-exec        @hashicorp/terraform-core
-builtin/provisioners/salt-masterless    Deprecated
+
+# go.sum files should never cause automatic review requests because they only
+# ever change in response to go.mod files (our PR checks would fail if not) and
+# if a specific module has _only_ a go.sum update without an associated go.mod
+# update then that represents that the update cannot affect the module, and
+# the Go toolchain just needed to download something new to prove that.
+#
+# (The last match in the file "wins", so this overrides any explicit owner
+# specified above when go.sum is the only file that changed.)
+*/go.sum   # no owner for these

LICENSE

@@ -4,7 +4,7 @@ License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
 Parameters
 
 Licensor:             HashiCorp, Inc.
-Licensed Work:        Terraform Version 1.6.0 or later. The Licensed Work is (c) 2023
+Licensed Work:        Terraform Version 1.6.0 or later. The Licensed Work is (c) 2024
                       HashiCorp, Inc.
 Additional Use Grant: You may make production use of the Licensed Work, provided
                       Your use does not include offering the Licensed Work to third

Makefile

@@ -26,6 +26,15 @@ staticcheck:
 exhaustive:
 	"$(CURDIR)/scripts/exhaustive.sh"
 
+copyright:
+	"$(CURDIR)/scripts/copyright.sh" --plan
+
+copyrightfix:
+	"$(CURDIR)/scripts/copyright.sh"
+
+syncdeps:
+	"$(CURDIR)/scripts/syncdeps.sh"
+
 # Run this if working on the website locally to run in watch mode.
 website:
 	$(MAKE) -C website website
@@ -43,4 +52,4 @@ website/build-local:
 # under parallel conditions.
 .NOTPARALLEL:
 
-.PHONY: fmtcheck importscheck generate protobuf staticcheck website website/local website/build-local
+.PHONY: fmtcheck importscheck generate protobuf staticcheck syncdeps website website/local website/build-local