final generation change

Author: michaelhtm

.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

@@ -1,11 +1,5 @@
 package apiv2
 
-/*
-* This MF will help me translate a file into another file
-
-SDK V2 file is a bit tricky/fancy
-But ig we can get this ish done quilicky lili
-*/
 import (
 	"encoding/json"
 	"errors"
@@ -170,6 +164,10 @@ func createApiShape(shape Shape) (*api.Shape, error) {
 		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"]

go.mod

@@ -32,9 +32,6 @@ require (
 	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/sqs v1.37.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

go.sum

@@ -77,12 +77,6 @@ github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY
 github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/aws/aws-sdk-go-v2 v1.32.6 h1:7BokKRgRPuGmKkFMhEg/jSul+tB9VvXhcViILtfG8b4=
 github.com/aws/aws-sdk-go-v2 v1.32.6/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 h1:s/fF4+yDQDoElYhfIVvSNyeCydfbuTKzhxSXDXCPasU=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25/go.mod h1:IgPfDv5jqFIzQSNbUEMoitNooSMXjRSDkhXv8jiROvU=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 h1:ZntTCl5EsYnhN/IygQEUugpdwbhdkom9uHcbCftiGgA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25/go.mod h1:DBdPrgeocww+CSl1C8cEV8PN1mHMBhuCDLpXezyvWkE=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.37.2 h1:mFLfxLZB/TVQwNJAYox4WaxpIu+dFVIcExrmRmRCOhw=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.37.2/go.mod h1:GnvfTdlvcpD+or3oslHPOn4Mu6KaCwlCp+0p0oqWnrM=
 github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
 github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

pkg/api/shape.go

@@ -81,7 +81,8 @@ type ShapeRef struct {
 type Shape struct {
 	API           *API `json:"-"`
 	ShapeName     string
-	Documentation string `json:"-"`
+	Documentation string       `json:"-"`
+	DefaultValue  *interface{} `json:"-"`
 
 	// References of struct members will include their originally modeled
 	// member name for cross references.
@@ -1053,6 +1054,11 @@ func (s *Shape) IsEnum() bool {
 	return s.Type == "string" && len(s.Enum) > 0
 }
 
+// HasDefaultValue returns whether this shape has a default value
+func (s *Shape) HasDefaultValue() bool {
+	return s.DefaultValue != nil
+}
+
 // IsRequired returns if member is a required field. Required fields are fields
 // marked as required, hostLabels, or location of uri path.
 func (s *Shape) IsRequired(member string) bool {

pkg/generate/code/compare.go

@@ -838,9 +838,6 @@ func fastCompareTypes(
 		// For any other type, we can use the HasNilDifference function to
 		// eliminate early on the case where one of the objects is nil and
 		// other is not.
-		// if memberShape.ShapeName == "ElasticLoadBalancing" {
-		// 	fmt.Println(deltaVarName, firstResVarName, secondResVarName, fieldPath, memberShape.GoType(), memberShape.GoTypeElem())
-		// }
 		out += compareNil(
 			compareConfig,
 			memberShape,

pkg/generate/code/set_resource.go

@@ -308,31 +308,9 @@ func SetResource(
 		// ko.Status.VpnMemberships = field0
 
 		// This is for AWS-SDK-GO-V2
-		if targetMemberShapeRef.Shape.IsEnum() {
-
-			out += fmt.Sprintf(
-				"%sif %s != \"\" {\n", indent, sourceAdaptedVarName,
-			)
-
-			// } else if targetMemberShapeRef.Shape.Type == "long" && strings.HasSuffix(targetMemberShapeRef.ShapeName, "Value") {
-
-			// 	out += fmt.Sprintf(
-			// 		"%sif %s > 0 {\n", indent, sourceAdaptedVarName,
-			// 	)
-
-			// else if targetMemberShapeRef.Shape.Type == "integer" {
+		if !targetMemberShapeRef.Shape.IsEnum() && !targetMemberShape.HasDefaultValue() {
 
-			// 	out += fmt.Sprintf(
-			// 		"%sif %s > 0 {\n", indent, sourceAdaptedVarName,
-			// 	)
-			// }
-
-			// } else if targetMemberShapeRef.Shape.Type == "boolean" && targetMemberShapeRef.Shape.GoType() == "bool" {
-
-			// 	out += fmt.Sprintf(
-			// 		"%sif %s  {\n", indent, sourceAdaptedVarName,
-			// 	)
-		} else {
+			// if !sourceMemberShapeRef.Shape.IsEnum() && sourceMemberShapeRef.ShapeName != "Boolean" && sourceMemberShapeRef.Shape.ShapeName != "BooleanType" {
 
 			out += fmt.Sprintf(
 				"%sif %s != nil {\n", indent, sourceAdaptedVarName,
@@ -344,8 +322,14 @@ func SetResource(
 		)
 
 		switch targetMemberShape.Type {
-		case "list", "structure", "map":
-			{
+		case "list", "map", "structure":
+			if targetMemberShape.Type == "list" && targetMemberShape.MemberRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringSlice(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else if targetMemberShape.Type == "map" &&
+				targetMemberShape.KeyRef.Shape.Type == "string" &&
+				targetMemberShape.ValueRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringMap(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else {
 
 				memberVarName := fmt.Sprintf("f%d", memberIndex)
 
@@ -389,17 +373,19 @@ func SetResource(
 				indentLevel+1,
 			)
 		}
-		out += fmt.Sprintf(
-			"%s} else {\n", indent,
-		)
+		if !targetMemberShape.IsEnum() && !targetMemberShape.HasDefaultValue() {
+			out += fmt.Sprintf(
+				"%s} else {\n", indent,
+			)
 
-		out += fmt.Sprintf(
-			"%s%s%s.%s = nil\n", indent, indent,
-			targetAdaptedVarName, f.Names.Camel,
-		)
-		out += fmt.Sprintf(
-			"%s}\n", indent,
-		)
+			out += fmt.Sprintf(
+				"%s%s%s.%s = nil\n", indent, indent,
+				targetAdaptedVarName, f.Names.Camel,
+			)
+			out += fmt.Sprintf(
+				"%s}\n", indent,
+			)
+		}
 	}
 	return out
 }
@@ -661,7 +647,13 @@ func setResourceReadMany(
 		)
 		switch sourceMemberShape.Type {
 		case "list", "structure", "map":
-			{
+			if sourceMemberShape.Type == "list" && sourceMemberShape.MemberRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringSlice(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else if sourceMemberShape.Type == "map" &&
+				sourceMemberShape.KeyRef.Shape.Type == "string" &&
+				sourceMemberShape.ValueRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringMap(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else {
 				memberVarName := fmt.Sprintf("f%d", memberIndex)
 				out += varEmptyConstructorK8sType(
 					cfg, r,
@@ -1735,11 +1727,11 @@ func SetResourceForStruct(
 		// 	"%sif %s != nil {\n", indent, sourceAdaptedVarName,
 		// )
 
-		if !sourceMemberShape.IsEnum() && sourceMemberShape.ShapeName != "Boolean" {
-
+		if !sourceMemberShape.IsEnum() && !sourceMemberShape.HasDefaultValue() {
 			out += fmt.Sprintf(
 				"%sif %s != nil {\n", indent, sourceAdaptedVarName,
 			)
+
 			// This is for edge case - in efs controller
 			// FileSystemSize.Value is int64 and rest of fields are *int64
 		}
@@ -1757,7 +1749,15 @@ func SetResourceForStruct(
 
 		switch sourceMemberShape.Type {
 		case "list", "structure", "map":
-			{
+			if sourceMemberShape.Type == "list" &&
+				!sourceMemberShape.MemberRef.Shape.IsEnum() &&
+				sourceMemberShape.MemberRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringSlice(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else if sourceMemberShape.Type == "map" &&
+				sourceMemberShape.KeyRef.Shape.Type == "string" &&
+				sourceMemberShape.ValueRef.Shape.Type == "string" {
+				out += fmt.Sprintf("%s%s = aws.StringMap(%s)\n", indent, qualifiedTargetVar, sourceAdaptedVarName)
+			} else {
 				out += varEmptyConstructorK8sType(
 					cfg, r,
 					indexedVarName,
@@ -1792,7 +1792,7 @@ func SetResourceForStruct(
 				indentLevel+1,
 			)
 		}
-		if !sourceMemberShape.IsEnum() && sourceMemberShape.ShapeName != "Boolean" {
+		if !sourceMemberShape.IsEnum() && !sourceMemberShape.HasDefaultValue() {
 			out += fmt.Sprintf(
 				"%s}\n", indent,
 			)
@@ -1954,24 +1954,27 @@ func setResourceForSlice(
 		)
 	}
 	// This is for AWS-SDK-GO-V2
-	addressOfVar := ""
+	// addressOfVar := ""
 	switch targetShape.MemberRef.Shape.Type {
 	case "structure", "list", "map":
 		break
 	default:
 		// This is for AWS-SDK-GO-V2
-		
+
 	}
 	//  f0 = append(f0, elem0)
 
-	if sourceShape.ShapeName == "StringList" {
-		addressOfVar = "&"
-	}
+	// if !sourceShape.MemberRef.Shape.IsEnum() {
+	// 	addressOfVar = "&"
+	// }
+	// if sourceShape.Type == "list" {
+	// 	addressOfVar = "&"
+	// }
 
 	// This is for AWS-SDK-GO-V2
 	//out += fmt.Sprintf("%s\t%s = append(%s, %s%s)\n", indent, targetVarName, targetVarName, addressOfVar, elemVarName)
 
-	out += fmt.Sprintf("%s\t%s = append(%s, %s%s)\n", indent, targetVarName, targetVarName, addressOfVar, elemVarName)
+	out += fmt.Sprintf("%s\t%s = append(%s, %s)\n", indent, targetVarName, targetVarName, elemVarName)
 	out += fmt.Sprintf("%s}\n", indent)
 
 	return out
@@ -2072,24 +2075,40 @@ func setResourceForScalar(
 
 	}
 
-	// This is for AWS-SDK-GO-V2
-	if shape.IsEnum() {
-		out += fmt.Sprintf("%s%s = aws.String(string(%s))\n", indent, targetVar, strings.TrimPrefix(setTo, "*"))
-		// } else if shape.Type == "integer" {
-
-		// 	out += fmt.Sprintf("%s%s := int64(%s)\n", indent, "number", setTo)
-		// 	out += fmt.Sprintf("%s%s = &%s\n", indent, targetVar, "number")
-
-		// This is for edge case - in efs  controller
-		// targetvar is int64 and rest of targetvar are *int64 - EFS controller
-	} else if shape.ShapeName == "Boolean" {
-		out += fmt.Sprintf("%s%s = &%s\n", indent, targetVar, setTo)
-	} else if shape.Type == "integer" {
-		out += fmt.Sprintf("%stemp := int64(*%s)\n", indent, setTo)
-		out += fmt.Sprintf("%s%s = &temp\n", indent, targetVar)
-	}else {
+	switch shape.Type {
+	case "list":
 		out += fmt.Sprintf("%s%s = %s\n", indent, targetVar, setTo)
+	case "integer":
+		out += fmt.Sprintf("%s%stemp := int64(*%s)\n", indent, shape.ShapeName, setTo)
+		out += fmt.Sprintf("%s%s = &%stemp\n", indent, targetVar, shape.ShapeName)
+	default:
+		if shape.HasDefaultValue() {
+			out += fmt.Sprintf("%s%s = &%s\n", indent, targetVar, setTo)
+		} else if shape.IsEnum() {
+			out += fmt.Sprintf("%s%s = aws.String(string(%s))\n", indent, targetVar, strings.TrimPrefix(setTo, "*"))
+		} else {
+			out += fmt.Sprintf("%s%s = %s\n", indent, targetVar, setTo)
+		}
 	}
+
+	// This is for AWS-SDK-GO-V2
+	// if shape.IsEnum() {
+	// 	out += fmt.Sprintf("%s%s = aws.String(string(%s))\n", indent, targetVar, strings.TrimPrefix(setTo, "*"))
+	// 	// } else if shape.Type == "integer" {
+
+	// 	// 	out += fmt.Sprintf("%s%s := int64(%s)\n", indent, "number", setTo)
+	// 	// 	out += fmt.Sprintf("%s%s = &%s\n", indent, targetVar, "number")
+
+	// 	// This is for edge case - in efs  controller
+	// 	// targetvar is int64 and rest of targetvar are *int64 - EFS controller
+	// } else if shape.HasDefaultValue() {
+	// 	out += fmt.Sprintf("%s%s = &%s\n", indent, targetVar, setTo)
+	// } else if shape.Type == "integer" {
+	// 	out += fmt.Sprintf("%stemp := int64(*%s)\n", indent, setTo)
+	// 	out += fmt.Sprintf("%s%s = &temp\n", indent, targetVar)
+	// }else {
+	// 	out += fmt.Sprintf("%s%s = %s\n", indent, targetVar, setTo)
+	// }
 	return out
 }