Use new error message

Author: sjberman

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),
 			)
 		}
 

internal/mode/static/state/graph/nginxproxy_test.go

@@ -2,6 +2,7 @@ package graph
 
 import (
 	"errors"
+	"fmt"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -551,7 +552,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",
@@ -621,6 +622,7 @@ func TestValidateRewriteClientIP(t *testing.T) {
 			g := NewWithT(t)
 
 			allErrs := validateRewriteClientIP(test.np)
+			fmt.Println(allErrs)
 			g.Expect(allErrs).To(HaveLen(test.expectErrCount))
 			if len(allErrs) > 0 {
 				g.Expect(allErrs.ToAggregate().Error()).To(Equal(test.errorString))