internal: Parse variable default values

hashicorp · Jun 16, 2021 · d576d8e · d576d8e
1 parent b88ef40
commit d576d8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/hashicorp/terraform-exec v0.13.3
 	github.com/hashicorp/terraform-json v0.11.0
 	github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896
-	github.com/hashicorp/terraform-schema v0.0.0-20210615134722-b66475e71618
+	github.com/hashicorp/terraform-schema v0.0.0-20210616110625-6bb1a1e93677
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5
 	github.com/mitchellh/cli v1.1.2

diff --git a/go.sum b/go.sum
@@ -203,8 +203,8 @@ github.com/hashicorp/terraform-json v0.11.0 h1:4zDqqW2F3kOysORIaYKFGgWDYIRA3hwqx
 github.com/hashicorp/terraform-json v0.11.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI=
 github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 h1:1FGtlkJw87UsTMg5s8jrekrHmUPUJaMcu6ELiVhQrNw=
 github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896/go.mod h1:bzBPnUIkI0RxauU8Dqo+2KrZZ28Cf48s8V6IHt3p4co=
-github.com/hashicorp/terraform-schema v0.0.0-20210615134722-b66475e71618 h1:BqSvtjfGhxnPaOiTiIokg6eJcjhT1hg/nmXU6XoKYFI=
-github.com/hashicorp/terraform-schema v0.0.0-20210615134722-b66475e71618/go.mod h1:ruV9Xx5LQYrZB0sNEx9dlkvS0Cp+juY/2jXQmup/67s=
+github.com/hashicorp/terraform-schema v0.0.0-20210616110625-6bb1a1e93677 h1:vewur2+vil349IVlkHx3+KZVx2oS53FmwnRXuWX0aQ4=
+github.com/hashicorp/terraform-schema v0.0.0-20210616110625-6bb1a1e93677/go.mod h1:ruV9Xx5LQYrZB0sNEx9dlkvS0Cp+juY/2jXQmup/67s=
 github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=
 github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
 github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=

diff --git a/internal/terraform/module/module_manager_test.go b/internal/terraform/module/module_manager_test.go
@@ -437,26 +437,30 @@ func TestSchemaForVariables(t *testing.T) {
 	}
 
 	mod.Meta.Variables = map[string]tfmodule.Variable{
-		"name": tfmodule.Variable{
+		"name": {
 			Description: "name of the module",
 			Type:        cty.String,
 		},
 	}
 	expectedSchema := &schema.BodySchema{Attributes: map[string]*schema.AttributeSchema{
-		"name": &schema.AttributeSchema{
+		"name": {
 			Description: lang.MarkupContent{
 				Value: "name of the module",
 				Kind:  lang.PlainTextKind,
 			},
-			Expr: schema.ExprConstraints{schema.LiteralTypeExpr{cty.String}},
+			IsRequired: true,
+			Expr:       schema.LiteralTypeOnly(cty.String),
 		},
 	}}
 
-	actualSchema, _ := mm.SchemaForVariables(path)
+	actualSchema, err := mm.SchemaForVariables(path)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	diff := cmp.Diff(expectedSchema, actualSchema, ctydebug.CmpOptions)
 	if diff != "" {
-		t.Fatalf("unexpected schema %s", diff)
+		t.Fatalf("unexpected schema: %s", diff)
 	}
 }