Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

render templates with external functions #1876

Merged
merged 2 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,16 @@ func TestCLI_ParseFlags(t *testing.T) {
e.Finalize()
}

// these can't be compared with DeepEqual
if e != nil {
e.RendererFunc = nil
e.ReaderFunc = nil
}
if a != nil {
a.RendererFunc = nil
a.ReaderFunc = nil
}

if !reflect.DeepEqual(e, a) {
t.Errorf("Config diff: %soutput: %q", e.Diff(a), out)
}
Expand Down
34 changes: 34 additions & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"syscall"
"time"

"github.com/hashicorp/consul-template/renderer"
"github.com/hashicorp/consul-template/signals"
"github.com/hashicorp/hcl"
homedir "github.com/mitchellh/go-homedir"
Expand Down Expand Up @@ -111,8 +112,24 @@ type Config struct {
// ErrOnFailedLookup, when enabled, will trigger an error if a dependency
// fails to return a value.
ErrOnFailedLookup bool `mapstructure:"err_on_failed_lookup"`

// RendererFunc is called whenever the template needs to be written, and
// will default to renderer.Render. This is intended for use when embedding
// Consul Template in another application
RendererFunc renderer.Renderer `mapstructure:"-" json:"-"`

// ReaderFunc is called whenever the template source is read, and will
// default to os.ReadFile. This is intended for use when embedding Consul
// Template in another application.
ReaderFunc Reader `mapstructure:"-" json:"-"`
tgross marked this conversation as resolved.
Show resolved Hide resolved
}

// Reader is an interface that is implemented by os.OpenFile. The
// Config.ReaderFunc requires this interface so that applications that embed
// Consul Template can have an alternative implementation of os.OpenFile
// (ex. virtual file, sandboxed reads)
type Reader func(src string) ([]byte, error)

// Copy returns a deep copy of the current configuration. This is useful because
// the nested data structures may be shared.
func (c *Config) Copy() *Config {
Expand Down Expand Up @@ -182,6 +199,9 @@ func (c *Config) Copy() *Config {
o.Nomad = c.Nomad.Copy()
}

o.RendererFunc = c.RendererFunc
o.ReaderFunc = c.ReaderFunc

return &o
}

Expand Down Expand Up @@ -275,6 +295,13 @@ func (c *Config) Merge(o *Config) *Config {
r.Nomad = r.Nomad.Merge(o.Nomad)
}

if o.RendererFunc != nil {
r.RendererFunc = o.RendererFunc
}
if o.ReaderFunc != nil {
r.ReaderFunc = o.ReaderFunc
}

return r
}

Expand Down Expand Up @@ -636,6 +663,13 @@ func (c *Config) Finalize() {
if c.BlockQueryWaitTime == nil {
c.BlockQueryWaitTime = TimeDuration(DefaultBlockQueryWaitTime)
}

if c.RendererFunc == nil {
c.RendererFunc = renderer.Render
}
if c.ReaderFunc == nil {
c.ReaderFunc = os.ReadFile
}
}

