Merge branch 'main' of github.com:logicmonitor/helm-charts-qa

Author: vkumbhar94

charts/argus/Chart.yaml

@@ -6,6 +6,6 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 2.2.0-rc10
+version: 2.2.0-rt01
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v8.2.0-rc2

charts/collectorset-controller/Chart.yaml

@@ -6,6 +6,6 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: collectorset-controller
-version: 1.1.0-rc08
+version: 1.1.0-rt01
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v4.1.0-rc4

charts/lm-container/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: lm-container
 description: A Helm chart for Logicmonitor's Kubernetes monitoring solutions
 type: application
-version: 1.1.0-rc14
+version: 1.1.0-rt01
 maintainers:
   - name: LogicMonitor
     email: [email protected]
@@ -11,7 +11,7 @@ kubeVersion: ">= 1.16.0-0"
 dependencies:
   - name: argus
     # need to explicitly quote to make it string, else json schema fails
-    version: "2.2.0-rc10"
+    version: "2.2.0-rt01"
     repository: https://logicmonitor.github.io/helm-charts-qa
     # uncomment to test umbrella chart in while developing
     # repository: file://../argus
@@ -22,7 +22,7 @@ dependencies:
       - monitoring
   - name: collectorset-controller
     # need to explicitly quote to make it string, else json schema fails
-    version: "1.1.0-rc08"
+    version: "1.1.0-rt01"
     repository: https://logicmonitor.github.io/helm-charts-qa
     # uncomment to test umbrella chart in while developing
     # repository: file://../collectorset-controller

scripts/lmtf/go.mod

@@ -0,0 +1,3 @@
+module github.com/logicmonitor/helm-charts-qa/scripts/lmtf
+
+go 1.18

scripts/lmtf/lmtf

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+	"github.com/logicmonitor/helm-charts-qa/scripts/lmtf/pkg/load"
+	"github.com/logicmonitor/helm-charts-qa/scripts/lmtf/pkg/tmpl"
+	"github.com/logicmonitor/helm-charts-qa/scripts/lmtf/pkg/vardef"
+	"os"
+)
+
+func main() {
+	if len(os.Args) < 4 {
+		fmt.Println("Insufficient params: <path> <tmpl file> <var file>")
+		return
+	}
+	m, err := load.WalkSchema(os.Args[1])
+	if err != nil {
+		fmt.Println("chart directory doesn't exist")
+	}
+	out := tmpl.ProcessTemplates(m, "lmc", "")
+	outGlobal := tmpl.ProcessTemplatesGlobal(m, "lmc", "")
+
+	tmplStr := fmt.Sprintf("%s\n%s", out, outGlobal)
+
+	err = os.WriteFile(os.Args[2], []byte(tmplStr), os.ModePerm)
+	varDef := vardef.ProcessVarDef(m, "")
+	defs := vardef.Dump(varDef)
+
+	err = os.WriteFile(os.Args[3], []byte(defs), os.ModePerm)
+
+}

scripts/lmtf/lmtf-mac

@@ -0,0 +1,35 @@
+package load
+
+import (
+	"encoding/json"
+	"io/ioutil"
+)
+
+func WalkSchema(path string) (map[string]any, error) {
+	argusSchemaFile := path + "/values.schema.json"
+	bytes, err := ioutil.ReadFile(argusSchemaFile)
+	m := map[string]any{}
+	if err == nil {
+		err = json.Unmarshal(bytes, &m)
+		if err != nil {
+			return nil, err
+		}
+	}
+	files, err := ioutil.ReadDir(path + "/charts")
+	if err != nil {
+		return m, nil
+	}
+
+	for _, f := range files {
+		if f.IsDir() {
+			schema, err := WalkSchema(path + "/charts/" + f.Name())
+			if err != nil {
+			}
+			mv := m["properties"].(map[string]any)
+
+			mv[f.Name()] = schema
+		}
+	}
+
+	return m, nil
+}

scripts/lmtf/main.go

