fix: Use leaf "image" field in preflight check results

Author: dlipovetsky

pkg/webhook/preflight/nutanix/image.go

@@ -45,7 +45,7 @@ func (c *imageCheck) Run(ctx context.Context) preflight.CheckResult {
 			result.InternalError = true
 			result.Causes = append(result.Causes, preflight.Cause{
 				Message: fmt.Sprintf("failed to get VM Image: %s", err),
-				Field:   c.field,
+				Field:   c.field + ".image",
 			})
 			return result
 		}
@@ -54,7 +54,7 @@ func (c *imageCheck) Run(ctx context.Context) preflight.CheckResult {
 			result.Allowed = false
 			result.Causes = append(result.Causes, preflight.Cause{
 				Message: fmt.Sprintf("expected to find 1 VM Image, found %d", len(images)),
-				Field:   c.field,
+				Field:   c.field + ".image",
 			})
 			return result
 		}

pkg/webhook/preflight/nutanix/image_test.go

@@ -127,7 +127,7 @@ func TestVMImageCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "expected to find 1 VM Image, found 0",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -169,7 +169,7 @@ func TestVMImageCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "expected to find 1 VM Image, found 2",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -193,7 +193,7 @@ func TestVMImageCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "failed to get VM Image: api error",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -226,7 +226,7 @@ func TestVMImageCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "failed to get VM Image: api error",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -262,7 +262,7 @@ func TestVMImageCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "failed to get VM Image: failed to get data returned by ListImages",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -284,7 +284,7 @@ func TestVMImageCheck(t *testing.T) {
 			// Create the check
 			check := &imageCheck{
 				machineDetails: tc.machineDetails,
-				field:          "test-field",
+				field:          "machineDetails",
 				nclient:        tc.nclient,
 			}
 

pkg/webhook/preflight/nutanix/imagekubernetesversioncheck.go

@@ -43,7 +43,7 @@ func (c *imageKubernetesVersionCheck) Run(ctx context.Context) preflight.CheckRe
 				Causes: []preflight.Cause{
 					{
 						Message: fmt.Sprintf("failed to get VM Image: %s", err),
-						Field:   c.field,
+						Field:   c.field + ".image",
 					},
 				},
 			}
@@ -62,7 +62,7 @@ func (c *imageKubernetesVersionCheck) Run(ctx context.Context) preflight.CheckRe
 				Causes: []preflight.Cause{
 					{
 						Message: err.Error(),
-						Field:   c.field,
+						Field:   c.field + ".image",
 					},
 				},
 			}
@@ -127,7 +127,7 @@ func newVMImageKubernetesVersionChecks(
 			&imageKubernetesVersionCheck{
 				machineDetails: &cd.nutanixClusterConfigSpec.ControlPlane.Nutanix.MachineDetails,
 				field: "cluster.spec.topology.variables[.name=clusterConfig]" +
-					".value.nutanix.controlPlane.machineDetails.image",
+					".value.nutanix.controlPlane.machineDetails",
 				nclient:           cd.nclient,
 				clusterK8sVersion: clusterK8sVersion,
 			},
@@ -140,7 +140,7 @@ func newVMImageKubernetesVersionChecks(
 				&imageKubernetesVersionCheck{
 					machineDetails: &nutanixWorkerNodeConfigSpec.Nutanix.MachineDetails,
 					field: fmt.Sprintf("cluster.spec.topology.workers.machineDeployments[.name=%s]"+
-						".variables[.name=workerConfig].value.nutanix.machineDetails.image", mdName),
+						".variables[.name=workerConfig].value.nutanix.machineDetails", mdName),
 					nclient:           cd.nclient,
 					clusterK8sVersion: clusterK8sVersion,
 				},

pkg/webhook/preflight/nutanix/imagekubernetesversioncheck_test.go

@@ -80,7 +80,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "cluster kubernetes version '1.32.3' is not part of image name 'kubedistro-ubuntu-22.04-vgpu-1.31.5-20250604180644'", //nolint:lll // cause message is long
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -137,7 +137,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "cluster kubernetes version '1.32.3' is not part of image name 'my-custom-image-name'",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -169,7 +169,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "failed to parse kubernetes version 'invalid.version': No Major.Minor.Patch elements found",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -201,7 +201,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "VM image name is empty",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -258,7 +258,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "failed to get VM Image: some error",
-						Field:   "test-field",
+						Field:   "machineDetails.image",
 					},
 				},
 			},
@@ -269,7 +269,7 @@ func TestVMImageCheckWithKubernetesVersion(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			check := &imageKubernetesVersionCheck{
 				machineDetails:    tc.machineDetails,
-				field:             "test-field",
+				field:             "machineDetails",
 				nclient:           tc.nclient,
 				clusterK8sVersion: tc.clusterK8sVersion,
 			}