func stringFromEnv(list []string, def string) *string {
Expand Down
6 changes: 6 additions & 0 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2616,6 +2616,12 @@ func TestDefaultConfig(t *testing.T) {
c := DefaultConfig()
c.Finalize()

// these can't be compared with DeepEqual
c.RendererFunc = nil
c.ReaderFunc = nil
r.RendererFunc = nil
r.ReaderFunc = nil

if !reflect.DeepEqual(r, c) {
t.Errorf("Config diff: %s", r.Diff(c))
}
Expand Down
22 changes: 21 additions & 1 deletion manager/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@ type Runner struct {
// stopped is a boolean of whether the runner is stopped
stopped bool

// rendererFn is called whenever the template needs to be written, and will
// default to renderer.Render. This is intended for use when embedding
// Consul Template in another application
rendererFn renderer.Renderer
tgross marked this conversation as resolved.
Show resolved Hide resolved

// readerFn is called whenever the template source is read, and will default
// to os.ReadFile. This is intended for use when embedding Consul Template
// in another application.
readerFn config.Reader

// finalConfigCopy provides access to a static copy of the finalized
// Runner config. This prevents risk of data races when reading config for
// other elements started by the Runner, like template functions.
Expand Down Expand Up @@ -200,6 +210,15 @@ func NewRunner(config *config.Config, dry bool) (*Runner, error) {
brain: template.NewBrain(),
quiescenceMap: make(map[string]*quiescence),
quiescenceCh: make(chan *template.Template),
rendererFn: config.RendererFunc,
readerFn: config.ReaderFunc,
}

if runner.rendererFn == nil {
runner.rendererFn = renderer.Render
}
if runner.readerFn == nil {
runner.readerFn = os.ReadFile
}

// Create the clientset
Expand Down Expand Up @@ -853,7 +872,7 @@ func (r *Runner) runTemplate(tmpl *template.Template, runCtx *templateRunCtx) (*
log.Printf("[DEBUG] (runner) rendering %s", templateConfig.Display())

// Render the template, taking dry mode into account
result, err := renderer.Render(&renderer.RenderInput{
result, err := r.rendererFn(&renderer.RenderInput{
Backup: config.BoolVal(templateConfig.Backup),
Contents: result.Output,
CreateDestDirs: config.BoolVal(templateConfig.CreateDestDirs),
Expand Down Expand Up @@ -975,6 +994,7 @@ func (r *Runner) init(clients *dep.ClientSet) error {
SandboxPath: config.StringVal(ctmpl.SandboxPath),
Destination: config.StringVal(ctmpl.Destination),
Config: ctmpl,
ReaderFunc: r.config.ReaderFunc,
})
if err != nil {
return err
Expand Down
2 changes: 2 additions & 0 deletions renderer/renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ type RenderResult struct {
Contents []byte
}

type Renderer func(*RenderInput) (*RenderResult, error)

// Render atomically renders a file contents to disk, returning a result of
// whether it would have rendered and actually did render.
func Render(i *RenderInput) (*RenderResult, error) {
Expand Down
13 changes: 11 additions & 2 deletions template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"crypto/md5"
"encoding/hex"
"fmt"
"os"
"strings"
"text/template"

Expand All @@ -28,6 +27,10 @@ var (
// does not specify either a "source" or "content" argument, which is not
// valid.
ErrTemplateMissingContentsAndSource = errors.New("template: must specify exactly one of 'source' or 'contents'")

// ErrMissingReaderFunction is the error returned when the template
// configuration is missing a reader function.
ErrMissingReaderFunction = errors.New("template: missing a reader function")
)

// Template is the internal representation of an individual template to process.
Expand Down Expand Up @@ -117,6 +120,9 @@ type NewTemplateInput struct {

// Config keeps local reference to config struct
Config *config.TemplateConfig

// ReaderFunc is called to read in any source file
ReaderFunc config.Reader
}

// NewTemplate creates and parses a new Consul Template template at the given
Expand Down Expand Up @@ -154,7 +160,10 @@ func NewTemplate(i *NewTemplateInput) (*Template, error) {
}

if i.Source != "" {
contents, err := os.ReadFile(i.Source)
tgross marked this conversation as resolved.
Show resolved Hide resolved
if i.ReaderFunc == nil {
return nil, ErrMissingReaderFunction
}
contents, err := i.ReaderFunc(i.Source)
if err != nil {
return nil, errors.Wrap(err, "failed to read template")
}
Expand Down
3 changes: 3 additions & 0 deletions template/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ func TestNewTemplate(t *testing.T) {

for i, tc := range cases {
t.Run(fmt.Sprintf("%d_%s", i, tc.name), func(t *testing.T) {
if tc.i != nil {
tc.i.ReaderFunc = os.ReadFile
}
a, err := NewTemplate(tc.i)
if (err != nil) != tc.err {
t.Fatal(err)
Expand Down
Loading