Merge pull request #26518 from hashicorp/pselle/sensitive-experiment

Remove sensitive_variables experiment

command/testdata/variables/main.tf

@@ -1,7 +1,3 @@
-terraform {
-    experiments = [sensitive_variables]
-}
-
 variable "foo" {
     default = "bar"
 }

configs/experiments.go

@@ -138,17 +138,6 @@ func checkModuleExperiments(m *Module) hcl.Diagnostics {
 			}
 		}
 	*/
-	if !m.ActiveExperiments.Has(experiments.SensitiveVariables) {
-		for _, v := range m.Variables {
-			if v.Sensitive {
-				diags = diags.Append(&hcl.Diagnostic{
-					Severity: hcl.DiagError,
-					Summary:  "Variable sensitivity is experimental",
-					Detail:   "This feature is currently an opt-in experiment, subject to change in future releases based on feedback.\n\nActivate the feature for this module by adding sensitive_variables to the list of active experiments.",
-					Subject:  v.DeclRange.Ptr(),
-				})
-			}
-		}
-	}
+
 	return diags
 }

configs/module_merge_test.go

@@ -260,12 +260,9 @@ func TestModuleOverrideSensitiveVariable(t *testing.T) {
 		},
 	}
 
-	// TODO: When variable sensitivity is no longer experimental,
-	// move this test folder to "valid-modules" (it currently has a warning)
-	// and activate the diags assertion
-	mod, _ := testModuleFromDir("testdata/warning-modules/override-variable")
+	mod, diags := testModuleFromDir("testdata/valid-modules/override-variable-sensitive")
 
-	// assertNoDiagnostics(t, diags)
+	assertNoDiagnostics(t, diags)
 
 	if mod == nil {
 		t.Fatalf("module is nil")

configs/testdata/invalid-files/variable-bad-sensitive.tf

@@ -1,7 +1,3 @@
-terraform {
-  experiments = [sensitive_variables]
-}
-
 variable "sensitive-value" {
   sensitive = "123" # must be boolean
 }

configs/testdata/valid-files/variables.tf

@@ -22,3 +22,11 @@ variable "cheeze_pizza" {
 variable "π" {
   default = 3.14159265359
 }
+
+variable "sensitive_value" {
+  default = {
+    "a" = 1,
+    "b" = 2
+  }
+  sensitive = true
+}

configs/testdata/valid-files/variables.tf.json

@@ -16,6 +16,13 @@
     },
     "π": {
       "default": 3.14159265359
+    },
+    "sensitive_value": {
+      "default": {
+        "a": 1,
+        "b": 2
+      },
+      "sensitive": true
     }
   }
 }

configs/testdata/valid-modules/override-variable-sensitive/primary.tf

@@ -1,7 +1,3 @@
-terraform {
-  experiments = [sensitive_variables]
-}
-
 variable "false_true" {
   sensitive = false
 }

configs/testdata/warning-files/variables-sensitive.tf

@@ -1,7 +0,0 @@
-terraform {
-  experiments = [sensitive_variables] # WARNING: Experimental feature "sensitive_variables" is active
-}
-
-variable "sensitive-value" {
-  sensitive = true
-}

experiments/experiment.go

@@ -14,14 +14,12 @@ type Experiment string
 // identifier so that it can be specified in configuration.
 const (
 	VariableValidation = Experiment("variable_validation")
-	SensitiveVariables = Experiment("sensitive_variables")
 )
 
 func init() {
 	// Each experiment constant defined above must be registered here as either
 	// a current or a concluded experiment.
 	registerConcludedExperiment(VariableValidation, "Custom variable validation can now be used by default, without enabling an experiment.")
-	registerCurrentExperiment(SensitiveVariables)
 }
 
 // GetCurrent takes an experiment name and returns the experiment value

terraform/context_apply_test.go

@@ -11762,10 +11762,6 @@ resource "test_resource" "c" {
 func TestContext2Apply_variableSensitivity(t *testing.T) {
 	m := testModuleInline(t, map[string]string{
 		"main.tf": `
-terraform {
-	experiments = [sensitive_variables]
-}
-
 variable "sensitive_var" {
 	default = "foo"
 	sensitive = true
@@ -11850,10 +11846,6 @@ resource "test_resource" "foo" {
 func TestContext2Apply_variableSensitivityPropagation(t *testing.T) {
 	m := testModuleInline(t, map[string]string{
 		"main.tf": `
-terraform {
-	experiments = [sensitive_variables]
-}
-
 variable "sensitive_map" {
 	type = map(string)
 	default = {
@@ -11913,10 +11905,6 @@ resource "test_resource" "foo" {
 func TestContext2Apply_variableSensitivityChange(t *testing.T) {
 	m := testModuleInline(t, map[string]string{
 		"main.tf": `
-terraform {
-	experiments = [sensitive_variables]
-}
-
 variable "sensitive_var" {
 	default = "hello"
 	sensitive = true
@@ -11978,10 +11966,6 @@ resource "test_resource" "foo" {
 
 	m2 := testModuleInline(t, map[string]string{
 		"main.tf": `
-terraform {
-	experiments = [sensitive_variables]
-}
-
 variable "sensitive_var" {
 	default = "hello"
 	sensitive = false

terraform/testdata/plan-variable-sensitivity-module/main.tf

@@ -1,7 +1,3 @@
-terraform {
-  experiments = [sensitive_variables]
-}
-
 variable "sensitive_var" {
   default   = "foo"
   sensitive = true

terraform/testdata/plan-variable-sensitivity/main.tf

@@ -1,7 +1,3 @@
-terraform {
-    experiments = [sensitive_variables]
-}
-
 variable "sensitive_var" {
     default = "foo"
     sensitive = true