Merge pull request #9615 from zaneb/path-case

OCPBUGS-54407: Use correct case in path error messages

Author: openshift-merge-bot[bot]

cmd/openshift-install/testdata/agent/image/validations/compact_invalid_controlPlane_replicas.txt

@@ -1,6 +1,6 @@
 ! exec openshift-install agent create image --dir $WORK
 
-stderr 'ControlPlane.Replicas can only be set to 5, 4, 3, or 1. Found 2'
+stderr 'controlPlane.replicas: Unsupported value: 2: supported values: "3", "1", "4", "5"'
 
 ! exists $WORK/agent.x86_64.iso
 ! exists $WORK/auth/kubeconfig
@@ -39,4 +39,4 @@ apiVersion: v1alpha1
 metadata:
   name: ostest
   namespace: cluster0
-rendezvousIP: 192.168.111.20
+rendezvousIP: 192.168.111.20

cmd/openshift-install/testdata/agent/image/validations/sno_invalid_workers.txt

@@ -1,6 +1,6 @@
 ! exec openshift-install agent create image --dir $WORK
 
-stderr 'Total number of Compute.Replicas must be 0 when ControlPlane.Replicas is 1 for platform none or external. Found 1'
+stderr 'Total number of compute replicas must be 0 when controlPlane.replicas is 1 for platform none or external. Found 1'
 
 ! exists $WORK/agent.x86_64.iso
 ! exists $WORK/auth/kubeconfig
@@ -37,4 +37,4 @@ apiVersion: v1alpha1
 metadata:
   name: ostest
   namespace: cluster0
-rendezvousIP: 192.168.111.20
+rendezvousIP: 192.168.111.20

cmd/openshift-install/testdata/agent/image/validations/vsphere_with-partial-credentials.txt

@@ -1,7 +1,7 @@
 ! exec openshift-install agent create image --dir $WORK
 
 stderr 'Invalid value: "diff.openshift.com": server does not exist in vcenters'
-stderr 'Platform.VSphere.failureDomains.topology.folder: Required value: must specify a folder for agent-based installs'
+stderr 'platform.vsphere.failureDomains\[0\].topology.folder: Required value: must specify a folder for agent-based installs'
 
 ! exists $WORK/agent.x86_64.iso
 ! exists $WORK/auth/kubeconfig

pkg/asset/agent/agentconfig/agent_config.go

@@ -168,7 +168,7 @@ func (a *AgentConfig) validateAgent() field.ErrorList {
 		allErrs = append(allErrs, err...)
 	}
 
