Leverage TypeConstraintWithDefaults when parsing default values

earlydecoder/decoder_test.go

@@ -7,6 +7,7 @@ import (
  "github.com/google/go-cmp/cmp"
  "github.com/hashicorp/go-version"
  "github.com/hashicorp/hcl/v2"
+ "github.com/hashicorp/hcl/v2/ext/typeexpr"
  "github.com/hashicorp/hcl/v2/hclsyntax"
  tfaddr "github.com/hashicorp/terraform-registry-address"
  "github.com/hashicorp/terraform-schema/backend"
@@ -811,6 +812,42 @@ variable "name" {
  },
  nil,
  },
+ {
+ "variables with optional type values",
+ `
+variable "name" {
+ type = object({
+ foo = optional(string, "food")
+ bar = optional(number)
+ })
+}`,
+ &module.Meta{
+ Path: path,
+ ProviderReferences: map[module.ProviderRef]tfaddr.Provider{},
+ ProviderRequirements: map[tfaddr.Provider]version.Constraints{},
+ Variables: map[string]module.Variable{
+ "name": {
+ Type: cty.Object(map[string]cty.Type{
+ "foo": cty.String,
+ "bar": cty.Number,
+ }),
+ TypeDefaults: &typeexpr.Defaults{
+ Type: cty.Object(map[string]cty.Type{
+ "foo": cty.String,
+ "bar": cty.Number,
+ }),
+ DefaultValues: map[string]cty.Value{
+ "foo": cty.StringVal("food"),
+ },
+ },
+ },
+ },
+ Outputs: map[string]module.Output{},
+ Filenames: []string{"test.tf"},
+ ModuleCalls: map[string]module.DeclaredModuleCall{},
+ },
+ nil,
+ },
  {
  "empty output",
  `

earlydecoder/load_module.go

@@ -214,8 +214,10 @@ func loadModuleFromFile(file *hcl.File, mod *decodedModule) hcl.Diagnostics {
  diags = append(diags, valDiags...)
  }
  varType := cty.DynamicPseudoType
+ var defaults *typeexpr.Defaults
  if attr, defined := content.Attributes["type"]; defined {
- varType, valDiags = typeexpr.TypeConstraint(attr.Expr)
+ // varType, valDiags = typeexpr.TypeConstraint(attr.Expr)
+ varType, defaults, valDiags = typeexpr.TypeConstraintWithDefaults(attr.Expr)
  diags = append(diags, valDiags...)
  }
  if attr, defined := content.Attributes["sensitive"]; defined {
@@ -239,6 +241,7 @@ func loadModuleFromFile(file *hcl.File, mod *decodedModule) hcl.Diagnostics {
  val = cty.DynamicVal
  }
  }
+
  defaultValue = val
  }
  }
@@ -247,6 +250,7 @@ func loadModuleFromFile(file *hcl.File, mod *decodedModule) hcl.Diagnostics {
  Description: description,
  IsSensitive: isSensitive,
  DefaultValue: defaultValue,
+ TypeDefaults: defaults,
  }
  case "output":
  content, _, contentDiags := block.Body.PartialContent(outputSchema)

module/variable.go

@@ -1,6 +1,7 @@
 package module
 
 import (
+ "github.com/hashicorp/hcl/v2/ext/typeexpr"
  "github.com/zclconf/go-cty/cty"
 )
 
@@ -15,4 +16,6 @@ type Variable struct {
  // DefaultValue represents default value if one is defined
  // and is decodable without errors, else cty.NilVal
  DefaultValue cty.Value
+
+ TypeDefaults *typeexpr.Defaults
 }