alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Use the same method to return the templating functions.

Browse source
This commit is contained in:
Mariano Cano 2021-10-27 16:11:47 -07:00
parent cf4944ea8e
commit cb4a2a5f9a
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pki/helm.go
View file

@ -4,11 +4,11 @@ import (
"io" "io"
"text/template" "text/template"
"github.com/Masterminds/sprig/v3"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/smallstep/certificates/authority" "github.com/smallstep/certificates/authority"
authconfig "github.com/smallstep/certificates/authority/config" authconfig "github.com/smallstep/certificates/authority/config"
"github.com/smallstep/certificates/authority/provisioner" "github.com/smallstep/certificates/authority/provisioner"
"github.com/smallstep/certificates/templates"
"go.step.sm/linkedca" "go.step.sm/linkedca"
) )
@ -24,11 +24,7 @@ type helmVariables struct {
// WriteHelmTemplate a helm template to configure the // WriteHelmTemplate a helm template to configure the
// smallstep/step-certificates helm chart. // smallstep/step-certificates helm chart.
func (p *PKI) WriteHelmTemplate(w io.Writer) error { func (p *PKI) WriteHelmTemplate(w io.Writer) error {
funcs := sprig.TxtFuncMap() tmpl, err := template.New("helm").Funcs(templates.StepFuncMap()).Parse(helmTemplate)
delete(funcs, "env")
delete(funcs, "expandenv")
tmpl, err := template.New("helm").Funcs(funcs).Parse(helmTemplate)
if err != nil { if err != nil {
return errors.Wrap(err, "error writing helm template") return errors.Wrap(err, "error writing helm template")
} }

6
templates/templates.go
View file

@ -183,7 +183,7 @@ func (t *Template) Load() error {
// the template fails. // the template fails.
func (t *Template) LoadBytes(b []byte) error { func (t *Template) LoadBytes(b []byte) error {
t.backfill(b) t.backfill(b)
tmpl, err := template.New(t.Name).Funcs(getFuncMap()).Parse(string(b)) tmpl, err := template.New(t.Name).Funcs(StepFuncMap()).Parse(string(b))
if err != nil { if err != nil {
return errors.Wrapf(err, "error parsing template %s", t.Name) return errors.Wrapf(err, "error parsing template %s", t.Name)
} }
@ -271,9 +271,9 @@ func mkdir(path string, perm os.FileMode) error {
return nil return nil
} }
// getFuncMap returns sprig.TxtFuncMap but removing the "env" and "expandenv" // StepFuncMap returns sprig.TxtFuncMap but removing the "env" and "expandenv"
// functions to avoid any leak of information. // functions to avoid any leak of information.
func getFuncMap() template.FuncMap { func StepFuncMap() template.FuncMap {
m := sprig.TxtFuncMap() m := sprig.TxtFuncMap()
delete(m, "env") delete(m, "env")
delete(m, "expandenv") delete(m, "expandenv")