Update VCL templates for the changed VMOD selector interface.

pkg/varnish/vcl/recv_disposition_tmpl.go

@@ -44,10 +44,8 @@ sub vcl_init {
 	new {{reqObj $didx $cidx}} = {{vmod $c.Compare}}.set({{reqFlags $c}});
 	{{- range $val := $c.Values}}
 	{{reqObj $didx $cidx}}.add("{{$val}}");
-        {{- end}}
-        {{- if needsCompile $c.Compare}}
-	{{reqObj $didx $cidx}}.compile();
 	{{- end}}
+	{{reqObj $didx $cidx}}.compile();
 }
 
 {{end -}}
@@ -110,12 +108,11 @@ func reqValue(cond Condition) string {
 }
 
 var reqDispFuncs = template.FuncMap{
-	"exists":       func(cmp CompareType) bool { return cmp == Exists },
-	"match":        func(cmp CompareType) string { return match(cmp) },
-	"needsCompile": func(cmp CompareType) bool { return cmp == Match },
-	"value":        func(cond Condition) string { return reqValue(cond) },
-	"vmod":         func(cmp CompareType) string { return vmod(cmp) },
-	"reqFlags":     func(cond Condition) string { return reqFlags(cond) },
+	"exists":   func(cmp CompareType) bool { return cmp == Exists },
+	"match":    func(cmp CompareType) string { return match(cmp) },
+	"value":    func(cond Condition) string { return reqValue(cond) },
+	"vmod":     func(cmp CompareType) string { return vmod(cmp) },
+	"reqFlags": func(cond Condition) string { return reqFlags(cond) },
 	"cmpRelation": func(cmp CompareType, negate bool) string {
 		return cmpRelation(cmp, negate)
 	},

pkg/varnish/vcl/rewrite_tmpl.go

@@ -48,10 +48,8 @@ sub vcl_init {
 		{{- if needsRegex $r}}, regex="{{saveRegex $r $rule}}"{{end -}}
 		{{- if needsNeverCapture $r}}, never_capture=true{{end -}}
 		);
-        {{- end}}
-        {{- if needsCompile $r.Compare}}
-	{{rewrName $i}}.compile();
 	{{- end}}
+	{{rewrName $i}}.compile();
 }
 {{- end}}
 
