Allow spec fields from other operations

Author: Nicholas Thomson

pkg/model/crd.go

@@ -143,6 +143,11 @@ func (r *CRD) HasShapeAsMember(toFind string) bool {
 			}
 		}
 	}
+	for _, field := range r.SpecFields {
+		if shapeHasMember(field.ShapeRef.Shape, toFind) {
+			return true
+		}
+	}
 	return false
 }
 
@@ -236,6 +241,17 @@ func (r *CRD) SpecFieldNames() []string {
 	return res
 }
 
+// SpecFieldShapeNames returns a sorted slice of shape names for each of the
+// Spec fields
+func (r *CRD) SpecFieldShapeNames() []string {
+	res := make([]string, 0, len(r.SpecFields))
+	for _, field := range r.SpecFields {
+		res = append(res, field.ShapeRef.ShapeName)
+	}
+	sort.Strings(res)
+	return res
+}
+
 // UnpacksAttributesMap returns true if the underlying API has
 // Get{Resource}Attributes/Set{Resource}Attributes API calls that map real,
 // schema'd fields to a raw `map[string]*string` for this resource (see SNS and

pkg/model/model.go

@@ -279,6 +279,18 @@ func (m *Model) IsShapeUsedInCRDs(shapeName string) bool {
 	return false
 }
 
+// IsShapeInSpec returns true if the supplied shape name is directly used as a 
+// field in the CRD's spec
+func (m *Model) IsShapeInSpec(shapeName string) bool {
+	crds, _ := m.GetCRDs()
+	for _, crd := range crds {
+		if util.InStrings(shapeName, crd.SpecFieldShapeNames()) {
+			return true
+		}
+	}
+	return false
+}
+
 // GetTypeDefs returns a slice of `TypeDef` pointers
 func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 	if m.typeDefs != nil {
@@ -310,17 +322,20 @@ func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 			trenames[shapeName] = tdefNames.Camel
 		}
 
+		// Shape is used directly in the spec
+		baseUsed := m.IsShapeInSpec(shapeName)
+
 		attrs := map[string]*Attr{}
 		for memberName, memberRef := range shape.MemberRefs {
 			memberNames := names.New(memberName)
 			memberShape := memberRef.Shape
-			if !m.IsShapeUsedInCRDs(memberShape.ShapeName) {
+			if !baseUsed && !m.IsShapeUsedInCRDs(memberShape.ShapeName) {
 				continue
 			}
 			gt := m.getShapeCleanGoType(memberShape)
 			attrs[memberName] = NewAttr(memberNames, gt, memberShape)
 		}
-		if len(attrs) == 0 {
+		if !baseUsed && len(attrs) == 0 {
 			// Just ignore these...
 			continue
 		}