Commit 48594811 authored by Geoff Simmons's avatar Geoff Simmons

Rewrite template is an internal variable, not an external file.

parent c667d600
/*
* 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 rewriteTmplSrc = `
import re2; import re2;
import selector; import selector;
...@@ -52,3 +84,9 @@ sub vcl_{{rewrSub $r}} { ...@@ -52,3 +84,9 @@ sub vcl_{{rewrSub $r}} {
{{- end}} {{- end}}
} }
{{- end}} {{- end}}
`
const rewriteTmplName = "rewrite"
var rewriteTmpl = template.Must(template.New(rewriteTmplName).Funcs(fMap).
Parse(rewriteTmplSrc))
...@@ -145,7 +145,6 @@ var fMap = template.FuncMap{ ...@@ -145,7 +145,6 @@ var fMap = template.FuncMap{
} }
const ( const (
rewriteTmplSrc = "rewrite.tmpl"
reqDispTmplSrc = "recv_disposition.tmpl" reqDispTmplSrc = "recv_disposition.tmpl"
// maxSymLen is a workaround for Varnish issue #2880 // maxSymLen is a workaround for Varnish issue #2880
...@@ -155,7 +154,6 @@ const ( ...@@ -155,7 +154,6 @@ const (
) )
var ( var (
rewriteTmpl *template.Template
reqDispTmpl *template.Template reqDispTmpl *template.Template
vclIllegal = regexp.MustCompile("[^[:word:]-]+") vclIllegal = regexp.MustCompile("[^[:word:]-]+")
) )
...@@ -163,14 +161,8 @@ var ( ...@@ -163,14 +161,8 @@ var (
// InitTemplates initializes templates for VCL generation. // InitTemplates initializes templates for VCL generation.
func InitTemplates(tmplDir string) error { func InitTemplates(tmplDir string) error {
var err error var err error
rewriteTmplPath := path.Join(tmplDir, rewriteTmplSrc)
reqDispTmplPath := path.Join(tmplDir, reqDispTmplSrc) reqDispTmplPath := path.Join(tmplDir, reqDispTmplSrc)
rewriteTmpl, err = template.New(rewriteTmplSrc).
Funcs(fMap).ParseFiles(rewriteTmplPath)
if err != nil {
return err
}
reqDispTmpl, err = template.New(reqDispTmplSrc). reqDispTmpl, err = template.New(reqDispTmplSrc).
Funcs(fMap).ParseFiles(reqDispTmplPath) Funcs(fMap).ParseFiles(reqDispTmplPath)
if err != nil { if err != nil {
......
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