Use any for module inputs that have no type

hashicorp · Nov 2, 2023 · c7efbd7 · c7efbd7
1 parent 494069b
commit c7efbd7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/schema/module_schema.go b/schema/module_schema.go
@@ -31,11 +31,9 @@ func schemaForDeclaredDependentModuleBlock(module module.DeclaredModuleCall, mod
 		}
 
 		typ := input.Type
-		defaultType := input.Default.Type()
-		if typ == cty.DynamicPseudoType && (defaultType != cty.DynamicPseudoType && defaultType != cty.NilType) {
-			typ = defaultType
+		if typ == cty.NilType {
+			typ = cty.DynamicPseudoType
 		}
-
 		aSchema.Constraint = convertAttributeTypeToConstraint(typ)
 
 		attributes[input.Name] = aSchema
@@ -111,8 +109,11 @@ func schemaForDependentModuleBlock(module module.InstalledModuleCall, modMeta *m
 	attributes := make(map[string]*schema.AttributeSchema, 0)
 
 	for name, modVar := range modMeta.Variables {
-		aSchema := moduleVarToAttribute(modVar)
 		varType := modVar.Type
+		if varType == cty.NilType {
+			varType = cty.DynamicPseudoType
+		}
+		aSchema := moduleVarToAttribute(modVar)
 		aSchema.Constraint = convertAttributeTypeToConstraint(varType)
 		aSchema.OriginForTarget = &schema.PathTarget{
 			Address: schema.Address{

diff --git a/schema/module_schema_test.go b/schema/module_schema_test.go
@@ -104,7 +104,7 @@ func TestSchemaForDependentModuleBlock_basic(t *testing.T) {
 				},
 			},
 			"another_var": {
-				Constraint: schema.AnyExpression{OfType: cty.String},
+				Constraint: schema.AnyExpression{OfType: cty.DynamicPseudoType},
 				IsOptional: true,
 				OriginForTarget: &schema.PathTarget{
 					Address: schema.Address{
@@ -117,7 +117,7 @@ func TestSchemaForDependentModuleBlock_basic(t *testing.T) {
 					},
 					Constraints: schema.Constraints{
 						ScopeId: "variable",
-						Type:    cty.String,
+						Type:    cty.DynamicPseudoType,
 					},
 				},
 			},
@@ -512,7 +512,7 @@ func TestSchemaForDeclaredDependentModuleBlock_basic(t *testing.T) {
 				IsRequired:  true,
 			},
 			"foo_var": {
-				Constraint: schema.AnyExpression{OfType: cty.Number},
+				Constraint: schema.AnyExpression{OfType: cty.DynamicPseudoType},
 				IsOptional: true,
 			},
 			"another_var": {