fix: added checks to skip empty data rows

Author: deepakm-ntnx

pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go

@@ -128,27 +128,34 @@ func (h *nutanixMachineDetailsControlPlanePatchHandler) Mutate(
 				nutanixMachineDetailsVar.SystemDiskSize,
 			)
 
-			subnets := make(
+			obj.Spec.Template.Spec.Subnets = make(
 				[]capxv1.NutanixResourceIdentifier,
 				len(nutanixMachineDetailsVar.Subnets),
 			)
 			for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
-				subnet := capxv1.NutanixResourceIdentifier{
-					Type: capxv1.NutanixIdentifierType(subnetCRE.Type),
+				if subnetCRE.Type == "" {
+					continue
 				}
+				subnet := capxv1.NutanixResourceIdentifier{}
 				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
+					subnet.Type = capxv1.NutanixIdentifierName
+					if subnetCRE.Name == nil {
+						continue
+					}
 					subnet.Name = subnetCRE.Name
 				} else {
+					subnet.Type = capxv1.NutanixIdentifierUUID
+					if subnetCRE.UUID == nil {
+						continue
+					}
 					subnet.UUID = subnetCRE.UUID
 				}
-				subnets = append(subnets, subnet)
+				obj.Spec.Template.Spec.Subnets = append(obj.Spec.Template.Spec.Subnets, subnet)
 			}
-
-			obj.Spec.Template.Spec.Subnets = subnets
-			// TODO:deepakm-ntnx uncomment this once we are ready
-			// obj.Spec.Template.Spec.Project = nutanixMachineDetailsVar.Project
-			// obj.Spec.Template.Spec.AdditionalCategories = nutanixMachineDetailsVar.AdditionalCategories
-			// obj.Spec.Template.Spec.GPUs = nutanixMachineDetailsVar.GPUs
+			// TODO:deepakm-ntnx assign user provided values
+			obj.Spec.Template.Spec.Project = nil
+			obj.Spec.Template.Spec.AdditionalCategories = []capxv1.NutanixCategoryIdentifier{}
+			obj.Spec.Template.Spec.GPUs = []capxv1.NutanixGPU{}
 			return nil
 		},
 	)

pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go

@@ -121,28 +121,30 @@ func (h *nutanixMachineDetailsWorkerPatchHandler) Mutate(
 			obj.Spec.Template.Spec.SystemDiskSize = resource.MustParse(
 				nutanixMachineDetailsVar.SystemDiskSize,
 			)
-
-			subnets := make(
-				[]capxv1.NutanixResourceIdentifier,
-				len(nutanixMachineDetailsVar.Subnets),
-			)
 			for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
-				subnet := capxv1.NutanixResourceIdentifier{
-					Type: capxv1.NutanixIdentifierType(subnetCRE.Type),
+				if subnetCRE.Type == "" {
+					continue
 				}
+				subnet := capxv1.NutanixResourceIdentifier{}
 				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
+					subnet.Type = capxv1.NutanixIdentifierName
+					if subnetCRE.Name == nil {
+						continue
+					}
 					subnet.Name = subnetCRE.Name
 				} else {
+					subnet.Type = capxv1.NutanixIdentifierUUID
+					if subnetCRE.UUID == nil {
+						continue
+					}
 					subnet.UUID = subnetCRE.UUID
 				}
-				subnets = append(subnets, subnet)
+				obj.Spec.Template.Spec.Subnets = append(obj.Spec.Template.Spec.Subnets, subnet)
 			}
-
-			obj.Spec.Template.Spec.Subnets = subnets
-			// TODO:deepakm-ntnx uncomment this once we are ready
-			// obj.Spec.Template.Spec.Project = nutanixMachineDetailsVar.Project
-			// obj.Spec.Template.Spec.AdditionalCategories = nutanixMachineDetailsVar.AdditionalCategories
-			// obj.Spec.Template.Spec.GPUs = nutanixMachineDetailsVar.GPUs
+			// TODO:deepakm-ntnx assign user provided values
+			obj.Spec.Template.Spec.Project = nil
+			obj.Spec.Template.Spec.AdditionalCategories = []capxv1.NutanixCategoryIdentifier{}
+			obj.Spec.Template.Spec.GPUs = []capxv1.NutanixGPU{}
 
 			return nil
 		},

pkg/handlers/nutanix/mutation/metapatch_handler_test.go

@@ -26,6 +26,7 @@ import (
 	nutanixclusterconfig "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig"
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/controlplaneendpoint"
 	controlplaneendpointtests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests"
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/machinedetails"
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/prismcentralendpoint"
 	prismcentralendpointtests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests"
 )
@@ -63,6 +64,7 @@ func TestGeneratePatches(t *testing.T) {
 		prismcentralendpoint.VariableName,
 	)
 
+
 	auditpolicytests.TestGeneratePatches(
 		t,
 		metaPatchGeneratorFunc(mgr),