From 4bd17e9ed310a0ca41e4e5b7f1729c6e1ba7937f Mon Sep 17 00:00:00 2001 From: Travis Raines Date: Wed, 28 Oct 2020 16:18:44 -0700 Subject: [PATCH] pr(parser) use consistent caps and label unsafe Use SNI (rather than sni) throughout, and prefix which version is unsafe rather than which version is safe. --- .../ingress/controller/parser/kongstate/route.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/ingress/controller/parser/kongstate/route.go b/internal/ingress/controller/parser/kongstate/route.go index 001681425e..0921a5798e 100644 --- a/internal/ingress/controller/parser/kongstate/route.go +++ b/internal/ingress/controller/parser/kongstate/route.go @@ -290,17 +290,17 @@ func (r *Route) overrideByKongIngress(log logrus.FieldLogger, kongIngress *confi r.PathHandling = kong.String(*ir.PathHandling) } if len(ir.SNIs) != 0 { - var snis []*string - for _, sni := range ir.SNIs { - sanitizedSNI := strings.TrimSpace(*sni) - if validSNIs.MatchString(sanitizedSNI) { - snis = append(snis, kong.String(sanitizedSNI)) + var SNIs []*string + for _, unsanitizedSNI := range ir.SNIs { + SNI := strings.TrimSpace(*unsanitizedSNI) + if validSNIs.MatchString(SNI) { + SNIs = append(SNIs, kong.String(SNI)) } else { // SNI is not a valid hostname - log.WithField("kongroute", ir.Name).Errorf("invalid SNI: %v", sni) + log.WithField("kongroute", ir.Name).Errorf("invalid SNI: %v", unsanitizedSNI) return } } - r.SNIs = snis + r.SNIs = SNIs } }