Library 2.2.1 & Helmize 0.1.0-rc.1 (#31)

Library 2.2.1 & Helmize 0.1.0-rc.1

Author: oliverbaehler

.gitignore

@@ -42,3 +42,7 @@ credentials.yml
 # Nodejs
 node_modules/
 package-lock.json
+
+# Charts
+*.tgz
+Chart.lock

charts/helmize/Chart.yaml

@@ -2,14 +2,15 @@ apiVersion: v2
 name: helmize
 description: Go Sprig based deployment engine deployed via Helm
 type: library
-version: "0.1.0-rc.0"
+version: "0.1.0-rc.1"
 appVersion: "0.1.0"
 home: https://buttahtoast.github.io/helmize/
 icon: https://raw.githubusercontent.com/buttahtoast/helmize/main/icon.jpg
 dependencies:
   - name: library
     version: "2.2.0"
-    repository: https://buttahtoast.github.io/helm-charts/  
+    repository: "file://../library"
+    #repository: https://buttahtoast.github.io/helm-charts/  
 keywords:
   - library
   - sprig

charts/helmize/README.md

@@ -1,6 +1,6 @@
 # Helmize
 
-![Version: 0.1.0-rc.0](https://img.shields.io/badge/Version-0.1.0--rc.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.1.0-rc.1](https://img.shields.io/badge/Version-0.1.0--rc.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
 
 Helmize is a simple deployment library wrapped in a library helm chart. It's purpose is to simplify complex infrastructure deployments where you change deployed manifests based on given conditions. This project is thought for people that bootstrap complex infrastructure setup on kubernetes and want to simplify their file structure.
 

charts/helmize/templates/conditions/_defaults.tpl

@@ -15,5 +15,4 @@ conditions
 */}}
 {{- define "inventory.conditions.defaults.inv_dir" -}}
 inventory_directory
-{{- end }}
-
+{{- end }}

charts/helmize/templates/conditions/_types.tpl

@@ -9,6 +9,9 @@ name:
   required: true
 key:
   types: [ "string" ]
+key_types:
+  types: [ "slice" ]
+  default: [ "string", "slice" ]
 required:
   types: [ "int", "bool" ]
 default:
@@ -17,7 +20,7 @@ path:
   types: [ "string" ]
 filter: 
   types: [ "string", "slice" ]
-reverseFilter:
+reverse_filter:
   types: [ "int", "bool" ]
 allow_root:
   types: [ "int", "bool" ]     

charts/helmize/templates/conditions/func/_path.tpl

@@ -12,7 +12,7 @@
 */}}
 {{- define "inventory.conditions.func.path" -}}
   {{- if and $.cond $.path $.ctx -}}
-    {{- $base_directory := (fromYaml (include "inventory.config.func.resolve" (dict "path" (include "inventory.conditions.defaults.inv_dir" $.ctx) "req" true "ctx" $.ctx))).res -}}
+    {{- $base_directory := (fromYaml (include "inventory.config.func.resolve" (dict "path" (include "inventory.conditions.defaults.inv_dir" $.ctx) "ctx" $.ctx))).res -}}
     {{- $base_path := (include "inventory.helpers.trailingPath" $.path) -}}
     {{- if $base_directory -}}
       {{- $base_path = (printf "%s/%s" (include "inventory.helpers.trailingPath" $base_directory | trimSuffix "/") $base_path) -}}

charts/helmize/templates/conditions/func/_resolve.tpl

@@ -34,7 +34,10 @@
           {{- $condition_struct := dict "name" $condition.name "root_path" $condition_path "paths" list "keys" list "config" $condition -}}
 
           {{/* Add Condition Keys */}}
-          {{- $key := (fromYaml (include "lib.utils.dicts.lookup" (dict "data" $.ctx "path" (default "" $condition.key) "required" false))).res }}
+          {{- $key := "" -}}
+          {{- if $condition.key -}}
+            {{- $key = (fromYaml (include "lib.utils.dicts.lookup" (dict "data" $.ctx "path" $condition.key "required" false))).res -}}
+          {{- end -}}
           {{- if and $condition.key (and (not $key) ($condition.required)) -}}
             {{- include "inventory.helpers.fail" (printf "A Value for %s is required but not set" $condition.key) -}}
           {{- else if not $key -}}
@@ -48,18 +51,28 @@
               {{- $condition_keys = append $condition_keys $key -}}
             {{- end -}}  
           {{- end -}}
