-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Addition of template functions allow Consul and Time lookups.
This commit introduces template functions which allow lookups against Consul as well as generic time lookups which are run over the template during execution. A consul client has been added with config flag in both the render and deploy commands as these may need to connect to Consul for variable lookups. Closes #58
- Loading branch information
Showing
8 changed files
with
222 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| consul "github.com/hashicorp/consul/api" | ||
| ) | ||
|
|
||
| // NewConsulClient is used to create a new client to interact with Consul. | ||
| func NewConsulClient(addr string) (*consul.Client, error) { | ||
| config := consul.DefaultConfig() | ||
|
|
||
| if addr != "" { | ||
| config.Address = addr | ||
| } | ||
|
|
||
| c, err := consul.NewClient(config) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return c, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package template | ||
|
|
||
| import ( | ||
| "errors" | ||
| "text/template" | ||
| "time" | ||
|
|
||
| consul "github.com/hashicorp/consul/api" | ||
| "github.com/rs/zerolog/log" | ||
| ) | ||
|
|
||
| // funcMap builds the template functions and passes the consulClient where this | ||
| // is required. | ||
| func funcMap(consulClient *consul.Client) template.FuncMap { | ||
| return template.FuncMap{ | ||
| "consulKey": consulKeyFunc(consulClient), | ||
| "consulKeyExists": consulKeyExistsFunc(consulClient), | ||
| "consulKeyOrDefault": consulKeyOrDefaultFunc(consulClient), | ||
| "timeNow": timeNowFunc, | ||
| "timeNowUTC": timeNowUTCFunc, | ||
| "timeNowTimezone": timeNowTimezoneFunc(), | ||
| } | ||
| } | ||
|
|
||
| func consulKeyFunc(consulClient *consul.Client) func(string) (string, error) { | ||
| return func(s string) (string, error) { | ||
|
|
||
| if len(s) == 0 { | ||
| return "", nil | ||
| } | ||
|
|
||
| kv, _, err := consulClient.KV().Get(s, nil) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if kv == nil { | ||
| return "", errors.New("Consul KV not found") | ||
| } | ||
|
|
||
| v := string(kv.Value[:]) | ||
| log.Info().Msgf("template/funcs: using Consul KV variable with key %s and value %s", | ||
| s, v) | ||
|
|
||
| return v, nil | ||
| } | ||
| } | ||
|
|
||
| func consulKeyExistsFunc(consulClient *consul.Client) func(string) (bool, error) { | ||
| return func(s string) (bool, error) { | ||
|
|
||
| if len(s) == 0 { | ||
| return false, nil | ||
| } | ||
|
|
||
| kv, _, err := consulClient.KV().Get(s, nil) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| if kv == nil { | ||
| return false, nil | ||
| } | ||
|
|
||
| log.Info().Msgf("template/funcs: found Consul KV variable with key %s", s) | ||
|
|
||
| return true, nil | ||
| } | ||
| } | ||
|
|
||
| func consulKeyOrDefaultFunc(consulClient *consul.Client) func(string, string) (string, error) { | ||
| return func(s, d string) (string, error) { | ||
|
|
||
| if len(s) == 0 { | ||
| log.Info().Msgf("template/funcs: using default Consul KV variable with value %s", d) | ||
| return d, nil | ||
| } | ||
|
|
||
| kv, _, err := consulClient.KV().Get(s, nil) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if kv == nil { | ||
| log.Info().Msgf("template/funcs: using default Consul KV variable with value %s", d) | ||
| return d, nil | ||
| } | ||
|
|
||
| v := string(kv.Value[:]) | ||
| log.Info().Msgf("template/funcs: using Consul KV variable with key %s and value %s", | ||
| s, v) | ||
|
|
||
| return v, nil | ||
| } | ||
| } | ||
|
|
||
| func timeNowFunc() string { | ||
| return time.Now().Format("2006-01-02T15:04:05Z07:00") | ||
| } | ||
|
|
||
| func timeNowUTCFunc() string { | ||
| return time.Now().UTC().Format("2006-01-02T15:04:05Z07:00") | ||
| } | ||
|
|
||
| func timeNowTimezoneFunc() func(string) (string, error) { | ||
| return func(t string) (string, error) { | ||
|
|
||
| if t == "" { | ||
| return "", nil | ||
| } | ||
|
|
||
| loc, err := time.LoadLocation(t) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return time.Now().In(loc).Format("2006-01-02T15:04:05Z07:00"), nil | ||
| } | ||
| } |
Oops, something went wrong.