@@ -0,0 +1,130 @@
+package tmpl
+
+import (
+	"fmt"
+	"strings"
+)
+
+const indent = "  "
+
+func ProcessTemplatesGlobal(m map[string]any, parent string, currKey string) string {
+	props := GetGlobalProps(m)
+	m2 := map[string]any{
+		"properties": props,
+	}
+	out := ProcessTemplates(m2, "lmc.global", "")
+	out = strings.ReplaceAll(out, "\n", "\n"+indent)
+	out = "%{ if lmc.global != null }\nglobal:" + indent + out + "\n%{ endif }"
+
+	return out
+}
+
+func GetGlobalProps(m map[string]any) map[string]any {
+	res := make(map[string]any, 0)
+	if props, ok := m["properties"]; ok {
+		for k, v := range props.(map[string]any) {
+			pm := v.(map[string]any)
+			if k == "global" {
+
+				if pmv, ok := pm["properties"]; ok {
+					for k2, v2 := range pmv.(map[string]any) {
+						res[k2] = v2
+					}
+				}
+			} else {
+				cm := GetGlobalProps(pm)
+				for k, v := range cm {
+					res[k] = v
+				}
+			}
+		}
+	}
+	return res
+}
+func ProcessTemplates(m map[string]any, parent string, currKey string) string {
+	if currKey == "global" {
+		return ""
+	}
+	yamlEncode := false
+	optional := false
+	tfCommentExists := false
+	if comment, ok := m["$comment"]; ok {
+		val := comment.(string)
+		for _, item := range strings.Split(val, " ") {
+			if strings.HasPrefix(item, "tf:") && !strings.HasSuffix(item, "-ignore") {
+				tfCommentExists = true
+				varNm := strings.TrimPrefix(item, "tf:")
+				arr := strings.Split(varNm, ",")
+				for _, sa := range arr {
+					if sa == "yamlencode" {
+						yamlEncode = true
+					}
+					if sa == "optional" {
+						optional = true
+					}
+				}
+			}
+		}
+	}
+	out := ""
+	outOrig := ""
+	if props, ok := m["properties"]; ok {
+		propsMap := props.(map[string]any)
+		for k, v := range propsMap {
+			pk := ""
+			if currKey != "" {
+				pk = parent + "." + currKey
+			} else {
+				pk = parent
+			}
+			res := ProcessTemplates(v.(map[string]any), pk, k)
+
+			if res != "" {
+				outOrig = fmt.Sprintf("%s\n%s", outOrig, res)
+			}
+		}
+	}
+
+	if outOrig != "" {
+		out = strings.ReplaceAll(outOrig, "\n", "\n"+indent)
+		out = indent + out
+	}
+
+	res := ""
+	absCurrKey := parent + "." + currKey
+	if tfCommentExists {
+		if optional {
+			if out != "" {
+				res = fmt.Sprintf("%s{ if %s != null }\n%s:%s\n%s{ endif }", "%", absCurrKey, currKey, out, "%")
+				//res = fmt.Sprintf("%s{ if contains(keys(%s), \"%s\" ) && %s != null }\n%s:%s\n%s{ endif }", "%", parent, currKey, absCurrKey, currKey, out, "%")
+			} else {
+				if yamlEncode {
+					res = fmt.Sprintf("%s{ if %s != null }\n%s:\n%s${yamlencode(%s)}\n%s{ endif }", "%", absCurrKey, currKey, indent, absCurrKey, "%")
+					//res = fmt.Sprintf("%s{ if contains(keys(%s), \"%s\" ) && %s != null }\n%s:\n%s${yamlencode(%s)}\n%s{ endif }", "%", parent, currKey, absCurrKey, currKey, indent, absCurrKey, "%")
+				} else {
+					res = fmt.Sprintf("%s{ if %s != null }\n%s: ${%s}\n%s{ endif }", "%", absCurrKey, currKey, absCurrKey, "%")
+					//res = fmt.Sprintf("%s{ if contains(keys(%s), \"%s\" ) && %s != null }\n%s: ${%s}\n%s{ endif }", "%", parent, currKey, absCurrKey, currKey, absCurrKey, "%")
+				}
+			}
+		} else {
+			if out != "" {
+				res = fmt.Sprintf("%s:\n%s%s", currKey, indent, out)
+			} else {
+				if yamlEncode {
+					res = fmt.Sprintf("%s:\n%s${yamlencode(%s)}", currKey, indent, absCurrKey)
+				} else {
+					res = fmt.Sprintf("%s: %s${%s}", currKey, indent, absCurrKey)
+				}
+			}
+		}
+	} else {
+		if out != "" {
+			if currKey != "" {
+				res = fmt.Sprintf("%s:%s", currKey, out)
+			} else {
+				res = outOrig
+			}
+		}
+	}
+	return res
+}