Merge branch 'main' of github.com:hashicorp/terraform into liamcervante/34960

Author: Liam Cervante

.changes/v1.14/ENHANCEMENTS-20250723-122922.yaml

@@ -0,0 +1,5 @@
+kind: ENHANCEMENTS
+body: 'terraform test: expected diagnostics will be included in test output when running in verbose mode"'
+time: 2025-07-23T12:29:22.244611+02:00
+custom:
+    Issue: "37362"

CHANGELOG.md

@@ -1,6 +1,11 @@
 ## 1.14.0 (Unreleased)
 
 
+ENHANCEMENTS:
+
+* terraform test: expected diagnostics will be included in test output when running in verbose mode" ([#37362](https://github.com/hashicorp/terraform/issues/37362))
+
+
 EXPERIMENTS:
 
 Experiments are only enabled in alpha releases of Terraform CLI. The following features are not yet available in stable releases.

docs/plugin-protocol/tfplugin5.proto

@@ -463,7 +463,8 @@ message GetProviderSchema {
         map<string, Function> functions = 7;
         map<string, Schema> ephemeral_resource_schemas = 8;
         map<string, Schema> list_resource_schemas = 9;
-        map<string, ActionSchema> action_schemas = 10;
+        reserved 10; // Field number 10 is used by state stores in version 6
+        map<string, ActionSchema> action_schemas = 11;
         repeated Diagnostic diagnostics = 4;
         Schema provider_meta = 5;
         ServerCapabilities server_capabilities = 6;
@@ -936,9 +937,9 @@ message PlanAction {
         // linked resources, this should match the order the resources are specified in the schema.
         repeated LinkedResource linked_resources = 2;
         // config of the action, based on the schema of the actual action
-        DynamicValue config = 6;
+        DynamicValue config = 3;
         // metadata
-        ClientCapabilities client_capabilities = 8;
+        ClientCapabilities client_capabilities = 4;
     }
 
     message Response {

docs/plugin-protocol/tfplugin6.proto

@@ -974,9 +974,9 @@ message PlanAction {
         // linked resources, this should match the order the resources are specified in the schema.
         repeated LinkedResource linked_resources = 2;
         // config of the action, based on the schema of the actual action
-        DynamicValue config = 6;
+        DynamicValue config = 3;
         // metadata
-        ClientCapabilities client_capabilities = 8;
+        ClientCapabilities client_capabilities = 4;
     }
 
     message Response {

internal/addrs/action.go

@@ -333,25 +333,6 @@ type configActionKey string
 
 func (k configActionKey) uniqueKeySigil() {}
 
-// AbsActionInvocationInstance describes the invocation of an action as part of a plan / apply.
-type AbsActionInvocationInstance struct {
-	TriggeringResource AbsResourceInstance
-	Action             AbsActionInstance
-	TriggerIndex       int
-
-	// TriggerBlockSourceRange is the location of the action_trigger block
-	// within the resources lifecycle block that triggered this action.
-	TriggerBlockSourceRange *tfdiags.SourceRange
-
-	// ActionReferenceSourceRange is the location of the action reference
-	// in the actions list within the action_trigger block.
-	ActionReferenceSourceRange *tfdiags.SourceRange
-}
-
-func (a AbsActionInvocationInstance) String() string {
-	return fmt.Sprintf("%s.%d.%s", a.TriggeringResource.String(), a.TriggerIndex, a.Action.String())
-}
-
 // ParseAbsActionInstanceStr is a helper wrapper around
 // ParseAbsActionInstance that takes a string and parses it with the HCL
 // native syntax traversal parser before interpreting it.

internal/addrs/action_test.go

@@ -109,15 +109,15 @@ func TestActionInstanceEqual(t *testing.T) {
 func TestAbsActionInstanceEqual(t *testing.T) {
 	actions := []AbsActionInstance{
 		{
-			RootModuleInstance,
-			ActionInstance{
+			Module: RootModuleInstance,
+			Action: ActionInstance{
 				Action: Action{Type: "foo", Name: "bar"},
 				Key:    NoKey,
 			},
 		},
 		{
-			mustParseModuleInstanceStr("module.child"),
-			ActionInstance{
+			Module: mustParseModuleInstanceStr("module.child"),
+			Action: ActionInstance{
 				Action: Action{Type: "the", Name: "bloop"},
 				Key:    StringKey("fish"),
 			},
@@ -139,15 +139,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 	}{
 		{ // different keys
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    IntKey(1),
 				},
@@ -156,15 +156,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 
 		{ // different module
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				mustParseModuleInstanceStr("module.child[1]"),
-				ActionInstance{
+				Module: mustParseModuleInstanceStr("module.child[1]"),
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
@@ -173,15 +173,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 
 		{ // totally different
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "oof", Name: "rab"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				mustParseModuleInstanceStr("module.foo"),
-				ActionInstance{
+				Module: mustParseModuleInstanceStr("module.foo"),
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    IntKey(11),
 				},

internal/addrs/map.go

@@ -3,6 +3,8 @@
 
 package addrs
 
+import "iter"
+
 // Map represents a mapping whose keys are address types that implement
 // UniqueKeyer.
 //
@@ -135,3 +137,13 @@ func (m Map[K, V]) Values() []V {
 	}
 	return ret
 }
+
+func (m Map[K, V]) Iter() iter.Seq2[K, V] {
+	return func(yield func(K, V) bool) {
+		for _, elem := range m.Elements() {
+			if !yield(elem.Key, elem.Value) {
+				return
+			}
+		}
+	}
+}

internal/backend/local/backend_plan.go

@@ -41,18 +41,30 @@ func (b *Local) opPlan(
 		return
 	}
 
-	// Local planning requires a config, unless we're planning to destroy.
-	if op.PlanMode != plans.DestroyMode && !op.HasConfig() {
-		diags = diags.Append(tfdiags.Sourceless(
-			tfdiags.Error,
-			"No configuration files",
-			"Plan requires configuration to be present. Planning without a configuration would "+
-				"mark everything for destruction, which is normally not what is desired. If you "+
-				"would like to destroy everything, run plan with the -destroy option. Otherwise, "+
-				"create a Terraform configuration file (.tf file) and try again.",
-		))
-		op.ReportResult(runningOp, diags)
-		return
+	if !op.HasConfig() {
+		switch {
+		case op.Query:
+			// Special diag for terraform query command
+			diags = diags.Append(tfdiags.Sourceless(
+				tfdiags.Error,
+				"No configuration files",
+				"Query requires a query configuration to be present. Create a Terraform query configuration file (.tfquery.hcl file) and try again.",
+			))
+			op.ReportResult(runningOp, diags)
+			return
+		case op.PlanMode != plans.DestroyMode:
+			// Local planning requires a config, unless we're planning to destroy.
+			diags = diags.Append(tfdiags.Sourceless(
+				tfdiags.Error,
+				"No configuration files",
+				"Plan requires configuration to be present. Planning without a configuration would "+
+					"mark everything for destruction, which is normally not what is desired. If you "+
+					"would like to destroy everything, run plan with the -destroy option. Otherwise, "+
+					"create a Terraform configuration file (.tf file) and try again.",
+			))
+			op.ReportResult(runningOp, diags)
+			return
+		}
 	}
 
 	if len(op.GenerateConfigOut) > 0 {

internal/command/fmt.go

@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -53,6 +52,10 @@ func (c *FmtCommand) Run(args []string) int {
 		c.input = os.Stdin
 	}
 
+	if c.Meta.AllowExperimentalFeatures {
+		fmtSupportedExts = append(fmtSupportedExts, ".tfquery.hcl")
+	}
+
 	args = c.Meta.process(args)
 	cmdFlags := c.Meta.defaultFlagSet("fmt")
 	cmdFlags.BoolVar(&c.list, "list", true, "list")
@@ -174,7 +177,7 @@ func (c *FmtCommand) processFile(path string, r io.Reader, w io.Writer, isStdout
 
 	log.Printf("[TRACE] terraform fmt: Formatting %s", path)
 
-	src, err := ioutil.ReadAll(r)
+	src, err := io.ReadAll(r)
 	if err != nil {
 		diags = diags.Append(fmt.Errorf("Failed to read %s", path))
 		return diags
@@ -201,7 +204,7 @@ func (c *FmtCommand) processFile(path string, r io.Reader, w io.Writer, isStdout
 			fmt.Fprintln(w, path)
 		}
 		if c.write {
-			err := ioutil.WriteFile(path, result, 0644)
+			err := os.WriteFile(path, result, 0644)
 			if err != nil {
 				diags = diags.Append(fmt.Errorf("Failed to write %s", path))
 				return diags
@@ -232,7 +235,7 @@ func (c *FmtCommand) processDir(path string, stdout io.Writer) tfdiags.Diagnosti
 
 	log.Printf("[TRACE] terraform fmt: looking for files in %s", path)
 
-	entries, err := ioutil.ReadDir(path)
+	entries, err := os.ReadDir(path)
 	if err != nil {
 		switch {
 		case os.IsNotExist(err):
@@ -551,8 +554,8 @@ func (c *FmtCommand) Help() string {
 Usage: terraform [global options] fmt [options] [target...]
 
   Rewrites all Terraform configuration files to a canonical format. All
-  configuration files (.tf), variables files (.tfvars), and testing files 
-  (.tftest.hcl) are updated. JSON files (.tf.json, .tfvars.json, or 
+  configuration files (.tf), variables files (.tfvars), and testing files
+  (.tftest.hcl) are updated. JSON files (.tf.json, .tfvars.json, or
   .tftest.json) are not modified.
 
   By default, fmt scans the current directory for configuration files. If you
@@ -590,14 +593,14 @@ func (c *FmtCommand) Synopsis() string {
 }
 
 func bytesDiff(b1, b2 []byte, path string) (data []byte, err error) {
-	f1, err := ioutil.TempFile("", "")
+	f1, err := os.CreateTemp("", "")
 	if err != nil {
 		return
 	}
 	defer os.Remove(f1.Name())
 	defer f1.Close()
 
-	f2, err := ioutil.TempFile("", "")
+	f2, err := os.CreateTemp("", "")
 	if err != nil {
 		return
 	}