From 60e03d42c99ed5d8e9220a8eb4151ab4f0309dbd Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 16 Dec 2017 01:25:37 -0700 Subject: [PATCH] Fix schema pruning --- store/schema/schema_store.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/store/schema/schema_store.go b/store/schema/schema_store.go index 71f611a9..58cbc99c 100644 --- a/store/schema/schema_store.go +++ b/store/schema/schema_store.go @@ -72,15 +72,11 @@ func addSchema(schema *types.Schema, schemaMap map[string]*types.Schema, schemas func traverseAndAdd(schema *types.Schema, schemaMap map[string]*types.Schema, schemas []*types.Schema, included map[string]bool) []*types.Schema { for _, field := range schema.ResourceFields { - t := field.Type - if definition.HasReferenceType(t) { - for !definition.IsReferenceType(t) { - newT := definition.SubType(t) - if newT == t { - break - } - t = newT - } + t := "" + subType := field.Type + for subType != t { + t = subType + subType = definition.SubType(t) } if refSchema, ok := schemaMap[t]; ok && !included[t] {