Merge pull request #10658 from hashicorp/b-var-keys

config: validate invalid variable keys

config/loader_hcl.go

@@ -410,14 +410,12 @@ func loadVariablesHcl(list *ast.ObjectList) ([]*Variable, error) {
 				item.Pos(), NameRegexp)
 		}
 
-		/*
+		// Check for invalid keys
-			// TODO: catch extra fields
+		valid := []string{"type", "default", "description"}
-			// Decode into raw map[string]interface{} so we know ALL fields
+		if err := checkHCLKeys(item.Val, valid); err != nil {
-			var config map[string]interface{}
+			return nil, multierror.Prefix(err, fmt.Sprintf(
-			if err := hcl.DecodeObject(&config, item.Val); err != nil {
+				"variable[%s]:", n))
-				return nil, err
+		}
-			}
-		*/
 
 		// Decode into hclVariable to get typed values
 		var hclVar hclVariable

config/loader_test.go

@@ -67,6 +67,13 @@ func TestLoadFile_lifecycleKeyCheck(t *testing.T) {
 	t.Logf("err: %s", err)
 }
 
+func TestLoadFile_varInvalidKey(t *testing.T) {
+	_, err := LoadFile(filepath.Join(fixtureDir, "var-invalid-key.tf"))
+	if err == nil {
+		t.Fatal("should have error")
+	}
+}
+
 func TestLoadFile_resourceArityMistake(t *testing.T) {
 	_, err := LoadFile(filepath.Join(fixtureDir, "resource-arity-mistake.tf"))
 	if err == nil {

config/test-fixtures/var-invalid-key.tf

@@ -0,0 +1,3 @@
+variable "a" {
+  a = "b"
+}