fix: Use correct field when unmarshal error happens

dlipovetsky · dlipovetsky · commit 21b81fd24bdd · 2025-07-24T12:00:07.000-07:00
diff --git a/pkg/webhook/preflight/generic/spec.go b/pkg/webhook/preflight/generic/spec.go
@@ -50,7 +50,7 @@ func newConfigurationCheck(
 					carenv1.ClusterConfigVariableName,
 					err,
 				),
-				Field: "$.spec.topology.variables[?@.name==\"clusterConfig\"].genericClusterConfigSpec",
+				Field: "$.spec.topology.variables[?@.name==\"clusterConfig\"]",
 			},
 		)
 	}
diff --git a/pkg/webhook/preflight/generic/spec_test.go b/pkg/webhook/preflight/generic/spec_test.go
@@ -107,7 +107,7 @@ func TestNewConfigurationCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "Failed to unmarshal cluster variable \"clusterConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.
-						Field:   "$.spec.topology.variables[?@.name==\"clusterConfig\"].genericClusterConfigSpec",
+						Field:   "$.spec.topology.variables[?@.name==\"clusterConfig\"]",
 					},
 				},
 			},
diff --git a/pkg/webhook/preflight/nutanix/specs.go b/pkg/webhook/preflight/nutanix/specs.go
@@ -56,7 +56,7 @@ func newConfigurationCheck(
 					carenv1.ClusterConfigVariableName,
 					err,
 				),
-				Field: "$.spec.topology.variables[?@.name==\"clusterConfig\"].value.nutanix",
+				Field: "$.spec.topology.variables[?@.name==\"clusterConfig\"]",
 			},
 		)
 	}
@@ -88,7 +88,7 @@ func newConfigurationCheck(
 				)
 				if workerConfigVar != nil {
 					workerConfigFieldPath = fmt.Sprintf(
-						"$.spec.topology.workers.machineDeployments[?@.name==%q].variables[?@.name=='%s'].value.nutanix",
+						"$.spec.topology.workers.machineDeployments[?@.name==%q].variables[?@.name=='%s']",
 						md.Name,
 						carenv1.WorkerConfigVariableName,
 					)
@@ -101,7 +101,7 @@ func newConfigurationCheck(
 				)
 				if workerConfigVar != nil {
 					workerConfigFieldPath = fmt.Sprintf(
-						"$.spec.topology.variables[?@.name=='%s'].value.nutanix",
+						"$.spec.topology.variables[?@.name=='%s']",
 						carenv1.WorkerConfigVariableName,
 					)
 				}
diff --git a/pkg/webhook/preflight/nutanix/specs_test.go b/pkg/webhook/preflight/nutanix/specs_test.go
@@ -138,7 +138,7 @@ func TestNewConfigurationCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "Failed to unmarshal cluster variable \"clusterConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.
-						Field:   "$.spec.topology.variables[?@.name==\"clusterConfig\"].value.nutanix",
+						Field:   "$.spec.topology.variables[?@.name==\"clusterConfig\"]",
 					},
 				},
 			},
@@ -185,7 +185,7 @@ func TestNewConfigurationCheck(t *testing.T) {
 				Causes: []preflight.Cause{
 					{
 						Message: "Failed to unmarshal variable \"workerConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.
-						Field:   "$.spec.topology.workers.machineDeployments[?@.name==\"md-0\"].variables[?@.name=='workerConfig'].value.nutanix",                                                 ///nolint:lll // The field is long.
+						Field:   "$.spec.topology.workers.machineDeployments[?@.name==\"md-0\"].variables[?@.name=='workerConfig']",                                                               ///nolint:lll // The field is long.
 					},
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func newConfigurationCheck(`
`50`	`50`	`carenv1.ClusterConfigVariableName,`
`51`	`51`	`err,`
`52`	`52`	`),`
`53`		`- Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"].genericClusterConfigSpec",`
	`53`	`+ Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"]",`
`54`	`54`	`},`
`55`	`55`	`)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func TestNewConfigurationCheck(t *testing.T) {`
`107`	`107`	`Causes: []preflight.Cause{`
`108`	`108`	`{`
`109`	`109`	`Message: "Failed to unmarshal cluster variable \"clusterConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.`
`110`		`- Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"].genericClusterConfigSpec",`
	`110`	`+ Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"]",`
`111`	`111`	`},`
`112`	`112`	`},`
`113`	`113`	`},`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func newConfigurationCheck(`
`56`	`56`	`carenv1.ClusterConfigVariableName,`
`57`	`57`	`err,`
`58`	`58`	`),`
`59`		`- Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"].value.nutanix",`
	`59`	`+ Field: "$.spec.topology.variables[[email protected]==\"clusterConfig\"]",`
`60`	`60`	`},`
`61`	`61`	`)`
`62`	`62`	`}`
`@@ -88,7 +88,7 @@ func newConfigurationCheck(`
`88`	`88`	`)`
`89`	`89`	`if workerConfigVar != nil {`
`90`	`90`	`workerConfigFieldPath = fmt.Sprintf(`
`91`		`- "$.spec.topology.workers.machineDeployments[[email protected]==%q].variables[[email protected]=='%s'].value.nutanix",`
	`91`	`+ "$.spec.topology.workers.machineDeployments[[email protected]==%q].variables[[email protected]=='%s']",`
`92`	`92`	`md.Name,`
`93`	`93`	`carenv1.WorkerConfigVariableName,`
`94`	`94`	`)`
`@@ -101,7 +101,7 @@ func newConfigurationCheck(`
`101`	`101`	`)`
`102`	`102`	`if workerConfigVar != nil {`
`103`	`103`	`workerConfigFieldPath = fmt.Sprintf(`
`104`		`- "$.spec.topology.variables[[email protected]=='%s'].value.nutanix",`
	`104`	`+ "$.spec.topology.variables[[email protected]=='%s']",`
`105`	`105`	`carenv1.WorkerConfigVariableName,`
`106`	`106`	`)`
`107`	`107`	`}`
-Original file line number
+Diff line change
 				Causes: []preflight.Cause{
+					{
 						Message: "Failed to unmarshal cluster variable \"clusterConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.
 -						Field:   "$.spec.topology.variables[[email protected]==\"clusterConfig\"].value.nutanix",
 +						Field:   "$.spec.topology.variables[[email protected]==\"clusterConfig\"]",
 					},
 				},
 			},
 				Causes: []preflight.Cause{
+					{
 						Message: "Failed to unmarshal variable \"workerConfig\": failed to unmarshal json: invalid character 'i' looking for beginning of object key string. Review the Cluster.", ///nolint:lll // The message is long.
 -						Field:   "$.spec.topology.workers.machineDeployments[[email protected]==\"md-0\"].variables[[email protected]=='workerConfig'].value.nutanix",                                                 ///nolint:lll // The field is long.
 +						Field:   "$.spec.topology.workers.machineDeployments[[email protected]==\"md-0\"].variables[[email protected]=='workerConfig']",                                                               ///nolint:lll // The field is long.
 					},
 				},
 			},