changes for aws-sdk-go-v2

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "go.delveConfig": {
+        "debugAdapter": "legacy",
+    },
+    "configurations": [
+
+        {
+            "name": "Attach to Process",
+            "type": "go",
+            "request": "attach",
+            "mode": "local",
+            "processId": 0
+        },
+
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "/Users/mtewold/go/src/github.com/aws-controllers-k8s/code-generator/cmd/ack-generate/main.go"
+        }
+
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "go.buildTags": "codegen",
+}

apiv2/converter.go

@@ -0,0 +1,289 @@
+package apiv2
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/aws-controllers-k8s/code-generator/pkg/api"
+)
+
+type API struct {
+	Shapes map[string]Shape
+}
+
+type Shape struct {
+	Type       string
+	Traits     map[string]interface{}
+	MemberRefs map[string]*ShapeRef `json:"members"`
+	MemberRef  *ShapeRef            `json:"member"`
+	KeyRef     ShapeRef             `json:"key"`
+	ValueRef   ShapeRef             `json:"value"`
+	InputRef   ShapeRef             `json:"input"`
+	OutputRef  ShapeRef             `json:"output"`
+	ErrorRefs  []ShapeRef           `json:"errors"`
+}
+
+type ShapeRef struct {
+	API       *API   `json:"-"`
+	Shape     *Shape `json:"-"`
+	ShapeName string `json:"target"`
+	Traits    map[string]interface{}
+}
+
+func ConvertApiV2Shapes(modelPath string) (map[string]*api.API, error) {
+
+	// Read the json file
+	file, err := os.ReadFile(modelPath)
+	if err != nil {
+		return nil, fmt.Errorf("error reading file: %v", err)
+	}
+
+	// unmarshal the file
+	var customAPI API
+	err = json.Unmarshal(file, &customAPI)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshalling file: %v", err)
+	}
+
+	serviceAlias := extractServiceAlias(modelPath)
+
+	newApi, err := BuildAPI(customAPI.Shapes, serviceAlias)
+	if err != nil {
+		return nil, fmt.Errorf("error building api: %v", err)
+	}
+
+	newApi.StrictServiceId = true
+
+	err = newApi.Setup()
+	if err != nil {
+		return nil, fmt.Errorf("error setting up api: %v", err)
+	}
+
+	return map[string]*api.API{
+		serviceAlias: newApi,
+	}, nil
+}
+
+// This function tries to translate the API from sdk go v2
+// into the struct for sdk go v1
+func BuildAPI(shapes map[string]Shape, serviceAlias string) (*api.API, error) {
+
+	newApi := api.API{
+		Metadata:   api.Metadata{},
+		Operations: map[string]*api.Operation{},
+		Shapes:     map[string]*api.Shape{},
+	}
+
+	for shapeName, shape := range shapes {
+
+		name := removeNamePrefix(shapeName, serviceAlias)
+		if shape.Type != "service" && shape.Type != "operation" {
+			newShape, err := createApiShape(shape)
+			if err != nil {
+				return nil, err
+			}
+			newApi.Shapes[name] = newShape
+		}
+
+		switch shape.Type {
+		case "service":
+			serviceId, ok := shape.Traits["aws.api#service"].(map[string]interface{})["sdkId"]
+			if !ok {
+				return nil, errors.New("service id not found")
+			}
+			newApi.Metadata.ServiceID = serviceId.(string)
+			doc, ok := shape.Traits["smithy.api#documentation"]
+			if !ok {
+				return nil, errors.New("service documentation not found")
+			}
+			newApi.Documentation = api.AppendDocstring("", doc.(string))
+		case "operation":
+			newApi.Operations[name] = createApiOperation(shape, name, serviceAlias)
+		case "structure":
+			AddMemberRefs(newApi.Shapes[name], shape, serviceAlias)
+		case "list":
+			AddMemberRef(newApi.Shapes[name], name, shape, serviceAlias)
+		case "map":
+			AddKeyAndValueRef(newApi.Shapes[name], name, shape, serviceAlias)
+		case "enum":
+			AddEnumRef(newApi.Shapes[name], shape)
+		case "union":
+			newApi.Shapes[name].Type = "structure"
+			AddMemberRefs(newApi.Shapes[name], shape, serviceAlias)
+		}
+
+	}
+
+	return &newApi, nil
+}
+
+func createApiOperation(shape Shape, name, serviceAlias string) *api.Operation {
+
+	doc, _ := shape.Traits["smithy.api#documentation"].(string)
+
+	newOperation := &api.Operation{
+		Name:          name,
+		Documentation: doc,
+	}
+
+	if hasPrefix(shape.InputRef.ShapeName, serviceAlias) {
+		inputName := removeNamePrefix(shape.InputRef.ShapeName, serviceAlias)
+		newOperation.InputRef = api.ShapeRef{
+			ShapeName: inputName,
+		}
+	}
+	if hasPrefix(shape.OutputRef.ShapeName, serviceAlias) {
+		outputName := removeNamePrefix(shape.OutputRef.ShapeName, serviceAlias)
+		newOperation.OutputRef = api.ShapeRef{
+			ShapeName: outputName,
+		}
+	}
+
+	for _, err := range shape.ErrorRefs {
+		newOperation.ErrorRefs = append(newOperation.ErrorRefs, api.ShapeRef{
+			ShapeName: removeNamePrefix(err.ShapeName, serviceAlias),
+		})
+	}
+
+	return newOperation
+}
+
+func createApiShape(shape Shape) (*api.Shape, error) {
+
+	isException := shape.IsException()
+
+	shapeType := shape.Type
+	if shapeType == "enum" {
+		shapeType = "string"
+	}
+
+	apiShape := &api.Shape{
+		Type:       shapeType,
+		Exception:  isException,
+		MemberRefs: make(map[string]*api.ShapeRef),
+		MemberRef:  api.ShapeRef{},
+		KeyRef:     api.ShapeRef{},
+		ValueRef:   api.ShapeRef{},
+		Required:   []string{},
+	}
+	val, ok := shape.Traits["smithy.api#default"]
+	if ok {
+		apiShape.DefaultValue = &val
+	}
+
+	if isException {
+		code, ok := shape.Traits["smithy.api#httpError"]
+		if ok {
+			switch code := code.(type) {
+			case float64:
+				apiShape.ErrorInfo = api.ErrorInfo{
+					HTTPStatusCode: int(code),
+				}
+			case int:
+				apiShape.ErrorInfo = api.ErrorInfo{
+					HTTPStatusCode: code,
+				}
+			case int64:
+				apiShape.ErrorInfo = api.ErrorInfo{
+					HTTPStatusCode: int(code),
+				}
+			default:
+				return nil, fmt.Errorf("status code type not found for exception")
+			}
+		}
+	}
+
+	return apiShape, nil
+}
+
+func AddMemberRefs(apiShape *api.Shape, shape Shape, serviceAlias string) {
+
+	var documentation string
+	for memberName, member := range shape.MemberRefs {
+		if !hasPrefix(member.ShapeName, serviceAlias) {
+			continue
+		}
+		shapeNameClean := removeNamePrefix(member.ShapeName, serviceAlias)
+		if member.Traits["smithy.api#documentation"] != nil {
+			documentation = api.AppendDocstring("", member.Traits["smithy.api#documentation"].(string))
+		}
+		if member.IsRequired() {
+			apiShape.Required = append(apiShape.Required, memberName)
+		}
+		apiShape.MemberRefs[memberName] = &api.ShapeRef{
+			ShapeName:     shapeNameClean,
+			Documentation: documentation,
+		}
+	}
+
+	if shape.Traits["smithy.api#documentation"] != nil {
+		documentation = api.AppendDocstring("", shape.Traits["smithy.api#documentation"].(string))
+	}
+	// Add the documentation to the shape
+	apiShape.Documentation = documentation
+}
+
+func AddMemberRef(apiShape *api.Shape, shapeName string, shape Shape, serviceAlias string) {
+
+	apiShape.MemberRef = api.ShapeRef{
+		ShapeName: removeNamePrefix(shape.MemberRef.ShapeName, serviceAlias),
+	}
+}
+
+func AddKeyAndValueRef(apiShape *api.Shape, shapeName string, shape Shape, serviceAlias string) {
+
+	apiShape.KeyRef = api.ShapeRef{
+		ShapeName: removeNamePrefix(shape.KeyRef.ShapeName, serviceAlias),
+	}
+	apiShape.ValueRef = api.ShapeRef{
+		ShapeName: removeNamePrefix(shape.ValueRef.ShapeName, serviceAlias),
+	}
+}
+
+func AddEnumRef(apiShape *api.Shape, shape Shape) {
+	for memberName := range shape.MemberRefs {
+		apiShape.Enum = append(apiShape.Enum, memberName)
+	}
+}
+
+func (s ShapeRef) IsRequired() bool {
+	_, ok := s.Traits["smithy.api#required"]
+	return ok
+}
+
+func (s Shape) IsException() bool {
+	_, ok := s.Traits["smithy.api#error"]
+	return ok
+}
+
+func hasPrefix(name, alias string) bool {
+
+	prefix := fmt.Sprintf("com.amazonaws.%s#", alias)
+
+	return strings.HasPrefix(name, prefix)
+}
+
+func removeNamePrefix(name, alias string) string {
+
+	toTrim := fmt.Sprintf("com.amazonaws.%s#", alias)
+
+	newName := strings.TrimPrefix(name, toTrim)
+
+	return newName
+}
+
+func extractServiceAlias(modelPath string) string {
+	// Split the path into parts
+	parts := strings.Split(modelPath, "/")
+
+	// Get the last part
+	lastPart := parts[len(parts)-1]
+
+	// Split the last part by "." to get the service alias
+	serviceAlias := strings.Split(lastPart, ".")[0]
+
+	return serviceAlias
+}

