From c8551eac5bb057c42a70034f2e1afeaabb6d2319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= <mcluseau@isi.nc>
Date: Mon, 21 Jan 2019 16:53:45 +1300
Subject: [PATCH] quick ugly fix

---
 cmd/dkl-dir2config/main.go           | 20 +++++++++++++++-----
 cmd/dkl-dir2config/render-context.go |  5 +++++
 modd.conf                            |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/cmd/dkl-dir2config/main.go b/cmd/dkl-dir2config/main.go
index ae8df5f..d2383e0 100644
--- a/cmd/dkl-dir2config/main.go
+++ b/cmd/dkl-dir2config/main.go
@@ -14,15 +14,13 @@ import (
 )
 
 var (
+	dir = flag.String("in", ".", "Source directory")
+
 	src *clustersconfig.Config
 	dst *localconfig.Config
 )
 
-func main() {
-	dir := flag.String("in", ".", "Source directory")
-	outPath := flag.String("out", "config.yaml", "Output file")
-	flag.Parse()
-
+func loadSrc() {
 	var err error
 
 	src, err = clustersconfig.FromDir(*dir)
@@ -30,6 +28,14 @@ func main() {
 		log.Fatal("failed to load config from dir: ", err)
 	}
 
+}
+
+func main() {
+	outPath := flag.String("out", "config.yaml", "Output file")
+	flag.Parse()
+
+	loadSrc()
+
 	dst = &localconfig.Config{
 		SSLConfig: src.SSLConfig,
 	}
@@ -44,7 +50,11 @@ func main() {
 
 	// ----------------------------------------------------------------------
 	for _, host := range src.Hosts {
+		loadSrc() // FIXME ugly fix of some template caching or something
+
+		log.Print("rendering host ", host.Name)
 		ctx, err := newRenderContext(host, src)
+		log.Printf("  ctx: %p", ctx)
 
 		if err != nil {
 			log.Fatal("failed to create render context for host ", host.Name, ": ", err)
diff --git a/cmd/dkl-dir2config/render-context.go b/cmd/dkl-dir2config/render-context.go
index 1d648c1..90301a1 100644
--- a/cmd/dkl-dir2config/render-context.go
+++ b/cmd/dkl-dir2config/render-context.go
@@ -23,6 +23,7 @@ type renderContext struct {
 
 func newRenderContext(host *clustersconfig.Host, cfg *clustersconfig.Config) (ctx *renderContext, err error) {
 	cluster := cfg.Cluster(host.Cluster)
+	log.Printf("===> newRenderContext: cluster: %v", cluster.Name)
 	if cluster == nil {
 		err = fmt.Errorf("no cluster named %q", host.Cluster)
 		return
@@ -68,6 +69,7 @@ func (ctx *renderContext) Config() string {
 	templateFuncs := ctx.templateFuncs(ctxMap)
 
 	render := func(what string, t *clustersconfig.Template) (s string, err error) {
+		log.Printf("render %q %p", what, t)
 		buf := &bytes.Buffer{}
 		err = t.Execute(buf, ctxMap, templateFuncs)
 		if err != nil {
@@ -118,6 +120,8 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]interface{}) map[strin
 	cluster := ctx.Cluster.Name
 
 	getKeyCert := func(name, funcName string) (s string, err error) {
+		log.Print("=====> getKeyCert ", funcName, ": cluster: ", cluster)
+
 		req := ctx.clusterConfig.CSR(name)
 		if req == nil {
 			err = fmt.Errorf("no certificate request named %q", name)
@@ -169,6 +173,7 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]interface{}) map[strin
 		},
 
 		"tls_dir": func(name string) (s string, err error) {
+			log.Printf("CTX: %p", ctx)
 			return getKeyCert(name, "tls_dir")
 		},
 
diff --git a/modd.conf b/modd.conf
index 2c919b1..c5577ba 100644
--- a/modd.conf
+++ b/modd.conf
@@ -3,5 +3,5 @@
   prep: go install ./cmd/...
   #prep: go install ./cmd/dkl-local-server
   #prep: docker build -t dls .
-  daemon +sigterm: /var/lib/direktil/test-run
+  #daemon +sigterm: /var/lib/direktil/test-run
 }