fixed list_of issues

Author: rushmash91

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

@@ -464,11 +464,11 @@ func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 	m.processNestedFieldTypeDefs(tdefs)
 
 	// Add custom type definitions for custom shapes
-	var err error
-	tdefs, err = m.AddCustomTypeDefinitions(tdefs)
+	customTypes, err := m.AddCustomTypeDefinitions(tdefs)
 	if err != nil {
 		return nil, fmt.Errorf("error adding custom type definitions: %w", err)
 	}
+	tdefs = append(tdefs, customTypes...)
 
 	m.typeDefs = tdefs
 	m.typeRenames = trenames
@@ -1049,16 +1049,14 @@ func New(
 }
 
 // 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) {
+	var customTypes []*TypeDef
 	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 {
@@ -1070,7 +1068,6 @@ func (m *Model) AddCustomTypeDefinitions(tdefs []*TypeDef) ([]*TypeDef, error) {
 			continue
 		}
 
-		// Create a new TypeDef for this custom shape
 		tdefNames := names.New(shape.ShapeName)
 		attrs := map[string]*Attr{}
 		for memberName, memberRef := range shape.MemberRefs {
@@ -1084,12 +1081,13 @@ func (m *Model) AddCustomTypeDefinitions(tdefs []*TypeDef) ([]*TypeDef, error) {
 			attrs[memberName] = NewAttr(memberNames, gt, memberShape)
 		}
 		if len(attrs) > 0 {
-			tdefs = append(tdefs, &TypeDef{
+			customTypes = append(customTypes, &TypeDef{
 				Shape: shape,
 				Names: tdefNames,
 				Attrs: attrs,
 			})
 		}
 	}
-	return tdefs, nil
-}
+
+	return customTypes, nil
+}

pkg/sdk/custom_shapes.go

@@ -42,6 +42,7 @@ type customShapeInjector struct {
 // the SDKAPI object.
 func (h *Helper) InjectCustomShapes(sdkapi *ackmodel.SDKAPI) error {
 	injector := customShapeInjector{sdkapi}
+	h.InjectSimpleSchemaShapes(sdkapi)
 
 	for _, memberShape := range h.cfg.GetCustomMapFieldMembers() {
 		customShape, err := injector.newMap(memberShape)

pkg/sdk/helper.go

@@ -109,10 +109,7 @@ func (h *Helper) API(serviceModelName string) (*model.SDKAPI, error) {
 		// unexported map variable...
 		_ = api.ServicePackageDoc()
 		sdkapi := model.NewSDKAPI(api, h.APIGroupSuffix)
-
 		h.InjectCustomShapes(sdkapi)
-		h.InjectSimpleSchemaShapes(sdkapi)
-
 		return sdkapi, nil
 	}
 	return nil, ErrServiceNotFound

pkg/sdk/simpleschema.go

@@ -31,7 +31,7 @@ func (h *Helper) InjectSimpleSchemaShapes(sdkapi *ackmodel.SDKAPI) error {
 	}
 
 	for shapeName, fieldsMap := range h.cfg.CustomShapes {
-		schemaObj := convertFieldsMapToSchemaObj(fieldsMap)
+		schemaObj := convertMapKeys(fieldsMap)
 
 		openAPISchema, err := simpleschema.ToOpenAPISpec(schemaObj)
 		if err != nil {
@@ -47,16 +47,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 convertMapKeys(fieldsMap map[string]string) map[string]interface{} {
 	schemaObj := make(map[string]interface{})
 	for fieldName, fieldType := range fieldsMap {
 		schemaObj[fieldName] = fieldType
@@ -70,6 +67,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,
@@ -88,13 +86,7 @@ func (h *Helper) createBaseShape(
 		addFieldToShape(sdkapi, shape, fieldName, shapeName)
 	}
 
-	shapeRef := &awssdkmodel.ShapeRef{
-		API:           sdkapi.API,
-		Shape:         shape,
-		ShapeName:     shape.ShapeName,
-		Documentation: fmt.Sprintf("// Reference to %s", shapeName),
-	}
-
+	shapeRef := injector.createShapeRefForMember(shape)
 	return shape, shapeRef
 }
 
@@ -105,46 +97,13 @@ func addFieldToShape(
 	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)
+}