decoder: Support AnyAttribute in Validate (#296)

hashicorp · Aug 8, 2023 · 01ef96c · 01ef96c
1 parent 42d4eba
commit 01ef96c
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 9 deletions.
diff --git a/decoder/validate.go b/decoder/validate.go
@@ -62,15 +62,18 @@ func (d *PathDecoder) validateBody(ctx context.Context, body *hclsyntax.Body, bo
 	for name, attribute := range body.Attributes {
 		attributeSchema, ok := bodySchema.Attributes[name]
 		if !ok {
-			// ---------- diag ERR unknown attribute
-			diags = append(diags, &hcl.Diagnostic{
-				Severity: hcl.DiagError,
-				Summary:  "Unexpected attribute",
-				Detail:   fmt.Sprintf("An attribute named %q is not expected here", name),
-				Subject:  attribute.SrcRange.Ptr(),
-			})
-			// don't check futher because this isn't a valid attribute
-			continue
+			if bodySchema.AnyAttribute == nil {
+				// ---------- diag ERR unknown attribute
+				diags = append(diags, &hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Unexpected attribute",
+					Detail:   fmt.Sprintf("An attribute named %q is not expected here", name),
+					Subject:  attribute.SrcRange.Ptr(),
+				})
+				// don't check futher because this isn't a valid attribute
+				continue
+			}
+			attributeSchema = bodySchema.AnyAttribute
 		}
 
 		// ---------- diag WARN deprecated attribute

diff --git a/decoder/validate_test.go b/decoder/validate_test.go
@@ -606,6 +606,60 @@ wakka = 2
 				"test.tf": {},
 			},
 		},
+		{
+			"any attribute",
+			&schema.BodySchema{
+				Blocks: map[string]*schema.BlockSchema{
+					"foo": {
+						Body: &schema.BodySchema{
+							AnyAttribute: &schema.AttributeSchema{
+								Constraint: schema.LiteralType{Type: cty.Number},
+								IsOptional: true,
+							},
+						},
+					},
+				},
+			},
+			`foo {
+				test = 1
+			}`,
+			map[string]hcl.Diagnostics{
+				"test.tf": {},
+			},
+		},
+		{
+			"deprecated any attribute",
+			&schema.BodySchema{
+				Blocks: map[string]*schema.BlockSchema{
+					"foo": {
+						Body: &schema.BodySchema{
+							AnyAttribute: &schema.AttributeSchema{
+								Constraint:   schema.LiteralType{Type: cty.Number},
+								IsOptional:   true,
+								IsDeprecated: true,
+							},
+						},
+					},
+				},
+			},
+			`foo {
+				test = 1
+			}`,
+			map[string]hcl.Diagnostics{
+				"test.tf": {
+					{
+						Severity: hcl.DiagWarning,
+						Summary:  `"test" is deprecated`,
+						Detail:   `Reason: ""`,
+						Subject: &hcl.Range{
+							Filename: "test.tf",
+							Start:    hcl.Pos{Line: 2, Column: 5, Byte: 10},
+							End:      hcl.Pos{Line: 2, Column: 13, Byte: 18},
+						},
+					},
+				},
+			},
+		},
 	}
 
 	for i, tc := range testCases {