ACL template source is an internal variable, not an external file.

pkg/varnish/vcl/acl.tmpl → pkg/varnish/vcl/acl_tmpl.go

+/*
+ * Copyright (c) 2020 UPLEX Nils Goroll Systemoptimierung
+ * All rights reserved
+ *
+ * Author: Geoffrey Simmons <geoffrey.simmons@uplex.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
+package vcl
+
+import "text/template"
+
+const aclTmplSrc = `
 import std;
 
 {{- range .ACLs}}
@@ -34,3 +66,9 @@ sub vcl_recv {
 	{{- end}}
 	{{- end}}
 }
+`
+
+const aclTmplName = "acl"
+
+var aclTmpl = template.Must(template.New(aclTmplName).Funcs(fMap).
+	Parse(aclTmplSrc))

pkg/varnish/vcl/template.go

@@ -145,7 +145,6 @@ var fMap = template.FuncMap{
 }
 
 const (
-	aclTmplSrc     = "acl.tmpl"
 	rewriteTmplSrc = "rewrite.tmpl"
 	reqDispTmplSrc = "recv_disposition.tmpl"
 
@@ -156,7 +155,6 @@ const (
 )
 
 var (
-	aclTmpl     *template.Template
 	rewriteTmpl *template.Template
 	reqDispTmpl *template.Template
 	vclIllegal  = regexp.MustCompile("[^[:word:]-]+")
@@ -165,15 +163,9 @@ var (
 // InitTemplates initializes templates for VCL generation.
 func InitTemplates(tmplDir string) error {
 	var err error
-	aclTmplPath := path.Join(tmplDir, aclTmplSrc)
 	rewriteTmplPath := path.Join(tmplDir, rewriteTmplSrc)
 	reqDispTmplPath := path.Join(tmplDir, reqDispTmplSrc)
 
-	aclTmpl, err = template.New(aclTmplSrc).
-		Funcs(fMap).ParseFiles(aclTmplPath)
-	if err != nil {
-		return err
-	}
 	rewriteTmpl, err = template.New(rewriteTmplSrc).
 		Funcs(fMap).ParseFiles(rewriteTmplPath)
 	if err != nil {

pkg/varnish/vcl/vcl_test.go

@@ -35,7 +35,6 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"text/template"
 )
 
 func cmpGold(got []byte, goldfile string) (bool, error) {
@@ -455,14 +454,8 @@ var acls = Spec{
 func TestAclTemplate(t *testing.T) {
 	var buf bytes.Buffer
 	gold := "acl.golden"
-	tmplName := "acl.tmpl"
 
-	tmpl, err := template.New(tmplName).Funcs(fMap).ParseFiles(tmplName)
-	if err != nil {
-		t.Error("Cannot parse acl template:", err)
-		return
-	}
-	if err := tmpl.Execute(&buf, acls); err != nil {
+	if err := aclTmpl.Execute(&buf, acls); err != nil {
 		t.Error("acls template Execute():", err)
 		return
 	}