changed matchString to matchPattern and made the default to anchor the

pattern at the beginning  and end of lines

Author: JacobTanenbaum

images/router/haproxy/conf/haproxy-config.template

@@ -227,7 +227,7 @@ backend be_edge_http_{{$cfgIdx}}
   balance leastconn
     {{ end }}
     {{ with $value := index $cfg.Annotations "router.openshift.io/haproxy.timeout"}}
-      {{if (matchString "^[1-9][0-9]*(us|ms|s|m|h|d)?$" $value) }}
+      {{if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" $value) }}
   timeout server  {{$value}}
       {{ end }}
     {{ end }}
@@ -265,7 +265,7 @@ backend be_tcp_{{$cfgIdx}}
   balance {{ env "ROUTER_TCP_BALANCE_SCHEME" "source" }}
     {{ end }}
     {{ with $value := index $cfg.Annotations "router.openshift.io/haproxy.timeout"}}
-      {{if (matchString "^[1-9][0-9]*(us|ms|s|m|h|d)?$" $value) }}
+      {{if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" $value) }}
   timeout server  {{$value}}
       {{ end }}
     {{ end }}
@@ -293,7 +293,7 @@ backend be_secure_{{$cfgIdx}}
   balance leastconn
     {{ end }}
     {{ with $value := index $cfg.Annotations "router.openshift.io/haproxy.timeout"}}
-      {{if (matchString "^[1-9][0-9]*(us|ms|s|m|h|d)?$" $value) }}
+      {{if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" $value) }}
   timeout server  {{$value}}
       {{ end }}
     {{ end }}

pkg/router/template/plugin.go

@@ -99,7 +99,7 @@ func NewTemplatePlugin(cfg TemplatePluginConfig) (*TemplatePlugin, error) {
 	globalFuncs := template.FuncMap{
 		"endpointsForAlias": endpointsForAlias,
 		"env":               env,
-		"matchString":       matchString,
+		"matchPattern":      matchPattern,
 		"isInteger":         isInteger,
 		"matchValues":       matchValues,
 	}

pkg/router/template/router.go

@@ -187,14 +187,14 @@ func matchValues(s string, allowedValues ...string) bool {
 	return false
 }
 
-func matchString(pattern, s string) bool {
-	glog.V(4).Infof("Matchstring called with %s and %s", pattern, s)
-	status, err := regexp.MatchString(pattern, s)
+func matchPattern(pattern, s string) bool {
+	glog.V(4).Infof("matchPattern called with %s and %s", pattern, s)
+	status, err := regexp.MatchString("^"+pattern+"$", s)
 	if err == nil {
 		glog.V(4).Infof("Matchstring returning status: %v", status)
 		return status
 	}
-	glog.Errorf("Error with regex pattern in call to matchString: %v", err)
+	glog.Errorf("Error with regex pattern in call to matchPattern: %v", err)
 	return false
 }