Merge branch 'pss/pss-with-state-commands' into pss/pss-with-output-show-commands

Author: SarahFrench

.changes/v1.14/BUG FIXES-20251124-150000.yaml

@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: 'actions: make after_create & after_update actions run after the resource has applied'
+time: 2025-11-24T15:00:00.316597+01:00
+custom:
+    Issue: "37936"

.changes/v1.15/BUG FIXES-20251119-103000.yaml

@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: 'cli: Fixed `terraform init -json` to properly format all backend configuration messages as JSON instead of plain text'
+time: 2025-11-19T10:30:00.000000Z
+custom:
+    Issue: "37911"

.changes/v1.15/BUG FIXES-20251121-183045.yaml

@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: '`state show`: The `state show` command will now explicitly fail and return code 1 when it fails to render the named resources state'
+time: 2025-11-21T18:30:45.571448Z
+custom:
+    Issue: "37933"

internal/backend/pluggable/chunks.go renamed to internal/backend/pluggable/chunks/chunks.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package pluggable
+package chunks
 
 const (
 	// DefaultStateStoreChunkSize is the default chunk size proposed

internal/backend/pluggable/pluggable.go

@@ -5,8 +5,11 @@ package pluggable
 
 import (
 	"errors"
+	"fmt"
+	"log"
 
 	"github.com/hashicorp/terraform/internal/backend"
+	"github.com/hashicorp/terraform/internal/backend/pluggable/chunks"
 	"github.com/hashicorp/terraform/internal/configs/configschema"
 	"github.com/hashicorp/terraform/internal/providers"
 	"github.com/hashicorp/terraform/internal/states/remote"
@@ -15,19 +18,22 @@ import (
 	"github.com/zclconf/go-cty/cty"
 )
 
-// NewPluggable returns an instance of the backend.Backend interface that
-// contains a provider interface. These are the assumptions about that
-// provider:
+// NewPluggable returns a Pluggable. A Pluggable fulfils the
+// backend.Backend interface and allows management of state via
+// a state store implemented in the provider that's within the Pluggable.
 //
+// These are the assumptions about that
+// provider:
 // * The provider implements at least one state store.
-// * The provider has already been configured before using NewPluggable.
+// * The provider has already been fully configured before using NewPluggable.
 //
 // The state store could also be configured prior to using NewPluggable,
-// or it could be configured using the relevant backend.Backend methods.
+// but preferably it will be configured via the Pluggable,
+// using the relevant backend.Backend methods.
 //
 // By wrapping a configured provider in a Pluggable we allow calling code
 // to use the provider's gRPC methods when interacting with state.
-func NewPluggable(p providers.Interface, typeName string) (backend.Backend, error) {
+func NewPluggable(p providers.Interface, typeName string) (*Pluggable, error) {
 	if p == nil {
 		return nil, errors.New("Attempted to initialize pluggable state with a nil provider interface. This is a bug in Terraform and should be reported")
 	}
@@ -102,14 +108,47 @@ func (p *Pluggable) PrepareConfig(config cty.Value) (cty.Value, tfdiags.Diagnost
 //
 // Configure implements backend.Backend
 func (p *Pluggable) Configure(config cty.Value) tfdiags.Diagnostics {
+	var diags tfdiags.Diagnostics
 	req := providers.ConfigureStateStoreRequest{
 		TypeName: p.typeName,
 		Config:   config,
 		Capabilities: providers.StateStoreClientCapabilities{
-			ChunkSize: DefaultStateStoreChunkSize,
+			// The core binary will always request the default chunk size from the provider to start
+			ChunkSize: chunks.DefaultStateStoreChunkSize,
 		},
 	}
 	resp := p.provider.ConfigureStateStore(req)
+	diags = diags.Append(resp.Diagnostics)
+	if diags.HasErrors() {
+		return diags
+	}
+
+	// Validate the returned value from chunk size negotiation
+	chunkSize := resp.Capabilities.ChunkSize
+	if chunkSize == 0 || chunkSize > chunks.MaxStateStoreChunkSize {
+		diags = diags.Append(fmt.Errorf("Failed to negotiate acceptable chunk size. "+
+			"Expected size > 0 and <= %d bytes, provider wants %d bytes",
+			chunks.MaxStateStoreChunkSize, chunkSize,
+		))
+		return diags
+	}
+
+	// Negotiated chunk size is valid, so set it in the provider server
+	// that will use the value for future RPCs to read/write state.
+	if cs, ok := p.provider.(providers.StateStoreChunkSizeSetter); ok {
+		cs.SetStateStoreChunkSize(p.typeName, int(chunkSize))
+	} else {
+		// TODO: Remove
+		// I've put this here to try and fish for types of test setup that
+		// use other things that should implement SetStateStoreChunkSize but
+		// don't yet.
+		panic("provider does not implement providers.StateStoreChunkSizeSetter interface. This is a bug in Terraform and should be reported.")
+	}
+	log.Printf("[TRACE] Pluggable.Configure: negotiated a chunk size of %v when configuring state store %s",
+		chunkSize,
+		p.typeName,
+	)
+
 	return resp.Diagnostics
 }
 

internal/backend/pluggable/pluggable_test.go

@@ -417,12 +417,7 @@ func TestPluggable_ProviderSchema(t *testing.T) {
 			t.Fatalf("unexpected error: %s", err)
 		}
 
-		// Calling code will need to case to Pluggable after using NewPluggable,
-		// so we do something similar in this test
-		var providerSchema *configschema.Block
-		if pluggable, ok := p.(*Pluggable); ok {
-			providerSchema = pluggable.ProviderSchema()
-		}
+		providerSchema := p.ProviderSchema()
 
 		if !mock.GetProviderSchemaCalled {
 			t.Fatal("expected ProviderSchema to call the GetProviderSchema RPC")
@@ -450,12 +445,7 @@ func TestPluggable_ProviderSchema(t *testing.T) {
 			t.Fatalf("unexpected error: %s", err)
 		}
 
-		// Calling code will need to case to Pluggable after using NewPluggable,
-		// so we do something similar in this test
-		var providerSchema *configschema.Block
-		if pluggable, ok := p.(*Pluggable); ok {
-			providerSchema = pluggable.ProviderSchema()
-		}
+		providerSchema := p.ProviderSchema()
 
 		if !mock.GetProviderSchemaCalled {
 			t.Fatal("expected ProviderSchema to call the GetProviderSchema RPC")