2016-10-03 19:42:18 +00:00
|
|
|
package client
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2017-01-22 21:50:33 +00:00
|
|
|
"math/rand"
|
2016-10-03 19:42:18 +00:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2017-02-01 04:00:33 +00:00
|
|
|
"strconv"
|
2016-10-03 19:42:18 +00:00
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
ctconf "github.com/hashicorp/consul-template/config"
|
|
|
|
"github.com/hashicorp/consul-template/manager"
|
|
|
|
"github.com/hashicorp/consul-template/signals"
|
2016-10-10 21:49:37 +00:00
|
|
|
multierror "github.com/hashicorp/go-multierror"
|
2016-10-03 19:42:18 +00:00
|
|
|
"github.com/hashicorp/nomad/client/config"
|
|
|
|
"github.com/hashicorp/nomad/client/driver/env"
|
|
|
|
"github.com/hashicorp/nomad/nomad/structs"
|
|
|
|
)
|
|
|
|
|
2016-11-02 20:03:54 +00:00
|
|
|
const (
|
|
|
|
// hostSrcOption is the Client option that determines whether the template
|
|
|
|
// source may be from the host
|
|
|
|
hostSrcOption = "template.allow_host_source"
|
|
|
|
)
|
|
|
|
|
2016-10-03 19:42:18 +00:00
|
|
|
var (
|
|
|
|
// testRetryRate is used to speed up tests by setting consul-templates retry
|
|
|
|
// rate to something low
|
|
|
|
testRetryRate time.Duration = 0
|
|
|
|
)
|
|
|
|
|
|
|
|
// TaskHooks is an interface which provides hooks into the tasks life-cycle
|
|
|
|
type TaskHooks interface {
|
|
|
|
// Restart is used to restart the task
|
2016-10-05 20:41:29 +00:00
|
|
|
Restart(source, reason string)
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
// Signal is used to signal the task
|
2016-10-10 21:49:37 +00:00
|
|
|
Signal(source, reason string, s os.Signal) error
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
// UnblockStart is used to unblock the starting of the task. This should be
|
|
|
|
// called after prestart work is completed
|
2016-10-05 20:41:29 +00:00
|
|
|
UnblockStart(source string)
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2016-10-21 00:27:16 +00:00
|
|
|
// Kill is used to kill the task because of the passed error. If fail is set
|
|
|
|
// to true, the task is marked as failed
|
|
|
|
Kill(source, reason string, fail bool)
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// TaskTemplateManager is used to run a set of templates for a given task
|
|
|
|
type TaskTemplateManager struct {
|
|
|
|
// templates is the set of templates we are managing
|
|
|
|
templates []*structs.Template
|
|
|
|
|
|
|
|
// lookup allows looking up the set of Nomad templates by their consul-template ID
|
|
|
|
lookup map[string][]*structs.Template
|
|
|
|
|
|
|
|
// hooks is used to signal/restart the task as templates are rendered
|
|
|
|
hook TaskHooks
|
|
|
|
|
|
|
|
// runner is the consul-template runner
|
|
|
|
runner *manager.Runner
|
|
|
|
|
|
|
|
// signals is a lookup map from the string representation of a signal to its
|
|
|
|
// actual signal
|
|
|
|
signals map[string]os.Signal
|
|
|
|
|
|
|
|
// shutdownCh is used to signal and started goroutine to shutdown
|
|
|
|
shutdownCh chan struct{}
|
|
|
|
|
|
|
|
// shutdown marks whether the manager has been shutdown
|
|
|
|
shutdown bool
|
|
|
|
shutdownLock sync.Mutex
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewTaskTemplateManager(hook TaskHooks, tmpls []*structs.Template,
|
2016-10-28 22:50:35 +00:00
|
|
|
config *config.Config, vaultToken, taskDir string,
|
2016-10-03 19:42:18 +00:00
|
|
|
taskEnv *env.TaskEnvironment) (*TaskTemplateManager, error) {
|
|
|
|
|
|
|
|
// Check pre-conditions
|
|
|
|
if hook == nil {
|
|
|
|
return nil, fmt.Errorf("Invalid task hook given")
|
|
|
|
} else if config == nil {
|
|
|
|
return nil, fmt.Errorf("Invalid config given")
|
|
|
|
} else if taskDir == "" {
|
|
|
|
return nil, fmt.Errorf("Invalid task directory given")
|
|
|
|
} else if taskEnv == nil {
|
|
|
|
return nil, fmt.Errorf("Invalid task environment given")
|
|
|
|
}
|
|
|
|
|
|
|
|
tm := &TaskTemplateManager{
|
2016-10-28 22:50:35 +00:00
|
|
|
templates: tmpls,
|
|
|
|
hook: hook,
|
|
|
|
shutdownCh: make(chan struct{}),
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Parse the signals that we need
|
|
|
|
for _, tmpl := range tmpls {
|
|
|
|
if tmpl.ChangeSignal == "" {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
sig, err := signals.Parse(tmpl.ChangeSignal)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Failed to parse signal %q", tmpl.ChangeSignal)
|
|
|
|
}
|
|
|
|
|
|
|
|
if tm.signals == nil {
|
|
|
|
tm.signals = make(map[string]os.Signal)
|
|
|
|
}
|
|
|
|
|
|
|
|
tm.signals[tmpl.ChangeSignal] = sig
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build the consul-template runner
|
|
|
|
runner, lookup, err := templateRunner(tmpls, config, vaultToken, taskDir, taskEnv)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
tm.runner = runner
|
|
|
|
tm.lookup = lookup
|
|
|
|
|
|
|
|
go tm.run()
|
|
|
|
return tm, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop is used to stop the consul-template runner
|
|
|
|
func (tm *TaskTemplateManager) Stop() {
|
|
|
|
tm.shutdownLock.Lock()
|
|
|
|
defer tm.shutdownLock.Unlock()
|
|
|
|
|
|
|
|
if tm.shutdown {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
close(tm.shutdownCh)
|
|
|
|
tm.shutdown = true
|
|
|
|
|
|
|
|
// Stop the consul-template runner
|
|
|
|
if tm.runner != nil {
|
|
|
|
tm.runner.Stop()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// run is the long lived loop that handles errors and templates being rendered
|
|
|
|
func (tm *TaskTemplateManager) run() {
|
2016-10-17 18:41:22 +00:00
|
|
|
// Runner is nil if there is no templates
|
2016-10-03 19:42:18 +00:00
|
|
|
if tm.runner == nil {
|
2016-10-05 20:41:29 +00:00
|
|
|
// Unblock the start if there is nothing to do
|
2016-10-28 22:50:35 +00:00
|
|
|
tm.hook.UnblockStart("consul-template")
|
2016-10-03 19:42:18 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start the runner
|
|
|
|
go tm.runner.Start()
|
|
|
|
|
|
|
|
// Track when they have all been rendered so we don't signal the task for
|
|
|
|
// any render event before hand
|
|
|
|
var allRenderedTime time.Time
|
|
|
|
|
|
|
|
// Handle the first rendering
|
2016-10-28 22:50:35 +00:00
|
|
|
// Wait till all the templates have been rendered
|
|
|
|
WAIT:
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-tm.shutdownCh:
|
|
|
|
return
|
|
|
|
case err, ok := <-tm.runner.ErrCh:
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
tm.hook.Kill("consul-template", err.Error(), true)
|
|
|
|
case <-tm.runner.TemplateRenderedCh():
|
|
|
|
// A template has been rendered, figure out what to do
|
|
|
|
events := tm.runner.RenderEvents()
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
// Not all templates have been rendered yet
|
|
|
|
if len(events) < len(tm.lookup) {
|
|
|
|
continue
|
|
|
|
}
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
for _, event := range events {
|
|
|
|
// This template hasn't been rendered
|
|
|
|
if event.LastWouldRender.IsZero() {
|
|
|
|
continue WAIT
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
2016-10-17 18:41:22 +00:00
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
break WAIT
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
allRenderedTime = time.Now()
|
|
|
|
tm.hook.UnblockStart("consul-template")
|
|
|
|
|
2016-10-03 19:42:18 +00:00
|
|
|
// If all our templates are change mode no-op, then we can exit here
|
|
|
|
if tm.allTemplatesNoop() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// A lookup for the last time the template was handled
|
|
|
|
numTemplates := len(tm.templates)
|
|
|
|
handledRenders := make(map[string]time.Time, numTemplates)
|
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-tm.shutdownCh:
|
|
|
|
return
|
|
|
|
case err, ok := <-tm.runner.ErrCh:
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2016-10-21 00:27:16 +00:00
|
|
|
tm.hook.Kill("consul-template", err.Error(), true)
|
2016-10-03 19:42:18 +00:00
|
|
|
case <-tm.runner.TemplateRenderedCh():
|
|
|
|
// A template has been rendered, figure out what to do
|
|
|
|
var handling []string
|
|
|
|
signals := make(map[string]struct{})
|
|
|
|
restart := false
|
|
|
|
var splay time.Duration
|
|
|
|
|
2016-10-28 22:50:35 +00:00
|
|
|
events := tm.runner.RenderEvents()
|
|
|
|
for id, event := range events {
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
// First time through
|
2016-10-28 22:50:35 +00:00
|
|
|
if allRenderedTime.After(event.LastDidRender) || allRenderedTime.Equal(event.LastDidRender) {
|
|
|
|
handledRenders[id] = allRenderedTime
|
2016-10-03 19:42:18 +00:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// We have already handled this one
|
2016-10-28 22:50:35 +00:00
|
|
|
if htime := handledRenders[id]; htime.After(event.LastDidRender) || htime.Equal(event.LastDidRender) {
|
2016-10-03 19:42:18 +00:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Lookup the template and determine what to do
|
|
|
|
tmpls, ok := tm.lookup[id]
|
|
|
|
if !ok {
|
2016-10-21 00:27:16 +00:00
|
|
|
tm.hook.Kill("consul-template", fmt.Sprintf("consul-template runner returned unknown template id %q", id), true)
|
2016-10-03 19:42:18 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tmpl := range tmpls {
|
|
|
|
switch tmpl.ChangeMode {
|
|
|
|
case structs.TemplateChangeModeSignal:
|
|
|
|
signals[tmpl.ChangeSignal] = struct{}{}
|
|
|
|
case structs.TemplateChangeModeRestart:
|
|
|
|
restart = true
|
|
|
|
case structs.TemplateChangeModeNoop:
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if tmpl.Splay > splay {
|
|
|
|
splay = tmpl.Splay
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
handling = append(handling, id)
|
|
|
|
}
|
|
|
|
|
|
|
|
if restart || len(signals) != 0 {
|
|
|
|
if splay != 0 {
|
2017-01-22 21:50:33 +00:00
|
|
|
ns := splay.Nanoseconds()
|
|
|
|
offset := rand.Int63n(ns)
|
|
|
|
t := time.Duration(offset)
|
|
|
|
|
2016-10-03 19:42:18 +00:00
|
|
|
select {
|
2017-01-22 21:50:33 +00:00
|
|
|
case <-time.After(t):
|
2016-10-03 19:42:18 +00:00
|
|
|
case <-tm.shutdownCh:
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update handle time
|
|
|
|
for _, id := range handling {
|
2016-10-28 22:50:35 +00:00
|
|
|
handledRenders[id] = events[id].LastDidRender
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if restart {
|
2016-10-05 20:41:29 +00:00
|
|
|
tm.hook.Restart("consul-template", "template with change_mode restart re-rendered")
|
2016-10-03 19:42:18 +00:00
|
|
|
} else if len(signals) != 0 {
|
2016-10-10 21:49:37 +00:00
|
|
|
var mErr multierror.Error
|
2016-10-03 19:42:18 +00:00
|
|
|
for signal := range signals {
|
2016-10-10 21:49:37 +00:00
|
|
|
err := tm.hook.Signal("consul-template", "template re-rendered", tm.signals[signal])
|
|
|
|
if err != nil {
|
|
|
|
multierror.Append(&mErr, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := mErr.ErrorOrNil(); err != nil {
|
|
|
|
flat := make([]os.Signal, 0, len(signals))
|
|
|
|
for signal := range signals {
|
|
|
|
flat = append(flat, tm.signals[signal])
|
|
|
|
}
|
2016-10-21 00:27:16 +00:00
|
|
|
tm.hook.Kill("consul-template", fmt.Sprintf("Sending signals %v failed: %v", flat, err), true)
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// allTemplatesNoop returns whether all the managed templates have change mode noop.
|
|
|
|
func (tm *TaskTemplateManager) allTemplatesNoop() bool {
|
|
|
|
for _, tmpl := range tm.templates {
|
|
|
|
if tmpl.ChangeMode != structs.TemplateChangeModeNoop {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
// templateRunner returns a consul-template runner for the given templates and a
|
|
|
|
// lookup by destination to the template. If no templates are given, a nil
|
|
|
|
// template runner and lookup is returned.
|
|
|
|
func templateRunner(tmpls []*structs.Template, config *config.Config,
|
|
|
|
vaultToken, taskDir string, taskEnv *env.TaskEnvironment) (
|
|
|
|
*manager.Runner, map[string][]*structs.Template, error) {
|
|
|
|
|
|
|
|
if len(tmpls) == 0 {
|
|
|
|
return nil, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
runnerConfig, err := runnerConfig(config, vaultToken)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Parse the templates
|
2016-11-02 20:03:54 +00:00
|
|
|
allowAbs := config.ReadBoolDefault(hostSrcOption, true)
|
|
|
|
ctmplMapping, err := parseTemplateConfigs(tmpls, taskDir, taskEnv, allowAbs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
// Set the config
|
2017-01-14 21:24:54 +00:00
|
|
|
flat := ctconf.TemplateConfigs(make([]*ctconf.TemplateConfig, 0, len(ctmplMapping)))
|
2016-10-03 19:42:18 +00:00
|
|
|
for ctmpl := range ctmplMapping {
|
|
|
|
local := ctmpl
|
|
|
|
flat = append(flat, &local)
|
|
|
|
}
|
2017-01-14 21:24:54 +00:00
|
|
|
runnerConfig.Templates = &flat
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
runner, err := manager.NewRunner(runnerConfig, false, false)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2017-01-14 21:24:54 +00:00
|
|
|
// Set Nomad's environment variables
|
2017-03-27 21:58:04 +00:00
|
|
|
runner.Env = taskEnv.Build().EnvMapAll()
|
2017-01-14 21:24:54 +00:00
|
|
|
|
2016-10-03 19:42:18 +00:00
|
|
|
// Build the lookup
|
2017-01-14 21:24:54 +00:00
|
|
|
idMap := runner.TemplateConfigMapping()
|
2016-10-03 19:42:18 +00:00
|
|
|
lookup := make(map[string][]*structs.Template, len(idMap))
|
|
|
|
for id, ctmpls := range idMap {
|
|
|
|
for _, ctmpl := range ctmpls {
|
|
|
|
templates := lookup[id]
|
|
|
|
templates = append(templates, ctmplMapping[ctmpl])
|
|
|
|
lookup[id] = templates
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return runner, lookup, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// parseTemplateConfigs converts the tasks templates into consul-templates
|
2016-11-02 20:03:54 +00:00
|
|
|
func parseTemplateConfigs(tmpls []*structs.Template, taskDir string,
|
2017-01-14 21:24:54 +00:00
|
|
|
taskEnv *env.TaskEnvironment, allowAbs bool) (map[ctconf.TemplateConfig]*structs.Template, error) {
|
2016-10-03 19:42:18 +00:00
|
|
|
// Build the task environment
|
|
|
|
taskEnv.Build()
|
|
|
|
|
2017-01-14 21:24:54 +00:00
|
|
|
ctmpls := make(map[ctconf.TemplateConfig]*structs.Template, len(tmpls))
|
2016-10-03 19:42:18 +00:00
|
|
|
for _, tmpl := range tmpls {
|
|
|
|
var src, dest string
|
|
|
|
if tmpl.SourcePath != "" {
|
2016-11-02 20:03:54 +00:00
|
|
|
if filepath.IsAbs(tmpl.SourcePath) {
|
|
|
|
if !allowAbs {
|
|
|
|
return nil, fmt.Errorf("Specifying absolute template paths disallowed by client config: %q", tmpl.SourcePath)
|
|
|
|
}
|
|
|
|
|
|
|
|
src = tmpl.SourcePath
|
|
|
|
} else {
|
|
|
|
src = filepath.Join(taskDir, taskEnv.ReplaceEnv(tmpl.SourcePath))
|
|
|
|
}
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
if tmpl.DestPath != "" {
|
|
|
|
dest = filepath.Join(taskDir, taskEnv.ReplaceEnv(tmpl.DestPath))
|
|
|
|
}
|
|
|
|
|
2017-01-14 23:05:40 +00:00
|
|
|
ct := ctconf.DefaultTemplateConfig()
|
|
|
|
ct.Source = &src
|
|
|
|
ct.Destination = &dest
|
|
|
|
ct.Contents = &tmpl.EmbeddedTmpl
|
2017-02-21 00:43:28 +00:00
|
|
|
ct.LeftDelim = &tmpl.LeftDelim
|
|
|
|
ct.RightDelim = &tmpl.RightDelim
|
2017-02-01 04:00:33 +00:00
|
|
|
|
|
|
|
// Set the permissions
|
|
|
|
if tmpl.Perms != "" {
|
|
|
|
v, err := strconv.ParseUint(tmpl.Perms, 8, 12)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Failed to parse %q as octal: %v", tmpl.Perms, err)
|
|
|
|
}
|
|
|
|
m := os.FileMode(v)
|
|
|
|
ct.Perms = &m
|
|
|
|
}
|
2017-01-14 23:05:40 +00:00
|
|
|
ct.Finalize()
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2017-01-14 23:05:40 +00:00
|
|
|
ctmpls[*ct] = tmpl
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
2016-11-02 20:03:54 +00:00
|
|
|
return ctmpls, nil
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// runnerConfig returns a consul-template runner configuration, setting the
|
|
|
|
// Vault and Consul configurations based on the clients configs.
|
|
|
|
func runnerConfig(config *config.Config, vaultToken string) (*ctconf.Config, error) {
|
2017-01-14 21:24:54 +00:00
|
|
|
conf := ctconf.DefaultConfig()
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2017-01-14 21:24:54 +00:00
|
|
|
t, f := true, false
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2017-01-14 21:24:54 +00:00
|
|
|
// Force faster retries
|
2016-10-03 19:42:18 +00:00
|
|
|
if testRetryRate != 0 {
|
2017-01-14 21:24:54 +00:00
|
|
|
rate := testRetryRate
|
|
|
|
conf.Consul.Retry.Backoff = &rate
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the Consul config
|
|
|
|
if config.ConsulConfig != nil {
|
2017-01-14 21:24:54 +00:00
|
|
|
conf.Consul.Address = &config.ConsulConfig.Addr
|
|
|
|
conf.Consul.Token = &config.ConsulConfig.Token
|
2016-10-03 19:42:18 +00:00
|
|
|
|
2017-01-18 23:55:14 +00:00
|
|
|
if config.ConsulConfig.EnableSSL != nil && *config.ConsulConfig.EnableSSL {
|
2017-01-14 21:24:54 +00:00
|
|
|
verify := config.ConsulConfig.VerifySSL != nil && *config.ConsulConfig.VerifySSL
|
|
|
|
conf.Consul.SSL = &ctconf.SSLConfig{
|
|
|
|
Enabled: &t,
|
|
|
|
Verify: &verify,
|
|
|
|
Cert: &config.ConsulConfig.CertFile,
|
|
|
|
Key: &config.ConsulConfig.KeyFile,
|
|
|
|
CaCert: &config.ConsulConfig.CAFile,
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.ConsulConfig.Auth != "" {
|
|
|
|
parts := strings.SplitN(config.ConsulConfig.Auth, ":", 2)
|
|
|
|
if len(parts) != 2 {
|
|
|
|
return nil, fmt.Errorf("Failed to parse Consul Auth config")
|
|
|
|
}
|
|
|
|
|
2017-01-14 21:24:54 +00:00
|
|
|
conf.Consul.Auth = &ctconf.AuthConfig{
|
|
|
|
Enabled: &t,
|
|
|
|
Username: &parts[0],
|
|
|
|
Password: &parts[1],
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the Vault config
|
2016-11-10 23:16:08 +00:00
|
|
|
// Always set these to ensure nothing is picked up from the environment
|
2017-01-14 21:24:54 +00:00
|
|
|
emptyStr := ""
|
|
|
|
conf.Vault.RenewToken = &f
|
|
|
|
conf.Vault.Token = &emptyStr
|
2016-10-11 01:04:39 +00:00
|
|
|
if config.VaultConfig != nil && config.VaultConfig.IsEnabled() {
|
2017-01-14 21:24:54 +00:00
|
|
|
conf.Vault.Address = &config.VaultConfig.Addr
|
|
|
|
conf.Vault.Token = &vaultToken
|
2016-10-03 19:42:18 +00:00
|
|
|
|
|
|
|
if strings.HasPrefix(config.VaultConfig.Addr, "https") || config.VaultConfig.TLSCertFile != "" {
|
2017-01-14 21:24:54 +00:00
|
|
|
skipVerify := config.VaultConfig.TLSSkipVerify != nil && *config.VaultConfig.TLSSkipVerify
|
|
|
|
verify := !skipVerify
|
2016-10-03 19:42:18 +00:00
|
|
|
conf.Vault.SSL = &ctconf.SSLConfig{
|
2017-01-14 21:24:54 +00:00
|
|
|
Enabled: &t,
|
|
|
|
Verify: &verify,
|
|
|
|
Cert: &config.VaultConfig.TLSCertFile,
|
|
|
|
Key: &config.VaultConfig.TLSKeyFile,
|
|
|
|
CaCert: &config.VaultConfig.TLSCaFile,
|
|
|
|
CaPath: &config.VaultConfig.TLSCaPath,
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
2017-01-14 21:56:05 +00:00
|
|
|
} else {
|
|
|
|
conf.Vault.SSL = &ctconf.SSLConfig{
|
|
|
|
Enabled: &f,
|
|
|
|
Verify: &f,
|
|
|
|
Cert: &emptyStr,
|
|
|
|
Key: &emptyStr,
|
|
|
|
CaCert: &emptyStr,
|
|
|
|
CaPath: &emptyStr,
|
|
|
|
}
|
2016-10-03 19:42:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-23 19:03:38 +00:00
|
|
|
conf.Finalize()
|
2016-10-03 19:42:18 +00:00
|
|
|
return conf, nil
|
|
|
|
}
|