fixed list_of issues

Author: rushmash91

go.mod

@@ -27,9 +27,6 @@ require (
 require (
 	github.com/kro-run/kro v0.2.2
 	k8s.io/apiextensions-apiserver v0.31.0
-)
-
-require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect

pkg/config/config.go

@@ -58,17 +58,17 @@ type Config struct {
 	// The outer map is keyed by shape name (e.g., "ReplicaStatus"), and the inner map
 	// is keyed by field name with string values representing field types.
 	//
-	// These shapes can be referenced in a resource's fields section using:
-	//   custom_field:
-	//     list_of: ShapeName    # For arrays of the shape
-	//     map_of: ShapeName     # For maps with the shape as values
-	//
 	// Example:
 	//   custom_shapes:
 	//     ReplicaStatus:
 	//       Status: string
 	//       Region: string
 	//       Description: string
+	// These shapes can be referenced in a resource's fields section using:
+	//   custom_field:
+	//     list_of: ShapeName    # For arrays of the shape
+	//     map_of: ShapeName     # For maps with the shape as values
+	//
 	CustomShapes map[string]map[string]string `json:"custom_shapes,omitempty"`
 }
 

pkg/model/model.go

@@ -412,14 +412,12 @@ func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 	if m.typeDefs != nil {
 		return m.typeDefs, nil
 	}
-
 	tdefs := []*TypeDef{}
 	// Map, keyed by original Shape GoTypeElem(), with the values being a
 	// renamed type name (due to conflicting names)
 	trenames := map[string]string{}
 
 	payloads := m.SDKAPI.GetPayloads()
-
 	for shapeName, shape := range m.SDKAPI.API.Shapes {
 		if util.InStrings(shapeName, payloads) && !m.IsShapeUsedInCRDs(shapeName) {
 			// Payloads are not type defs, unless explicitly used
@@ -462,14 +460,6 @@ func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 		return tdefs[i].Names.Camel < tdefs[j].Names.Camel
 	})
 	m.processNestedFieldTypeDefs(tdefs)
-
-	// Add custom type definitions for custom shapes
-	var err error
-	tdefs, err = m.AddCustomTypeDefinitions(tdefs)
-	if err != nil {
-		return nil, fmt.Errorf("error adding custom type definitions: %w", err)
-	}
-
 	m.typeDefs = tdefs
 	m.typeRenames = trenames
 	return tdefs, nil
@@ -1046,50 +1036,4 @@ func New(
 	}
 	m.ApplyShapeIgnoreRules()
 	return m, nil
-}
-
-// AddCustomTypeDefinitions adds type definitions for custom shapes to the typeDefs slice
-// It checks if a type def for the shape already exists and skips adding it if so.
-// It also checks if the shape is a structure and only adds type defs for structure types.
-func (m *Model) AddCustomTypeDefinitions(tdefs []*TypeDef) ([]*TypeDef, error) {
-	for _, customShape := range m.SDKAPI.CustomShapes {
-		shape := customShape.Shape
-		if shape.Type != "structure" {
-			continue
-		}
-
-		// Skip if we already have a type def for this shape
-		shapeExists := false
-		for _, tdef := range tdefs {
-			if tdef.Shape.ShapeName == shape.ShapeName {
-				shapeExists = true
-				break
-			}
-		}
-		if shapeExists {
-			continue
-		}
-
-		// Create a new TypeDef for this custom shape
-		tdefNames := names.New(shape.ShapeName)
-		attrs := map[string]*Attr{}
-		for memberName, memberRef := range shape.MemberRefs {
-			memberNames := names.New(memberName)
-			memberShape := memberRef.Shape
-			if memberShape == nil {
-				return nil, fmt.Errorf("nil member shape for %s.%s", shape.ShapeName, memberName)
-			}
-
-			gt := m.getShapeCleanGoType(memberShape)
-			attrs[memberName] = NewAttr(memberNames, gt, memberShape)
-		}
-		if len(attrs) > 0 {
-			tdefs = append(tdefs, &TypeDef{
-				Shape: shape,
-				Names: tdefNames,
-				Attrs: attrs,
-			})
-		}
-	}
-	return tdefs, nil
 }

pkg/sdk/custom_shapes.go

