Skip to content

Replacing fmt.Sprintln with plain strings #2022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
May 15, 2023
Merged

Replacing fmt.Sprintln with plain strings #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apis/v1beta1/validation/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
}
Expand All @@ -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{}{}
}
Expand All @@ -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)
}
Expand All @@ -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))
Expand Down
12 changes: 6 additions & 6 deletions apis/v1beta1/validation/gateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
},
},
Expand All @@ -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: "",
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand Down Expand Up @@ -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",
},
{
Expand Down