Change how we make PSS experimental - avoid relying on a package level variable that causes tests to interact.

Author: SarahFrench

internal/command/init_run.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform/internal/backend"
 	"github.com/hashicorp/terraform/internal/cloud"
 	"github.com/hashicorp/terraform/internal/command/arguments"
@@ -141,6 +142,22 @@ func (c *InitCommand) run(initArgs *arguments.Init, view views.Init) int {
 
 		return 1
 	}
+	if !c.Meta.AllowExperimentalFeatures && rootModEarly.StateStore != nil {
+		// TODO(SarahFrench/radeksimko) - remove when this feature isn't experimental.
+		// This approach for making the feature experimental is required
+		// to let us assert the feature is gated behind an experiment in tests.
+		// See https://github.com/hashicorp/terraform/pull/37350#issuecomment-3168555619
+		diags = diags.Append(earlyConfDiags)
+		diags = diags.Append(&hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  "Unsupported block type",
+			Detail:   "Blocks of type \"state_store\" are not expected here.",
+			Subject:  &rootModEarly.StateStore.TypeRange,
+		})
+		view.Diagnostics(diags)
+
+		return 1
+	}
 
 	var back backend.Backend
 

internal/configs/parser_config.go

@@ -104,14 +104,6 @@ func parseConfigFile(body hcl.Body, diags hcl.Diagnostics, override, allowExperi
 		switch block.Type {
 
 		case "terraform":
-			// TODO: Update once pluggable state store is out of experimental phase
-			if allowExperiments {
-				terraformBlockSchema.Blocks = append(terraformBlockSchema.Blocks,
-					hcl.BlockHeaderSchema{
-						Type:       "state_store",
-						LabelNames: []string{"type"},
-					})
-			}
 			content, contentDiags := block.Body.Content(terraformBlockSchema)
 			diags = append(diags, contentDiags...)
 
@@ -394,9 +386,10 @@ var terraformBlockSchema = &hcl.BodySchema{
 		{
 			Type: "required_providers",
 		},
-		// NOTE: An entry for state_store is not present here
-		// because we conditionally add it in the calling code
-		// depending on whether experiments are enabled or not.
+		{
+			Type:       "state_store",
+			LabelNames: []string{"type"},
+		},
 		{
 			Type:       "provider_meta",
 			LabelNames: []string{"provider"},