Added support for flattening remain tags.

gohcl/decode.go

@@ -279,8 +279,20 @@ func decodeBlockToValue(block *hcl.Block, ctx *hcl.EvalContext, v reflect.Value)
  if len(block.Labels) > 0 {
  blockTags := getFieldTags(ty)
  for li, lv := range block.Labels {
- lfieldIdx := blockTags.Labels[li].FieldIndex
- v.Field(lfieldIdx).Set(reflect.ValueOf(lv))
+ // Fill in the labels from the block itself and then fill in labels located in embedded structs
+ if li < len(blockTags.Labels) {
+ lfieldIdx := blockTags.Labels[li].FieldIndex
+ v.Field(lfieldIdx).Set(reflect.ValueOf(lv))
+ } else {
+ labelIdx := li - len(blockTags.Labels)
+ remainIdx := *blockTags.Remain
+ remain := v.Type().Field(remainIdx)
+ remainV := v.Field(remainIdx)
+ remainTags := getFieldTags(remain.Type)
+ lfieldIdx := remainTags.Labels[labelIdx].FieldIndex
+ value := reflect.ValueOf(lv)
+ remainV.Field(lfieldIdx).Set(value)
+ }
  }
  }
 

gohcl/schema.go

@@ -87,10 +87,19 @@ func ImpliedBodySchema(val interface{}) (schema *hcl.BodySchema, partial bool) {
  }
  ftags := getFieldTags(fty)
  var labelNames []string
- if len(ftags.Labels) > 0 {
- labelNames = make([]string, len(ftags.Labels))
- for i, l := range ftags.Labels {
- labelNames[i] = l.Name
+ for _, l := range ftags.Labels {
+ labelNames = append(labelNames, l.Name)
+ }
+
+ // If there are labels in an embedded struct, add them as well
+ if ftags.Remain != nil {
+ remainIdx := *ftags.Remain
+ remain := fty.Field(remainIdx)
+ if remain.Type.Kind() == reflect.Struct {
+ remainTags := getFieldTags(remain.Type)
+ for _, l := range remainTags.Labels {
+ labelNames = append(labelNames, l.Name)
+ }
  }
  }