Merge pull request #87 from dexhorthy/dex/ch9668/random

support for hidden+random as the poor mans "cmd"

Author: dexhorthy

.wmconfig

@@ -1,14 +1,18 @@
 {
   "pointer": "replicated-ship",
   "ignorePatterns": [
+    ".circleci/**",
     ".git/**",
-    "hack/docs/**",
+    ".ship/**",
+    "bin/**",
+    "dist/**",
+    "deploy/**"
+    "hack/**",
+    "installer/**",
+    "out/**",
 	"examples",
     ".idea/**",
     "**/*jb_tmp*",
-    "e2e-retraced/**",
-    "dist/**",
-    "deploy/**",
-    ".circleci/**"
+    "e2e-retraced/**"
   ]
 }

Gopkg.lock

@@ -56,8 +56,8 @@ _vet:
 vet: fmt _vet
 
 _lint:
-	golint ./pkg/... | grep -vE '_mock|e2e' || :
-	golint ./cmd/... | grep -vE '_mock|e2e' || :
+	golint ./pkg/... | grep -vE '_mock|e2e' | grep -v "should have comment" | grep -v "comment on exported" || :
+	golint ./cmd/... | grep -vE '_mock|e2e' | grep -v "should have comment" | grep -v "comment on exported" || :
 
 lint: vet _lint
 

Makefile

@@ -6,6 +6,8 @@ assets:
       contents: |
         #!/bin/sh
         kubectl delete ns {{repl ConfigOption "namespace" }}
+
+        echo something random is {{repl ConfigOption "always_the_same"}}
       dest: ./installer/scripts/uninstall.sh
       mode: 0777
   - docker:
@@ -15,8 +17,8 @@ assets:
 
 config:
   v1:
-    - name: cluster_info
-      title: Kubernetes Cluster Info
+    - name: random-demo
+      title:
       description: information about your kubernetes cluster
       items:
       - name: namespace
@@ -25,6 +27,13 @@ config:
       - name: worker_replicas
         title: Number of Workers to Deploy
         type: text
+      # since this is hidden+default, it will get written
+      # to the state one the first save, and then never change again
+      - name: always_the_same
+        title: Number of Workers to Deploy
+        type: text
+        hidden: true
+        default: '{{repl RandomString 25}}'
 
 lifecycle:
   v1:

app.yml

@@ -14,6 +14,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 )
 
@@ -53,6 +54,10 @@ func isReadOnly(item *libyaml.ConfigItem) bool {
 	return !editable
 }
 
+func shouldOverrideValueWithDefault(item *libyaml.ConfigItem) bool {
+	return item.Hidden && item.Value == "" && item.Default != ""
+}
+
 func isRequired(item *libyaml.ConfigItem) bool {
 	return item.Required
 }
@@ -172,42 +177,52 @@ func resolveConfigValuesMap(liveValues map[string]interface{}, configGroups []li
 func (r *APIConfigRenderer) ResolveConfig(
 	ctx context.Context,
 	release *api.Release,
+	savedState map[string]interface{},
 	liveValues map[string]interface{},
 ) ([]libyaml.ConfigGroup, error) {
 	resolvedConfig := make([]libyaml.ConfigGroup, 0, 0)
 
 	updatedValues, err := resolveConfigValuesMap(liveValues, release.Spec.Config.V1, r.Logger, r.Viper)
 	if err != nil {
-		return resolvedConfig, err
+		return resolvedConfig, errors.Wrap(err, "resolve config values map")
 	}
 
 	builder, err := r.newBuilder(ctx, release, updatedValues)
 	if err != nil {
-		return resolvedConfig, err
+		return resolvedConfig, errors.Wrap(err, "initialize tpl builder")
 	}
 
 	for _, configGroup := range release.Spec.Config.V1 {
 		resolvedItems := make([]*libyaml.ConfigItem, 0, 0)
 		for _, configItem := range configGroup.Items {
+
+			if val, ok := savedState[configItem.Name]; ok {
+				configItem.Value = fmt.Sprintf("%s", val)
+			}
+
 			if !isReadOnly(configItem) {
 				if val, ok := liveValues[configItem.Name]; ok {
-					configItem.Value = fmt.Sprintf("%v", val)
+					configItem.Value = fmt.Sprintf("%s", val)
 				}
 			}
 
-			resolvedItem, err := r.resolveConfigItem(ctx, *builder, configItem)
+			resolvedItem, err := r.applyConfigItemFieldTemplates(ctx, *builder, configItem)
 			if err != nil {
-				return resolvedConfig, err
+				return resolvedConfig, errors.Wrapf(err, "resolve item %s", configItem.Name)
+			}
+
+			if shouldOverrideValueWithDefault(configItem) {
+				configItem.Value = configItem.Default
 			}
 
 			resolvedItems = append(resolvedItems, resolvedItem)
 		}
 
 		configGroup.Items = resolvedItems
 
-		resolvedGroup, err := r.resolveConfigGroup(ctx, *builder, configGroup)
+		resolvedGroup, err := r.applyConfigGroupFieldTemplates(ctx, *builder, configGroup)
 		if err != nil {
-			return resolvedConfig, err
+			return resolvedConfig, errors.Wrapf(err, "resolve gropu %s", configGroup.Name)
 		}
 
 		resolvedConfig = append(resolvedConfig, resolvedGroup)
@@ -285,9 +300,9 @@ func (r *APIConfigRenderer) newBuilder(
 	return &builder, nil
 }
 
-func (r *APIConfigRenderer) resolveConfigGroup(ctx context.Context, builder templates.Builder, configGroup libyaml.ConfigGroup) (libyaml.ConfigGroup, error) {
+func (r *APIConfigRenderer) applyConfigGroupFieldTemplates(ctx context.Context, builder templates.Builder, configGroup libyaml.ConfigGroup) (libyaml.ConfigGroup, error) {
 	// configgroup doesn't have a hidden attribute, so if the config group is hidden, we should
-	// set all items as hidden. this is called after resolveConfigItem and will override all hidden
+	// set all items as hidden. this is called after applyConfigItemFieldTemplates and will override all hidden
 	// values in items if when is set
 	builtWhen, err := builder.String(configGroup.When)
 	if err != nil {
@@ -314,7 +329,7 @@ func (r *APIConfigRenderer) resolveConfigGroup(ctx context.Context, builder temp
 	return configGroup, nil
 }
 
-func (r *APIConfigRenderer) resolveConfigItem(ctx context.Context, builder templates.Builder, configItem *libyaml.ConfigItem) (*libyaml.ConfigItem, error) {
+func (r *APIConfigRenderer) applyConfigItemFieldTemplates(ctx context.Context, builder templates.Builder, configItem *libyaml.ConfigItem) (*libyaml.ConfigItem, error) {
 	// filters
 	var filters []string
 	for _, filter := range configItem.Filters {