final fixes?

Author: rushmash91

go.mod

@@ -25,8 +25,6 @@ require (
 )
 
 require (
-	github.com/kro-run/kro v0.2.2
-	k8s.io/apiextensions-apiserver v0.31.0
 	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
@@ -74,6 +72,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/kro-run/kro v0.2.2
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -109,6 +108,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.31.0 // indirect
+	k8s.io/apiextensions-apiserver v0.31.0
 	k8s.io/client-go v0.31.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34 // indirect

pkg/config/config.go

@@ -69,7 +69,7 @@ type Config struct {
 	//     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"`
+	CustomShapes map[string]map[string]interface{} `json:"custom_shapes,omitempty"`
 }
 
 // SDKNames contains information on the SDK Client package. More precisely

pkg/model/crd.go

@@ -834,7 +834,7 @@ func (r *CRD) ReferencedServiceNames() (serviceNames []string) {
 		}
 	}
 
-	for serviceName, _ := range serviceNamesMap {
+	for serviceName := range serviceNamesMap {
 		serviceNames = append(serviceNames, serviceName)
 	}
 	sort.Strings(serviceNames)

pkg/model/model.go

@@ -412,7 +412,7 @@ 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)

pkg/model/model_dynamodb_test.go

@@ -122,12 +122,11 @@ func TestDynamoDB_CustomShape_ReplicasState(t *testing.T) {
 	crd := getCRDByName("Table", crds)
 	require.NotNil(crd)
 
-	// Verify the ReplicaStates field exists 
+	// Verify the ReplicaStates field exists
 	assert.Contains(crd.StatusFields, "ReplicaStates")
 	replicasDescField := crd.StatusFields["ReplicaStates"]
 	require.NotNil(replicasDescField)
 
-
 	replicasStateShape := replicasDescField.ShapeRef.Shape.MemberRef.Shape
 	require.NotNil(replicasStateShape)
 
@@ -145,4 +144,6 @@ func TestDynamoDB_CustomShape_ReplicasState(t *testing.T) {
 		field := replicasStateShape.MemberRefs[fieldName]
 		assert.Equal("string", field.Shape.Type, "Field "+fieldName+" should be of type string")
 	}
+
+	assert.Equal(len(expectedFields), len(replicasStateShape.MemberRefs), "ReplicasState shape has unexpected number of fields")
 }

pkg/model/sdk_api.go

@@ -134,14 +134,14 @@ func (a *SDKAPI) GetShapeRefFromType(
 	// TODO(jaypipes): Only handling maps with string keys at the moment...
 	isMap := strings.HasPrefix(typeOverride, "map[string]")
 	if isMap {
-		elemType = typeOverride[11:len(typeOverride)]
+		elemType = typeOverride[11:]
 	}
 	if isSlice {
-		elemType = typeOverride[2:len(typeOverride)]
+		elemType = typeOverride[2:]
 	}
 	isPtrElem := strings.HasPrefix(elemType, "*")
 	if isPtrElem {
-		elemType = elemType[1:len(elemType)]
+		elemType = elemType[1:]
 	}
 	// first check to see if the element type is a scalar and if it is, just
 	// create a ShapeRef to represent the type.

pkg/sdk/custom_shapes.go

@@ -17,8 +17,10 @@ import (
 	"errors"
 	"fmt"
 
-	awssdkmodel "github.com/aws-controllers-k8s/code-generator/pkg/api"
+	simpleschema "github.com/kro-run/kro/pkg/simpleschema"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
+	awssdkmodel "github.com/aws-controllers-k8s/code-generator/pkg/api"
 	ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
 )
 
@@ -41,11 +43,11 @@ 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 {
+	injector := customShapeInjector{sdkapi}
+
+	if err := injector.injectSimpleSchemaShapes(h.cfg.CustomShapes); err != nil {
 		return err
 	}
-	injector := customShapeInjector{sdkapi}
 
 	for _, memberShape := range h.cfg.GetCustomMapFieldMembers() {
 		customShape, err := injector.newMap(memberShape)
@@ -68,6 +70,86 @@ func (h *Helper) InjectCustomShapes(sdkapi *ackmodel.SDKAPI) error {
 	return nil
 }
 
+// injectSimpleSchemaShapes processes custom shapes from the top-level custom_shapes
+// section and injects them into the SDK API model.
+// Only string types are supported - all other types will cause a panic.
+func (i *customShapeInjector) injectSimpleSchemaShapes(customShapes map[string]map[string]interface{}) error {
+	if len(customShapes) == 0 {
+		return nil
+	}
+
+	apiShapeNames := i.sdkAPI.API.ShapeNames()
+	for shapeName, fieldsMap := range customShapes {
+		// check for duplicates
+		for _, as := range apiShapeNames {
+			if as == shapeName {
+				return fmt.Errorf("CustomType name %s already exists in the API", shapeName)
+			}
+		}
+		openAPISchema, err := simpleschema.ToOpenAPISpec(fieldsMap)
+		if err != nil {
+			return err
+		}
+
+		// Create and register the base structure shape
+		shape, shapeRef := i.newStructureShape(shapeName, openAPISchema)
+		i.sdkAPI.API.Shapes[shape.ShapeName] = shape
+		i.sdkAPI.CustomShapes = append(i.sdkAPI.CustomShapes, &ackmodel.CustomShape{
+			Shape:           shape,
+			ShapeRef:        shapeRef,
+			MemberShapeName: nil,
+			ValueShapeName:  nil,
+		})
+	}
+
+	return nil
+}
+
+// newStructureShape creates a base shape with its member fields
+func (i *customShapeInjector) newStructureShape(
+	shapeName string,
+	openAPISchema *apiextv1.JSONSchemaProps,
+) (*awssdkmodel.Shape, *awssdkmodel.ShapeRef) {
+	shape := &awssdkmodel.Shape{
+		API:           i.sdkAPI.API,
+		ShapeName:     shapeName,
+		Type:          "structure",
+		Documentation: "// Custom ACK type for " + shapeName,
+		MemberRefs:    make(map[string]*awssdkmodel.ShapeRef),
+	}
+
+	properties := openAPISchema.Properties
+	for fieldName, propObj := range properties {
+		propType := propObj.Type
+		if propType != "string" {
+			panic(fmt.Sprintf("Field %s in shape %s has non-string type '%s'",
+				fieldName, shapeName, propType))
+		}
+		addStringFieldToShape(i.sdkAPI, shape, fieldName, shapeName)
+	}
+
+	shapeRef := i.createShapeRefForMember(shape)
+	return shape, shapeRef
+}
+
+// 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] = injector.createShapeRefForMember(fieldShape)
+}
+
 // createShapeRefForMember creates a minimal ShapeRef type to encapsulate a
 // shape.
 func (i *customShapeInjector) createShapeRefForMember(shape *awssdkmodel.Shape) *awssdkmodel.ShapeRef {