Fix overwriting spec paths for empty reference slices

Author: Nicholas Thomson

pkg/generate/code/resource_reference.go

@@ -244,20 +244,24 @@ func ResolveReferencesForField(field *model.Field, sourceVarName string, indentL
 			fieldAccessPrefix = fmt.Sprintf("%s.%s", fieldAccessPrefix, cur.GetReferenceFieldName().Camel)
 
 			iterVarName := fmt.Sprintf("iter%d", idx)
+			aggRefName := fmt.Sprintf("resolved%d", idx)
 
 			// base case for references in a list
-			outPrefix += fmt.Sprintf("%s%s = %s{}\n", indent, targetVarName, field.GoType)
-			outPrefix += fmt.Sprintf("%sfor _, %s := range %s {\n", indent, iterVarName, fieldAccessPrefix)
+			outPrefix += fmt.Sprintf("%sif len(%s) > 0 {\n", indent, fieldAccessPrefix)
+			outPrefix += fmt.Sprintf("%s\t%s := %s{}\n", indent, aggRefName, field.GoType)
+			outPrefix += fmt.Sprintf("%s\tfor _, %s := range %s {\n", indent, iterVarName, fieldAccessPrefix)
 
 			fieldAccessPrefix = iterVarName
-			outPrefix += fmt.Sprintf("%s\tarr := %s.From\n", indent, fieldAccessPrefix)
-			outPrefix += fmt.Sprintf("%s\tif arr == nil || arr.Name == nil || *arr.Name == \"\" {\n", indent)
-			outPrefix += fmt.Sprintf("%s\t\treturn fmt.Errorf(\"provided resource reference is nil or empty: %s\")\n", indent, field.ReferenceFieldPath())
-			outPrefix += fmt.Sprintf("%s\t}\n", indent)
+			outPrefix += fmt.Sprintf("%s\t\tarr := %s.From\n", indent, fieldAccessPrefix)
+			outPrefix += fmt.Sprintf("%s\t\tif arr == nil || arr.Name == nil || *arr.Name == \"\" {\n", indent)
+			outPrefix += fmt.Sprintf("%s\t\t\treturn fmt.Errorf(\"provided resource reference is nil or empty: %s\")\n", indent, field.ReferenceFieldPath())
+			outPrefix += fmt.Sprintf("%s\t\t}\n", indent)
 
-			outPrefix += getReferencedStateForField(field, indentLevel+idx)
+			outPrefix += getReferencedStateForField(field, indentLevel+idx+1)
 
-			outPrefix += fmt.Sprintf("%s\t%s = append(%s, (%s)(obj.%s))\n", indent, targetVarName, targetVarName, field.ShapeRef.Shape.MemberRef.GoType(), field.FieldConfig.References.Path)
+			outPrefix += fmt.Sprintf("%s\t\t%s = append(%s, (%s)(obj.%s))\n", indent, aggRefName, aggRefName, field.ShapeRef.Shape.MemberRef.GoType(), field.FieldConfig.References.Path)
+			outPrefix += fmt.Sprintf("%s\t}\n", indent)
+			outPrefix += fmt.Sprintf("%s\t%s = %s\n", indent, targetVarName, aggRefName)
 			outPrefix += fmt.Sprintf("%s}\n", indent)
 		case ("map"):
 			panic("references cannot be within a map")

pkg/generate/code/resource_reference_test.go

@@ -269,17 +269,20 @@ func Test_ResolveReferencesForField_SliceOfReferences(t *testing.T) {
 	crd := testutil.GetCRDByName(t, g, "VpcLink")
 	require.NotNil(crd)
 	expected :=
-		`	ko.Spec.SecurityGroupIDs = []*string{}
-	for _, iter0 := range ko.Spec.SecurityGroupRefs {
-		arr := iter0.From
-		if arr == nil || arr.Name == nil || *arr.Name == "" {
-			return fmt.Errorf("provided resource reference is nil or empty: SecurityGroupRefs")
-		}
-		obj := &ec2apitypes.SecurityGroup{}
-		if err := getReferencedResourceState_SecurityGroup(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
-			return err
+		`	if len(ko.Spec.SecurityGroupRefs) > 0 {
+		resolved0 := []*string{}
+		for _, iter0 := range ko.Spec.SecurityGroupRefs {
+			arr := iter0.From
+			if arr == nil || arr.Name == nil || *arr.Name == "" {
+				return fmt.Errorf("provided resource reference is nil or empty: SecurityGroupRefs")
+			}
+			obj := &ec2apitypes.SecurityGroup{}
+			if err := getReferencedResourceState_SecurityGroup(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
+				return err
+			}
+			resolved0 = append(resolved0, (*string)(obj.Status.ID))
 		}
-		ko.Spec.SecurityGroupIDs = append(ko.Spec.SecurityGroupIDs, (*string)(obj.Status.ID))
+		ko.Spec.SecurityGroupIDs = resolved0
 	}
 `