Skip inferring module inputs from default values

hashicorp · Nov 1, 2023 · 492821f · 492821f
1 parent 8c97616
commit 492821f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/internal/schema/0.12/variable_block.go b/internal/schema/0.12/variable_block.go
@@ -23,8 +23,7 @@ func variableBlockSchema(v *version.Version) *schema.BlockSchema {
 			ScopeId:      refscope.VariableScope,
 			AsReference:  true,
 			AsTypeOf: &schema.BlockAsTypeOf{
-				AttributeExpr:  "type",
-				AttributeValue: "default",
+				AttributeExpr: "type",
 			},
 		},
 		SemanticTokenModifiers: lang.SemanticTokenModifiers{tokmod.Variable},

diff --git a/internal/schema/0.14/variable_block.go b/internal/schema/0.14/variable_block.go
@@ -23,8 +23,7 @@ func variableBlockSchema() *schema.BlockSchema {
 			ScopeId:      refscope.VariableScope,
 			AsReference:  true,
 			AsTypeOf: &schema.BlockAsTypeOf{
-				AttributeExpr:  "type",
-				AttributeValue: "default",
+				AttributeExpr: "type",
 			},
 		},
 		SemanticTokenModifiers: lang.SemanticTokenModifiers{tokmod.Variable},

diff --git a/schema/module_schema.go b/schema/module_schema.go
@@ -112,7 +112,7 @@ func schemaForDependentModuleBlock(module module.InstalledModuleCall, modMeta *m
 
 	for name, modVar := range modMeta.Variables {
 		aSchema := moduleVarToAttribute(modVar)
-		varType := typeOfModuleVar(modVar)
+		varType := modVar.Type
 		aSchema.Constraint = convertAttributeTypeToConstraint(varType)
 		aSchema.OriginForTarget = &schema.PathTarget{
 			Address: schema.Address{

diff --git a/schema/variable_schema.go b/schema/variable_schema.go
@@ -16,7 +16,7 @@ func SchemaForVariables(vars map[string]module.Variable, modPath string) (*schem
 
 	for name, modVar := range vars {
 		aSchema := moduleVarToAttribute(modVar)
-		varType := typeOfModuleVar(modVar)
+		varType := modVar.Type
 		aSchema.Constraint = schema.LiteralType{Type: varType}
 		aSchema.OriginForTarget = &schema.PathTarget{
 			Address: schema.Address{
@@ -60,14 +60,3 @@ func moduleVarToAttribute(modVar module.Variable) *schema.AttributeSchema {
 
 	return aSchema
 }
-
-func typeOfModuleVar(modVar module.Variable) cty.Type {
-	if (modVar.Type == cty.DynamicPseudoType || modVar.Type == cty.NilType) &&
-		modVar.DefaultValue != cty.NilVal {
-		// infer type from default value if one is not specified
-		// or when it's "any"
-		return modVar.DefaultValue.Type()
-	}
-
-	return modVar.Type
-}