@@ -41,6 +41,10 @@ type customShapeInjector struct {
 // into the list of shapes in the API and update the list of custom shapes in
 // the SDKAPI object.
 func (h *Helper) InjectCustomShapes(sdkapi *ackmodel.SDKAPI) error {
+	err := h.InjectSimpleSchemaShapes(sdkapi)
+	if err != nil {
+		return err
+	}
 	injector := customShapeInjector{sdkapi}
 
 	for _, memberShape := range h.cfg.GetCustomMapFieldMembers() {
@@ -52,7 +56,6 @@ func (h *Helper) InjectCustomShapes(sdkapi *ackmodel.SDKAPI) error {
 		sdkapi.API.Shapes[customShape.Shape.ShapeName] = customShape.Shape
 		sdkapi.CustomShapes = append(sdkapi.CustomShapes, customShape)
 	}
-
 	for _, memberShape := range h.cfg.GetCustomListFieldMembers() {
 		customShape, err := injector.newList(memberShape)
 		if err != nil {
@@ -62,7 +65,6 @@ func (h *Helper) InjectCustomShapes(sdkapi *ackmodel.SDKAPI) error {
 		sdkapi.API.Shapes[customShape.Shape.ShapeName] = customShape.Shape
 		sdkapi.CustomShapes = append(sdkapi.CustomShapes, customShape)
 	}
-
 	return nil
 }
 

pkg/sdk/helper.go

@@ -110,9 +110,10 @@ func (h *Helper) API(serviceModelName string) (*model.SDKAPI, error) {
 		_ = api.ServicePackageDoc()
 		sdkapi := model.NewSDKAPI(api, h.APIGroupSuffix)
 
-		h.InjectCustomShapes(sdkapi)
-		h.InjectSimpleSchemaShapes(sdkapi)
-
+		err := h.InjectCustomShapes(sdkapi)
+		if err != nil {
+			return nil, err
+		}
 		return sdkapi, nil
 	}
 	return nil, ErrServiceNotFound

pkg/sdk/simpleschema.go

@@ -30,9 +30,15 @@ func (h *Helper) InjectSimpleSchemaShapes(sdkapi *ackmodel.SDKAPI) error {
 		return nil
 	}
 
+	apiShapeNames := sdkapi.API.ShapeNames()
 	for shapeName, fieldsMap := range h.cfg.CustomShapes {
-		schemaObj := convertFieldsMapToSchemaObj(fieldsMap)
-
+		// check dublicates
+		for _, as := range apiShapeNames {
+			if as == shapeName {
+				return fmt.Errorf("shapeName %s already exists in the API", shapeName)
+			}
+		}
+		schemaObj := convertMapValues(fieldsMap)
 		openAPISchema, err := simpleschema.ToOpenAPISpec(schemaObj)
 		if err != nil {
 			return err
@@ -47,16 +53,13 @@ func (h *Helper) InjectSimpleSchemaShapes(sdkapi *ackmodel.SDKAPI) error {
 			MemberShapeName: nil,
 			ValueShapeName:  nil,
 		})
-
-		// Create and register the list shape for this custom shape
-		h.createAndRegisterListShape(sdkapi, shapeName, shapeRef)
 	}
 
 	return nil
 }
 
 // convertFieldsMapToSchemaObj converts a fields map to a schema object for OpenAPI spec generation
-func convertFieldsMapToSchemaObj(fieldsMap map[string]string) map[string]interface{} {
+func convertMapValues(fieldsMap map[string]string) map[string]interface{} {
 	schemaObj := make(map[string]interface{})
 	for fieldName, fieldType := range fieldsMap {
 		schemaObj[fieldName] = fieldType
@@ -70,6 +73,7 @@ func (h *Helper) createBaseShape(
 	shapeName string,
 	openAPISchema *apiextv1.JSONSchemaProps,
 ) (*awssdkmodel.Shape, *awssdkmodel.ShapeRef) {
+	injector := customShapeInjector{sdkapi}
 	shape := &awssdkmodel.Shape{
 		API:           sdkapi.API,
 		ShapeName:     shapeName,
@@ -85,66 +89,27 @@ func (h *Helper) createBaseShape(
 			panic(fmt.Sprintf("Field %s in shape %s has non-string type '%s'",
 				fieldName, shapeName, propType))
 		}
-		addFieldToShape(sdkapi, shape, fieldName, shapeName)
-	}
-
-	shapeRef := &awssdkmodel.ShapeRef{
-		API:           sdkapi.API,
-		Shape:         shape,
-		ShapeName:     shape.ShapeName,
-		Documentation: fmt.Sprintf("// Reference to %s", shapeName),
+		addStringFieldToShape(sdkapi, shape, fieldName, shapeName)
 	}
 
+	shapeRef := injector.createShapeRefForMember(shape)
 	return shape, shapeRef
 }
 
-// addFieldToShape adds a field to the parent shape
-func addFieldToShape(
+// addStringFieldToShape adds a string field to the parent shape
+func addStringFieldToShape(
 	sdkapi *ackmodel.SDKAPI,
 	parentShape *awssdkmodel.Shape,
 	fieldName string,
 	shapeName string,
 ) {
+	injector := customShapeInjector{sdkapi}
 	fieldShape := &awssdkmodel.Shape{
 		API:       sdkapi.API,
 		ShapeName: fieldName,
 		Type:      "string",
 	}
 
 	sdkapi.API.Shapes[fieldShape.ShapeName] = fieldShape
-	parentShape.MemberRefs[fieldName] = &awssdkmodel.ShapeRef{
-		API:           sdkapi.API,
-		Shape:         fieldShape,
-		ShapeName:     fieldShape.ShapeName,
-		Documentation: fmt.Sprintf("// %s field for %s", fieldName, shapeName),
-	}
-}
-
-// createAndRegisterListShape creates a list shape for a custom shape and registers it
-func (h *Helper) createAndRegisterListShape(
-	sdkapi *ackmodel.SDKAPI,
-	shapeName string,
-	shapeRef *awssdkmodel.ShapeRef,
-) {
-	listShapeName := fmt.Sprintf(ShapeNameTemplateList, shapeName)
-	listShape := &awssdkmodel.Shape{
-		API:           sdkapi.API,
-		ShapeName:     listShapeName,
-		Type:          "list",
-		Documentation: fmt.Sprintf("// List of %s", shapeName),
-		MemberRef:     *shapeRef,
-	}
-
-	listShapeRef := &awssdkmodel.ShapeRef{
-		API:           sdkapi.API,
-		Shape:         listShape,
-		ShapeName:     listShapeName,
-		Documentation: fmt.Sprintf("// List of %s", shapeName),
-	}
-
-	sdkapi.API.Shapes[listShape.ShapeName] = listShape
-	sdkapi.CustomShapes = append(
-		sdkapi.CustomShapes,
-		ackmodel.NewCustomListShape(listShape, listShapeRef, shapeName),
-	)
+	parentShape.MemberRefs[fieldName] = injector.createShapeRefForMember(fieldShape)
 }