From 375633895ce80c2824fcbc24ee7114da87621ad5 Mon Sep 17 00:00:00 2001 From: Daniel Banck Date: Tue, 29 Nov 2022 16:32:07 +0100 Subject: [PATCH] Only check block length if there is no dependent body --- decoder/decoder.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/decoder/decoder.go b/decoder/decoder.go index 9665330c..6366b1e0 100644 --- a/decoder/decoder.go +++ b/decoder/decoder.go @@ -50,10 +50,6 @@ func mergeBlockBodySchemas(block *hcl.Block, blockSchema *schema.BlockSchema) (* mergedSchema.ImpliedOrigins = make([]schema.ImpliedOrigin, 0) } - if mergedSchema.Extensions != nil && mergedSchema.Extensions.DynamicBlocks && len(mergedSchema.Blocks) > 0 { - mergedSchema.Blocks["dynamic"] = buildDynamicBlockSchema(mergedSchema) - } - depSchema, _, ok := NewBlockSchema(blockSchema).DependentBodySchema(block) if ok { for name, attr := range depSchema.Attributes { @@ -97,6 +93,10 @@ func mergeBlockBodySchemas(block *hcl.Block, blockSchema *schema.BlockSchema) (* if depSchema.Extensions != nil { mergedSchema.Extensions = depSchema.Extensions.Copy() } + } else { + if mergedSchema.Extensions != nil && mergedSchema.Extensions.DynamicBlocks && len(mergedSchema.Blocks) > 0 { + mergedSchema.Blocks["dynamic"] = buildDynamicBlockSchema(mergedSchema) + } } return mergedSchema, nil