more semantic config upload

cmd/dkl-dir2config/render-context.go

@@ -224,6 +224,7 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]any {
 		if err != nil {
 			return
 		}
+		reqJson := cleanJsonObject(buf.String())
 
 		key := name
 		if req.PerHost {
@@ -236,11 +237,11 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]any {
 			dir := "/etc/tls/" + name
 
 			s = fmt.Sprintf("{{ %s %q %q %q %q %q %q %q }}", funcName,
-				dir, cluster, req.CA, key, req.Profile, req.Label, buf.String())
+				dir, cluster, req.CA, key, req.Profile, req.Label, reqJson)
 
 		default:
 			s = fmt.Sprintf("{{ %s %q %q %q %q %q %q }}", funcName,
-				cluster, req.CA, key, req.Profile, req.Label, buf.String())
+				cluster, req.CA, key, req.Profile, req.Label, reqJson)
 		}
 		return
 	}
@@ -281,11 +282,11 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]any {
 		},
 
 		"ssh_user_ca": func(path string) (s string) {
-			return fmt.Sprintf("{{ ssh_user_ca   %q %q}}",
+			return fmt.Sprintf("{{ ssh_user_ca   %q %q }}",
 				path, cluster)
 		},
 		"ssh_host_keys": func(dir string) (s string) {
-			return fmt.Sprintf("{{ ssh_host_keys %q %q \"\"}}",
+			return fmt.Sprintf("{{ ssh_host_keys %q %q \"\" }}",
 				dir, cluster)
 		},
 		"host_download_token": func() (s string) {

cmd/dkl-dir2config/render-host.go

@@ -29,7 +29,7 @@ func (ctx *renderContext) renderStaticPods() (pods []namePod) {
 		for n := 0; ; n++ {
 			str := buf.String()
 
-			podMap := map[string]interface{}{}
+			podMap := map[string]any{}
 			err := dec.Decode(podMap)
 
 			if err == io.EOF {
@@ -46,7 +46,7 @@ func (ctx *renderContext) renderStaticPods() (pods []namePod) {
 				log.Fatalf("static pod %d: no metadata\n%s", n, buf.String())
 			}
 
-			md := podMap["metadata"].(map[interface{}]interface{})
+			md := podMap["metadata"].(map[any]any)
 
 			namespace := md["namespace"].(string)
 			name := md["name"].(string)

cmd/dkl-dir2config/utils.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+func cleanJsonObject(raw string) string {
+	v := map[string]any{}
+	if err := json.Unmarshal([]byte(raw), &v); err != nil {
+		panic(fmt.Errorf("invalid json: %w\n%s", err, raw))
+	}
+	clean, _ := json.Marshal(v)
+	return string(clean)
+}