Commit c1969c24 authored by Geoff Simmons's avatar Geoff Simmons

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

parent 106aa870
/*
* 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 authTmplSrc = `
import re2;
sub vcl_init {
......@@ -44,3 +76,9 @@ sub vcl_synth {
return(deliver);
}
}
`
const authTmplName = "auth"
var authTmpl = template.Must(template.New(authTmplName).Funcs(fMap).
Parse(authTmplSrc))
......@@ -145,7 +145,6 @@ var fMap = template.FuncMap{
}
const (
authTmplSrc = "auth.tmpl"
aclTmplSrc = "acl.tmpl"
rewriteTmplSrc = "rewrite.tmpl"
reqDispTmplSrc = "recv_disposition.tmpl"
......@@ -157,7 +156,6 @@ const (
)
var (
authTmpl *template.Template
aclTmpl *template.Template
rewriteTmpl *template.Template
reqDispTmpl *template.Template
......@@ -167,16 +165,10 @@ var (
// InitTemplates initializes templates for VCL generation.
func InitTemplates(tmplDir string) error {
var err error
authTmplPath := path.Join(tmplDir, authTmplSrc)
aclTmplPath := path.Join(tmplDir, aclTmplSrc)
rewriteTmplPath := path.Join(tmplDir, rewriteTmplSrc)
reqDispTmplPath := path.Join(tmplDir, reqDispTmplSrc)
authTmpl, err = template.New(authTmplSrc).
Funcs(fMap).ParseFiles(authTmplPath)
if err != nil {
return err
}
aclTmpl, err = template.New(aclTmplSrc).
Funcs(fMap).ParseFiles(aclTmplPath)
if err != nil {
......
......@@ -290,14 +290,8 @@ var auths = Spec{
func TestAuthTemplate(t *testing.T) {
var buf bytes.Buffer
gold := "auth.golden"
tmplName := "auth.tmpl"
tmpl, err := template.New(tmplName).Funcs(fMap).ParseFiles(tmplName)
if err != nil {
t.Error("Cannot parse auth template:", err)
return
}
if err := tmpl.Execute(&buf, auths); err != nil {
if err := authTmpl.Execute(&buf, auths); err != nil {
t.Error("auths template Execute():", err)
return
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment