lang: stabilise templatestring func experiment

hashicorp · May 22, 2024 · b78c593 · b78c593
1 parent c61201d
commit b78c593
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/internal/experiments/experiment.go b/internal/experiments/experiment.go
@@ -33,7 +33,7 @@ func init() {
 	registerConcludedExperiment(VariableValidation, "Custom variable validation can now be used by default, without enabling an experiment.")
 	registerCurrentExperiment(VariableValidationCrossRef)
 	registerConcludedExperiment(SuppressProviderSensitiveAttrs, "Provider-defined sensitive attributes are now redacted by default, without enabling an experiment.")
-	registerCurrentExperiment(TemplateStringFunc)
+	registerConcludedExperiment(TemplateStringFunc, "The templatestring function can now be used without enabling an experiment.")
 	registerConcludedExperiment(ConfigDrivenMove, "Declarations of moved resource instances using \"moved\" blocks can now be used by default, without enabling an experiment.")
 	registerConcludedExperiment(PreconditionsPostconditions, "Condition blocks can now be used by default, without enabling an experiment.")
 	registerConcludedExperiment(ModuleVariableOptionalAttrs, "The final feature corresponding to this experiment differs from the experimental form and is available in the Terraform language from Terraform v1.3.0 onwards.")

diff --git a/internal/lang/functions.go b/internal/lang/functions.go
@@ -190,9 +190,7 @@ func (s *Scope) Functions() map[string]function.Function {
 			return s.funcs, filesystemFunctions, templateFunctions
 		}
 		coreFuncs["templatefile"] = funcs.MakeTemplateFileFunc(s.BaseDir, funcsFunc)
-		if s.activeExperiments.Has(experiments.TemplateStringFunc) {
-			coreFuncs["templatestring"] = funcs.MakeTemplateStringFunc(funcsFunc)
-		}
+		coreFuncs["templatestring"] = funcs.MakeTemplateStringFunc(funcsFunc)
 
 		if s.ConsoleMode {
 			// The type function is only available in terraform console.