WIP/SQUASH - Fix test flackiness

Tests were randomly failing as golang was randomizing the maps

query/graphql/schema/generate.go

@@ -148,12 +148,13 @@ func (g *Generator) expandInputArgument(obj *gql.Object) error {
 		if _, ok := parser.ReservedFields[f]; ok && f != parser.GroupFieldName {
 			continue
 		}
+		typeKey := obj.Name() + f
 		switch t := def.Type.(type) {
 		case *gql.Object:
-			if _, complete := g.expandedTypes[obj.Name()]; complete {
+			if _, complete := g.expandedTypes[typeKey]; complete {
 				continue
 			} else {
-				g.expandedTypes[obj.Name()] = true
+				g.expandedTypes[typeKey] = true
 			}
 			// make sure all the sub fields are expanded first
 			if err := g.expandInputArgument(t); err != nil {
@@ -172,10 +173,10 @@ func (g *Generator) expandInputArgument(obj *gql.Object) error {
 			break
 		case *gql.List: // new field object with aguments (list)
 			listType := t.OfType
-			if _, complete := g.expandedTypes[obj.Name()]; complete {
+			if _, complete := g.expandedTypes[typeKey]; complete {
 				continue
 			} else {
-				g.expandedTypes[obj.Name()] = true
+				g.expandedTypes[typeKey] = true
 			}
 
 			if listObjType, ok := listType.(*gql.Object); ok {
@@ -496,8 +497,14 @@ func (g *Generator) genTypeFieldsEnum(obj *gql.Object) *gql.Enum {
 		Values: gql.EnumValueConfigMap{},
 	}
 
-	for i, field := range obj.Fields() {
-		enumFieldsCfg.Values[field.Name] = &gql.EnumValueConfig{Value: i}
+	for f, field := range obj.Fields() {
+		if _, ok := parser.ReservedFields[f]; ok && f != "_key" {
+			continue
+		}
+		if !gql.IsLeafType(field.Type) {
+			continue
+		}
+		enumFieldsCfg.Values[field.Name] = &gql.EnumValueConfig{Value: f}
 	}
 
 	return gql.NewEnum(enumFieldsCfg)