-	if err := validation.ValidateNTPServers(a.Config.AdditionalNTPSources, field.NewPath("AdditionalNTPSources")); err != nil {
+	if err := validation.ValidateNTPServers(a.Config.AdditionalNTPSources, field.NewPath("additionalNTPSources")); err != nil {
 		allErrs = append(allErrs, err...)
 	}
 

pkg/asset/agent/agentconfig/agent_config_test.go

@@ -123,7 +123,7 @@ additionalNTPSources:
   - invalid_pool.ntp.org
 rendezvousIP: 192.168.111.80`,
 			expectedFound: false,
-			expectedError: "invalid Agent Config configuration: AdditionalNTPSources: Invalid value: \"invalid_pool.ntp.org\": NTP server is not a valid IP or domain name",
+			expectedError: "invalid Agent Config configuration: additionalNTPSources: Invalid value: \"invalid_pool.ntp.org\": NTP server is not a valid IP or domain name",
 		},
 	}
 	for _, tc := range cases {

pkg/asset/agent/agentconfig/agenthosts.go

@@ -122,7 +122,7 @@ func (a *AgentHosts) validateAgentHosts() field.ErrorList {
 
 	macs := make(map[string]bool)
 	for i, host := range a.Hosts {
-		hostPath := field.NewPath("Hosts").Index(i)
+		hostPath := field.NewPath("hosts").Index(i)
 
 		if err := a.validateHostInterfaces(hostPath, host, macs); err != nil {
 			allErrs = append(allErrs, err...)
@@ -147,7 +147,7 @@ func (a *AgentHosts) validateAgentHosts() field.ErrorList {
 func (a *AgentHosts) validateHostInterfaces(hostPath *field.Path, host agent.Host, macs map[string]bool) field.ErrorList {
 	var allErrs field.ErrorList
 
-	interfacePath := hostPath.Child("Interfaces")
+	interfacePath := hostPath.Child("interfaces")
 	if len(host.Interfaces) == 0 {
 		allErrs = append(allErrs, field.Required(interfacePath, "at least one interface must be defined for each node"))
 	}
@@ -194,7 +194,8 @@ func (a *AgentHosts) validateRoles(hostPath *field.Path, host agent.Host) field.
 	var allErrs field.ErrorList
 
 	if len(host.Role) > 0 && host.Role != masterRole && host.Role != workerRole {
-		allErrs = append(allErrs, field.Forbidden(hostPath.Child("Host"), "host role has incorrect value. Role must either be 'master' or 'worker'"))
+		allErrs = append(allErrs, field.NotSupported(hostPath.Child("role"), host.Role,
+			[]string{masterRole, workerRole}))
 	}
 
 	return allErrs
@@ -208,7 +209,7 @@ func (a *AgentHosts) validateRendezvousIPNotWorker(rendezvousIP string, hosts []
 			if host.Role != workerRole {
 				continue
 			}
-			hostPath := field.NewPath("Hosts").Index(i)
+			hostPath := field.NewPath("hosts").Index(i)
 			hostIPs, err := agentAsset.GetAllHostIPs(host.NetworkConfig)
 			if err != nil {
 				allErrs = append(allErrs, field.Invalid(hostPath, host.NetworkConfig, err.Error()))
@@ -217,7 +218,7 @@ func (a *AgentHosts) validateRendezvousIPNotWorker(rendezvousIP string, hosts []
 			_, found := hostIPs[rendezvousIP]
 			if found {
 				errMsg := "Host " + host.Hostname + " has role 'worker' and has the rendezvousIP assigned to it. The rendezvousIP must be assigned to a control plane host."
-				allErrs = append(allErrs, field.Forbidden(hostPath.Child("Host"), errMsg))
+				allErrs = append(allErrs, field.Forbidden(hostPath.Child("role"), errMsg))
 			}
 		}
 	}

pkg/asset/agent/agentconfig/agenthosts_test.go

@@ -197,7 +197,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigUnsupportedDeviceName(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].rootDeviceHints.deviceName: Invalid value: \"/dev/disk/by-id/wwn-0x600508e000000000ce506dc50ab0ad05\": Device Name of root device hint must be path in /dev/ or /dev/disk/by-path/",
+			expectedError:  "invalid Hosts configuration: hosts[0].rootDeviceHints.deviceName: Invalid value: \"/dev/disk/by-id/wwn-0x600508e000000000ce506dc50ab0ad05\": Device Name of root device hint must be path in /dev/ or /dev/disk/by-path/",
 			expectedConfig: nil,
 		},
 		{
@@ -208,7 +208,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigUnsupportedWWNExtension(),
 				getNoHostsAgentConfig(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].rootDeviceHints.wwnWithExtension: Forbidden: WWN extensions are not supported in root device hints",
+			expectedError:  "invalid Hosts configuration: hosts[0].rootDeviceHints.wwnWithExtension: Forbidden: WWN extensions are not supported in root device hints",
 			expectedConfig: nil,
 		},
 		{
@@ -219,7 +219,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigUnsupportedWWNVendorExtension(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].rootDeviceHints.wwnVendorExtension: Forbidden: WWN vendor extensions are not supported in root device hints",
+			expectedError:  "invalid Hosts configuration: hosts[0].rootDeviceHints.wwnVendorExtension: Forbidden: WWN vendor extensions are not supported in root device hints",
 			expectedConfig: nil,
 		},
 		{
@@ -240,7 +240,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigInvalidHostRole(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].Host: Forbidden: host role has incorrect value. Role must either be 'master' or 'worker'",
+			expectedError:  "invalid Hosts configuration: hosts[0].role: Unsupported value: \"invalid-role\": supported values: \"master\", \"worker\"",
 			expectedConfig: nil,
 		},
 		{
@@ -251,7 +251,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSameMac(),
 				getNoHostsAgentConfig(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[1].Interfaces[0].macAddress: Invalid value: \"28:d2:44:b0:bf:01\": duplicate MAC address found",
+			expectedError:  "invalid Hosts configuration: hosts[1].interfaces[0].macAddress: Invalid value: \"28:d2:44:b0:bf:01\": duplicate MAC address found",
 			expectedConfig: nil,
 		},
 		{
@@ -262,7 +262,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigInvalidMac(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].Interfaces[0].macAddress: Invalid value: \"000000\": address 000000: invalid MAC address",
+			expectedError:  "invalid Hosts configuration: hosts[0].interfaces[0].macAddress: Invalid value: \"000000\": address 000000: invalid MAC address",
 			expectedConfig: nil,
 		},
 		{
@@ -273,7 +273,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigInvalidInterfaces(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].Interfaces[1].macAddress: Invalid value: \"28:d2:44:d2:b2:1a\": duplicate MAC address found",
+			expectedError:  "invalid Hosts configuration: hosts[0].interfaces[1].macAddress: Invalid value: \"28:d2:44:d2:b2:1a\": duplicate MAC address found",
 			expectedConfig: nil,
 		},
 		{
@@ -284,7 +284,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigInvalidInterfaces(),
 				getNoHostsAgentConfig(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].Interfaces[1].macAddress: Invalid value: \"28:d2:44:b0:bf:01\": duplicate MAC address found",
+			expectedError:  "invalid Hosts configuration: hosts[0].interfaces[1].macAddress: Invalid value: \"28:d2:44:b0:bf:01\": duplicate MAC address found",
 			expectedConfig: nil,
 		},
 		{
@@ -295,7 +295,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigInvalidRendezvousIP(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[1].Host: Forbidden: Host test-2 has role 'worker' and has the rendezvousIP assigned to it. The rendezvousIP must be assigned to a control plane host.",
+			expectedError:  "invalid Hosts configuration: hosts[1].role: Forbidden: Host test-2 has role 'worker' and has the rendezvousIP assigned to it. The rendezvousIP must be assigned to a control plane host.",
 			expectedConfig: nil,
 		},
 		{
@@ -306,7 +306,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigInvalidRendezvousIP(),
 				getNoHostsAgentConfig(),
 			},
-			expectedError:  "invalid Hosts configuration: Hosts[0].Host: Forbidden: Host test has role 'worker' and has the rendezvousIP assigned to it. The rendezvousIP must be assigned to a control plane host.",
+			expectedError:  "invalid Hosts configuration: hosts[0].role: Forbidden: Host test has role 'worker' and has the rendezvousIP assigned to it. The rendezvousIP must be assigned to a control plane host.",
 			expectedConfig: nil,
 		},
 		{
@@ -317,7 +317,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 				getInstallConfigSingleHost(),
 				getAgentConfigMissingInterfaces(),
 			},
-			expectedError:  "invalid Hosts configuration: [Hosts[0].Interfaces: Required value: at least one interface must be defined for each node, Hosts[1].Interfaces: Required value: at least one interface must be defined for each node, Hosts[2].Interfaces: Required value: at least one interface must be defined for each node]",
+			expectedError:  "invalid Hosts configuration: [hosts[0].interfaces: Required value: at least one interface must be defined for each node, hosts[1].interfaces: Required value: at least one interface must be defined for each node, hosts[2].interfaces: Required value: at least one interface must be defined for each node]",
 			expectedConfig: nil,
 		},
 		{