fix: Allow detection of experiments in config early in init, but re-parse the root module after it might have been impacted by use of the -from-module flag (parsing may yield something different the second time!). Diagnostics still need to be passed though.

Author: SarahFrench

internal/command/init.go

@@ -74,9 +74,9 @@ func (c *InitCommand) Run(args []string) int {
 	//  > The terraform block in the configuration lists the `pluggable_state_stores` experiment.
 	if c.Meta.AllowExperimentalFeatures && rootMod.ActiveExperiments.Has(experiments.PluggableStateStores) {
 		// TODO(SarahFrench/radeksimko): Remove forked init logic once feature is no longer experimental
-		return c.runPssInit(initArgs, view, rootMod, rootModDiags)
+		return c.runPssInit(initArgs, view, rootModDiags)
 	} else {
-		return c.run(initArgs, view, rootMod, rootModDiags)
+		return c.run(initArgs, view, rootModDiags)
 	}
 }
 

internal/command/init_run.go

@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-func (c *InitCommand) run(initArgs *arguments.Init, view views.Init, rootModEarly *configs.Module, earlyConfDiags tfdiags.Diagnostics) int {
+func (c *InitCommand) run(initArgs *arguments.Init, view views.Init, earlyConfDiags tfdiags.Diagnostics) int {
 	var diags tfdiags.Diagnostics
 
 	c.forceInitCopy = initArgs.ForceInitCopy
@@ -130,14 +130,13 @@ func (c *InitCommand) run(initArgs *arguments.Init, view views.Init, rootModEarl
 		return 0
 	}
 
-	// If the passed root module is nil, attempt to parse it.
-	// At this point we load just the root module to begin backend and module initialization
+	// We parse the root module here because it may have been affected by use of init's -from-module flag.
+	// However we need to use diagnostics passed in from calling code due to detection of experiments in the config.
+	// See calling code for more context.
 	//
-	// TODO(SarahFrench/radeksimko): Once PSS's experiment is over, remove use of arguments and
-	// restore parsing of config to always happen here in this code instead of calling code.
-	if rootModEarly == nil {
-		rootModEarly, earlyConfDiags = c.loadSingleModuleWithTests(path, initArgs.TestsDirectory)
-	}
+	// TODO(SarahFrench/radeksimko): Once PSS's experiment is over, remove use of earlyConfDiags argument and
+	// restore parsing of config to only happen here in this code instead of calling code.
+	rootModEarly, _ := c.loadSingleModuleWithTests(path, initArgs.TestsDirectory)
 
 	// There may be parsing errors in config loading but these will be shown later _after_
 	// checking for core version requirement errors. Not meeting the version requirement should

internal/command/init_run_experiment.go

@@ -31,7 +31,7 @@ import (
 // `runPssInit` is an altered version of the logic in `run` that contains changes
 // related to the PSS project. This is used by the (InitCommand.Run method only if Terraform has
 // experimental features enabled.
-func (c *InitCommand) runPssInit(initArgs *arguments.Init, view views.Init, rootModEarly *configs.Module, earlyConfDiags tfdiags.Diagnostics) int {
+func (c *InitCommand) runPssInit(initArgs *arguments.Init, view views.Init, earlyConfDiags tfdiags.Diagnostics) int {
 	var diags tfdiags.Diagnostics
 
 	c.forceInitCopy = initArgs.ForceInitCopy
@@ -138,14 +138,13 @@ func (c *InitCommand) runPssInit(initArgs *arguments.Init, view views.Init, root
 		return 0
 	}
 
-	// If the passed root module is nil, attempt to parse it.
-	// At this point we load just the root module to begin backend and module initialization
+	// We parse the root module here because it may have been affected by use of init's -from-module flag.
+	// However we need to use diagnostics passed in from calling code due to detection of experiments in the config.
+	// See calling code for more context.
 	//
-	// TODO(SarahFrench/radeksimko): Once PSS's experiment is over, remove use of arguments and
-	// restore parsing of config to always happen here in this code instead of calling code.
-	if rootModEarly == nil {
-		rootModEarly, earlyConfDiags = c.loadSingleModuleWithTests(path, initArgs.TestsDirectory)
-	}
+	// TODO(SarahFrench/radeksimko): Once PSS's experiment is over, remove use of earlyConfDiags argument and
+	// restore parsing of config to only happen here in this code instead of calling code.
+	rootModEarly, _ := c.loadSingleModuleWithTests(path, initArgs.TestsDirectory)
 
 	// There may be parsing errors in config loading but these will be shown later _after_
 	// checking for core version requirement errors. Not meeting the version requirement should