cmd/ack-generate/command/common.go

@@ -51,14 +51,19 @@ func loadModel(svcAlias string, apiVersion string, apiGroup string, defaultCfg a
 	}
 
 	sdkHelper := acksdk.NewHelper(sdkDir, cfg)
-	sdkAPI, err := sdkHelper.API(modelName)
+	//sdkAPI, err := sdkHelper.API(modelName)
+
+	// AWS-SDK-GO-V2
+	sdkAPI, err := sdkHelper.APIV2(svcAlias)
+
 	if err != nil {
 		retryModelName, err := FallBackFindServiceID(sdkDir, svcAlias)
 		if err != nil {
 			return nil, err
 		}
 		// Retry using path found by querying service ID
-		sdkAPI, err = sdkHelper.API(retryModelName)
+		// sdkAPI, err = sdkHelper.API(retryModelName)
+		sdkAPI, err = sdkHelper.APIV2(retryModelName)
 		if err != nil {
 			return nil, fmt.Errorf("service %s not found", svcAlias)
 		}

cmd/ack-generate/command/root.go

@@ -110,7 +110,7 @@ func init() {
 		&optCacheDir, "cache-dir", defaultCacheDir, "Path to directory to store cached files (including clone'd aws-sdk-go repo)",
 	)
 	rootCmd.PersistentFlags().BoolVar(
-		&optRefreshCache, "refresh-cache", true, "If true, and aws-sdk-go repo is already cloned, will git pull the latest aws-sdk-go commit",
+		&optRefreshCache, "refresh-cache", false, "If true, and aws-sdk-go repo is already cloned, will git pull the latest aws-sdk-go commit",
 	)
 	rootCmd.PersistentFlags().StringVar(
 		&optGeneratorConfigPath, "generator-config-path", "", "Path to file containing instructions for code generation to use",

go.mod

@@ -25,10 +25,19 @@ require (
 	sigs.k8s.io/controller-runtime v0.19.0
 )
 
+replace github.com/aws-controllers-k8s/runtime => github.com/michaelhtm/ack-runtime v0.40.1-0.20250108224829-d260bd8add76
+
 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
+	github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
+	github.com/aws/smithy-go v1.22.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect