Merge pull request #2022 from robscott/v0.7.0-fixes

Replacing fmt.Sprintln with plain strings
kubernetes-sigs · May 15, 2023 · 551baa6 · 551baa6
2 parents ac5b0bb + e568e2a
commit 551baa6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/apis/v1beta1/validation/gateway.go b/apis/v1beta1/validation/gateway.go
@@ -121,7 +121,7 @@ func ValidateTLSCertificateRefs(listeners []gatewayv1b1.Listener, path *field.Pa
 	for i, c := range listeners {
 		if isProtocolInSubset(c.Protocol, protocolsTLSRequired) && c.TLS != nil {
 			if *c.TLS.Mode == gatewayv1b1.TLSModeTerminate && len(c.TLS.CertificateRefs) == 0 {
-				errs = append(errs, field.Forbidden(path.Index(i).Child("tls").Child("certificateRefs"), fmt.Sprintln("should be set and not empty when TLSModeType is Terminate")))
+				errs = append(errs, field.Forbidden(path.Index(i).Child("tls").Child("certificateRefs"), "should be set and not empty when TLSModeType is Terminate"))
 			}
 		}
 	}
@@ -135,7 +135,7 @@ func ValidateListenerNames(listeners []gatewayv1b1.Listener, path *field.Path) f
 	nameMap := make(map[gatewayv1b1.SectionName]struct{}, len(listeners))
 	for i, c := range listeners {
 		if _, found := nameMap[c.Name]; found {
-			errs = append(errs, field.Duplicate(path.Index(i).Child("name"), fmt.Sprintln("must be unique within the Gateway")))
+			errs = append(errs, field.Duplicate(path.Index(i).Child("name"), "must be unique within the Gateway"))
 		}
 		nameMap[c.Name] = struct{}{}
 	}
@@ -156,7 +156,7 @@ func validateHostnameProtocolPort(listeners []gatewayv1b1.Listener, path *field.
 		port := listener.Port
 		hostnameProtocolPort := fmt.Sprintf("%s:%s:%d", *hostname, protocol, port)
 		if hostnameProtocolPortSets.Has(hostnameProtocolPort) {
-			errs = append(errs, field.Duplicate(path.Index(i), fmt.Sprintln("combination of port, protocol, and hostname must be unique for each listener")))
+			errs = append(errs, field.Duplicate(path.Index(i), "combination of port, protocol, and hostname must be unique for each listener"))
 		} else {
 			hostnameProtocolPortSets.Insert(hostnameProtocolPort)
 		}
@@ -173,7 +173,7 @@ func validateGatewayAddresses(addresses []gatewayv1b1.GatewayAddress, path *fiel
 		if address.Type != nil {
 			if *address.Type == gatewayv1b1.IPAddressType {
 				if _, err := netip.ParseAddr(address.Value); err != nil {
-					errs = append(errs, field.Invalid(path.Index(i), address.Value, fmt.Sprintln("invalid ip address")))
+					errs = append(errs, field.Invalid(path.Index(i), address.Value, "invalid ip address"))
 				}
 				if ipAddrSet.Has(address.Value) {
 					errs = append(errs, field.Duplicate(path.Index(i), address.Value))

diff --git a/apis/v1beta1/validation/gateway_test.go b/apis/v1beta1/validation/gateway_test.go
@@ -169,7 +169,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeForbidden,
 					Field:    "spec.listeners[0].tls.certificateRefs",
-					Detail:   "should be set and not empty when TLSModeType is Terminate\n",
+					Detail:   "should be set and not empty when TLSModeType is Terminate",
 					BadValue: "",
 				},
 			},
@@ -187,7 +187,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeForbidden,
 					Field:    "spec.listeners[0].tls.certificateRefs",
-					Detail:   "should be set and not empty when TLSModeType is Terminate\n",
+					Detail:   "should be set and not empty when TLSModeType is Terminate",
 					BadValue: "",
 				},
 			},
@@ -209,7 +209,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeDuplicate,
 					Field:    "spec.listeners[1].name",
-					BadValue: "must be unique within the Gateway\n",
+					BadValue: "must be unique within the Gateway",
 				},
 			},
 		},
@@ -233,7 +233,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeDuplicate,
 					Field:    "spec.listeners[1]",
-					BadValue: "combination of port, protocol, and hostname must be unique for each listener\n",
+					BadValue: "combination of port, protocol, and hostname must be unique for each listener",
 				},
 			},
 		},
@@ -254,7 +254,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeDuplicate,
 					Field:    "spec.listeners[1]",
-					BadValue: "combination of port, protocol, and hostname must be unique for each listener\n",
+					BadValue: "combination of port, protocol, and hostname must be unique for each listener",
 				},
 			},
 		},
@@ -363,7 +363,7 @@ func TestValidateGateway(t *testing.T) {
 				{
 					Type:     field.ErrorTypeInvalid,
 					Field:    "spec.addresses[0]",
-					Detail:   "invalid ip address\n",
+					Detail:   "invalid ip address",
 					BadValue: "1.2.3.4:8080",
 				},
 				{