Use new error message

sjberman · sjberman · commit 93d033233c53 · 2024-12-17T11:41:02.000-07:00
diff --git a/internal/mode/static/state/graph/nginxproxy.go b/internal/mode/static/state/graph/nginxproxy.go
@@ -208,7 +208,7 @@ func validateRewriteClientIP(npCfg *ngfAPI.NginxProxy) field.ErrorList {
 		if len(rewriteClientIP.TrustedAddresses) > 16 {
 			allErrs = append(
 				allErrs,
-				field.TooLongMaxLength(trustedAddressesPath, rewriteClientIP.TrustedAddresses, 16),
+				field.TooMany(trustedAddressesPath, len(rewriteClientIP.TrustedAddresses), 16),
 			)
 		}
 
diff --git a/internal/mode/static/state/graph/nginxproxy_test.go b/internal/mode/static/state/graph/nginxproxy_test.go
@@ -551,7 +551,7 @@ func TestValidateRewriteClientIP(t *testing.T) {
 				},
 			},
 			expectErrCount: 1,
-			errorString:    "spec.rewriteClientIP.trustedAddresses: Too long: may not be longer than 16",
+			errorString:    "spec.rewriteClientIP.trustedAddresses: Too many: 21: must have at most 16 items",
 		},
 		{
 			name:      "invalid when mode is not proxyProtocol or XForwardedFor",

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func validateRewriteClientIP(npCfg *ngfAPI.NginxProxy) field.ErrorList {`
`208`	`208`	`if len(rewriteClientIP.TrustedAddresses) > 16 {`
`209`	`209`	`allErrs = append(`
`210`	`210`	`allErrs,`
`211`		`- field.TooLongMaxLength(trustedAddressesPath, rewriteClientIP.TrustedAddresses, 16),`
	`211`	`+ field.TooMany(trustedAddressesPath, len(rewriteClientIP.TrustedAddresses), 16),`
`212`	`212`	`)`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ func TestValidateRewriteClientIP(t *testing.T) {`
`551`	`551`	`},`
`552`	`552`	`},`
`553`	`553`	`expectErrCount: 1,`
`554`		`- errorString: "spec.rewriteClientIP.trustedAddresses: Too long: may not be longer than 16",`
	`554`	`+ errorString: "spec.rewriteClientIP.trustedAddresses: Too many: 21: must have at most 16 items",`
`555`	`555`	`},`
`556`	`556`	`{`
`557`	`557`	`name: "invalid when mode is not proxyProtocol or XForwardedFor",`