@@ -212,7 +210,6 @@ func rewrOp(rewr Rewrite) string {
 var rewriteFuncs = template.FuncMap{
 	"match":        func(cmp CompareType) string { return match(cmp) },
 	"needsMatcher": func(rewr Rewrite) bool { return needsMatcher(rewr) },
-	"needsCompile": func(cmp CompareType) bool { return cmp == Match },
 	"needsSave":    func(rewr Rewrite) bool { return needsSave(rewr) },
 	"rewrFlags":    func(rewr Rewrite) string { return rewrFlags(rewr) },
 	"rewrSub":      func(rewr Rewrite) string { return rewrSub(rewr) },

pkg/varnish/vcl/testdata/recv_disp_builtin.golden

@@ -5,6 +5,7 @@ import selector;
 sub vcl_init {
 	new vk8s_reqdisp_1_2 = selector.set(case_sensitive=false);
 	vk8s_reqdisp_1_2.add("HTTP/1.1");
+	vk8s_reqdisp_1_2.compile();
 }
 
 sub vcl_init {
@@ -16,12 +17,14 @@ sub vcl_init {
 	vk8s_reqdisp_2_0.add("TRACE");
 	vk8s_reqdisp_2_0.add("OPTIONS");
 	vk8s_reqdisp_2_0.add("DELETE");
+	vk8s_reqdisp_2_0.compile();
 }
 
 sub vcl_init {
 	new vk8s_reqdisp_3_0 = selector.set();
 	vk8s_reqdisp_3_0.add("GET");
 	vk8s_reqdisp_3_0.add("HEAD");
+	vk8s_reqdisp_3_0.compile();
 }
 
 

pkg/varnish/vcl/testdata/recv_disp_method_not_allowed.golden

@@ -11,6 +11,7 @@ sub vcl_init {
 	vk8s_reqdisp_0_0.add("TRACE");
 	vk8s_reqdisp_0_0.add("OPTIONS");
 	vk8s_reqdisp_0_0.add("DELETE");
+	vk8s_reqdisp_0_0.compile();
 }
 
 

pkg/varnish/vcl/testdata/recv_disp_non_cacheable.golden

@@ -8,6 +8,7 @@ sub vcl_init {
 	vk8s_reqdisp_0_0.add("/basket/");
 	vk8s_reqdisp_0_0.add("/personal");
 	vk8s_reqdisp_0_0.add("/dynamic/");
+	vk8s_reqdisp_0_0.compile();
 }
 
 

pkg/varnish/vcl/testdata/recv_disp_url_whitelist.golden

@@ -8,6 +8,7 @@ sub vcl_init {
 	vk8s_reqdisp_0_0.add("/bar");
 	vk8s_reqdisp_0_0.add("/baz");
 	vk8s_reqdisp_0_0.add("/quux");
+	vk8s_reqdisp_0_0.compile();
 }
 
 

pkg/varnish/vcl/testdata/rewrite_conditional_delete.golden

@@ -8,6 +8,7 @@ sub vcl_init {
 	vk8s_rewrite_0.add("yes", string="");
 	vk8s_rewrite_0.add("on", string="");
 	vk8s_rewrite_0.add("1", string="");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_deliver {

pkg/varnish/vcl/testdata/rewrite_fixed_equal.golden

@@ -6,6 +6,7 @@ sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("/foo/", string="/bar/", regex="^\Q/foo/\E$");
 	vk8s_rewrite_0.add("/baz/", string="/quux/", regex="^\Q/baz/\E$");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_backend_fetch {

pkg/varnish/vcl/testdata/rewrite_fixed_prefix.golden

@@ -6,6 +6,7 @@ sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("/foo/", string="/bar/", regex="^\Q/foo/\E");
 	vk8s_rewrite_0.add("/baz/", string="/quux/", regex="^\Q/baz/\E");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_backend_fetch {

pkg/varnish/vcl/testdata/rewrite_fixed_suball.golden

@@ -6,6 +6,7 @@ sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("/foo/", string="/bar/", regex="^\Q/foo/\E");
 	vk8s_rewrite_0.add("/baz/", string="/quux/", regex="^\Q/baz/\E");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_backend_fetch {

pkg/varnish/vcl/testdata/rewrite_replace_from_rewrite.golden

@@ -6,6 +6,7 @@ sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("cafe.example.com", string="my-cafe.com");
 	vk8s_rewrite_0.add("another.example.com", string="my-example.com");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_recv {

pkg/varnish/vcl/testdata/rewrite_select_first.golden

@@ -8,6 +8,7 @@ sub vcl_init {
 	vk8s_rewrite_0.add("/tea/foo/bar/baz", string="Baz");
 	vk8s_rewrite_0.add("/tea/foo/bar", string="Bar");
 	vk8s_rewrite_0.add("/tea/foo", string="Foo");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_backend_fetch {

pkg/varnish/vcl/testdata/rewrite_select_ops.golden

@@ -5,6 +5,7 @@ import selector;
 sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("/foo", string="foo", regex="^\Q/foo\E");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_deliver {
@@ -16,6 +17,7 @@ sub vcl_deliver {
 }sub vcl_init {
 	new vk8s_rewrite_1 = selector.set();
 	vk8s_rewrite_1.add("/foo", string="foo", regex="^\Q/foo\E");
+	vk8s_rewrite_1.compile();
 }
 
 sub vcl_deliver {

pkg/varnish/vcl/testdata/rewrite_select_permute.golden

@@ -5,6 +5,7 @@ import selector;
 sub vcl_init {
 	new vk8s_rewrite_0 = selector.set();
 	vk8s_rewrite_0.add("/foo", string="bar");
+	vk8s_rewrite_0.compile();
 }
 
 sub vcl_recv {
@@ -19,6 +20,7 @@ sub vcl_recv {
 }sub vcl_init {
 	new vk8s_rewrite_1 = selector.set();
 	vk8s_rewrite_1.add("/foo", string="bar");
+	vk8s_rewrite_1.compile();
 }
 
 sub vcl_recv {
@@ -28,6 +30,7 @@ sub vcl_recv {
 }sub vcl_init {
 	new vk8s_rewrite_2 = selector.set();
 	vk8s_rewrite_2.add("/foo", string="bar");
+	vk8s_rewrite_2.compile();
 }
 
 sub vcl_recv {
@@ -37,6 +40,7 @@ sub vcl_recv {
 }sub vcl_init {
 	new vk8s_rewrite_3 = selector.set();
 	vk8s_rewrite_3.add("/foo", string="bar");
+	vk8s_rewrite_3.compile();
 }
 
 sub vcl_recv {
@@ -46,6 +50,7 @@ sub vcl_recv {
 }sub vcl_init {
 	new vk8s_rewrite_4 = selector.set();
 	vk8s_rewrite_4.add("/foo", string="bar");
+	vk8s_rewrite_4.compile();
 }
 
 sub vcl_recv {
@@ -55,6 +60,7 @@ sub vcl_recv {
 }sub vcl_init {
 	new vk8s_rewrite_5 = selector.set();
 	vk8s_rewrite_5.add("/foo", string="bar");
+	vk8s_rewrite_5.compile();
 }
 
 sub vcl_recv {