-  
-          {{/* Add groups as possible keys */}}
-          {{- if not $condition.groups_disabled -}}
-            {{- if $.roles -}}
-              {{- $condition_keys = concat $.roles $condition_keys -}}
+
+          {{/* Validate Type */}}
+          {{- if $key -}}
+            {{- $type_error := 1 -}}
+            {{- if $condition.key_types -}}
+              {{- range $condition.key_types -}}
+                {{- if (kindIs . $key) -}}
+                  {{- $type_error = 0 -}}
+                {{- end -}}
+              {{- end -}}
+            {{- else -}}
+              {{- $type_error = 0 -}}
             {{- end -}}
-          {{- end -}}
+            {{- if $type_error -}}
+              {{- $_ := set $return "errors" (concat $return.errors (list (dict "condition" $condition.name "error" (printf "Value for condition must be %s but is %s" ($condition.key_types| join ", ") (kindOf $key))))) -}}
+            {{- end -}}
+          {{- end -}}  
 
           {{/* Apply a filter to all results */}}
           {{- if $condition.filter -}}
             {{- $filtered_list := $condition_keys -}}
-            {{- if $condition.reverseFilter -}}
+            {{- if $condition.reverse_filter -}}
               {{- $filtered_list = list -}}
             {{- end -}}
             {{- if (kindIs "string" $condition.filter) -}}
@@ -69,7 +82,7 @@
               {{- $con := . -}}
               {{- range $condition.filter -}}
                 {{- if (regexMatch . $con) -}}
-                  {{- if $condition.reverseFilter -}}
+                  {{- if $condition.reverse_filter -}}
                     {{- $filtered_list = append $filtered_list $con -}}
                   {{- else -}}
                     {{- $filtered_list = without $filtered_list $con -}}
@@ -79,6 +92,12 @@
             {{- end -}}
             {{- $condition_keys = $filtered_list -}}
           {{- end -}}
+
+          {{/* Add Base */}}
+          {{- if $condition.allow_root -}}
+            {{- $condition_keys = prepend  $condition_keys "/" -}}
+          {{- end -}}
+
 
           {{/* Create Path for each Condition Key */}}
           {{- $condition_keys = $condition_keys | uniq -}}

charts/helmize/templates/config/_defaults.tpl

@@ -4,5 +4,5 @@
 
 */}}
 {{- define "inventory.config.defaults.location" -}}
-  {{- default "_config.yaml" $.Values.config_file -}}
+  {{- default "helmize.yaml" $.Values.config_file -}}
 {{- end }}

charts/helmize/templates/config/func/_get.tpl

@@ -10,11 +10,22 @@
   {{- $cfg_loc := (include "inventory.config.defaults.location" $) -}}
 
   {{/* Validate based on type how config is set */}}
-  {{- $cfg := fromYaml (.Files.Get $cfg_loc) -}}
+  {{- $cfg := .Files.Get $cfg_loc -}}
 
-  {{/* When config has values */}}
+  {{/* When config has content */}}
   {{- if $cfg -}}
 
+    {{/* Template Content */}}
+    {{- $template_config_raw := tpl $cfg $ -}}
+    {{- $template_config := fromYaml ($template_config_raw) -}}
+
+    {{/* Validate if conversation was successful, otherwise return with error */}}
+    {{- if not (include "lib.utils.errors.unmarshalingError" $template_config) -}}
+      {{- $cfg = $template_config -}}
+    {{- else -}}
+      {{- include "lib.utils.errors.fail" (printf "Templating of %s did not return valid YAML:\n%s" $cfg_loc ($template_config_raw | nindent 2)) -}}
+    {{- end -}}
+
     {{/* Validate Configuration */}}
     {{- $cfg_validate := fromYaml (include "lib.utils.types.validate" (dict "type" "inventory.config.types.config" "data" $cfg "ctx" $)) -}}
     {{- if $cfg_validate.isType -}}

charts/helmize/templates/entrypoint/_defaults.tpl

@@ -5,4 +5,13 @@
 */}}
 {{- define "inventory.entrypoint.defaults.force" -}}
 force
+{{- end -}}
+
+{{/* Summary <Template> 
+
+  Default Summary Values Key
+
+*/}}
+{{- define "inventory.entrypoint.defaults.summary_value" -}}
+summary
 {{- end -}}