remove post process

Author: arttor

pkg/helmify/context.go

@@ -47,28 +47,19 @@ func (c *Context) Add(obj *unstructured.Unstructured) {
 
 // CreateHelm creates helm chart from context k8s objects
 func (c *Context) CreateHelm(stop <-chan struct{}) error {
-	values := Values{}
 	var templates []Template
 	for _, obj := range c.objects {
-		if interrupted(stop) {
-			return nil
-		}
 		template, err := c.process(obj)
 		if err != nil {
 			return err
 		}
 		if template != nil {
 			templates = append(templates, template)
-			err = values.Merge(template.Values())
-			if err != nil {
-				return err
-			}
 		}
-	}
-	for _, t := range templates {
-		t.PostProcess(values)
-		if interrupted(stop) {
+		select {
+		case <-stop:
 			return nil
+		default:
 		}
 	}
 	return c.output.Create(c.info, templates)
@@ -89,12 +80,3 @@ func (c *Context) process(obj *unstructured.Unstructured) (Template, error) {
 	}).Warn("skipped: no suitable processor found")
 	return nil, nil
 }
-
-func interrupted(stop <-chan struct{}) bool {
-	select {
-	case <-stop:
-		return true
-	default:
-		return false
-	}
-}

pkg/helmify/model.go

@@ -22,8 +22,6 @@ type Template interface {
 	Values() Values
 	// Write - writes helm template into given writer
 	Write(writer io.Writer) error
-	// PostProcess - template post processing using values generated by other templates
-	PostProcess(values Values)
 }
 
 // Values - represents helm template values.yaml

pkg/processor/configmap/configmap.go

@@ -167,6 +167,3 @@ func (r *result) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *result) PostProcess(helmify.Values) {
-}

pkg/processor/crd/crd.go

@@ -82,6 +82,3 @@ func (r *result) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *result) PostProcess(helmify.Values) {
-}

pkg/processor/deployment/deployment.go

@@ -144,6 +144,3 @@ func (r *result) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *result) PostProcess(helmify.Values) {
-}

pkg/processor/rbac/clusterrole.go

@@ -74,16 +74,3 @@ func (r *crResult) Write(writer io.Writer) error {
 	_, err := writer.Write([]byte(r.data))
 	return err
 }
-
-func (r *crResult) PostProcess(values helmify.Values) {
-	crds, ok, err := unstructured.NestedMap(values, "crd")
-	if err != nil || !ok {
-		return
-	}
-	for k, v := range crds {
-		group := v.(map[string]interface{})["group"].(string)
-		plural := v.(map[string]interface{})["plural"].(string)
-		r.data = strings.ReplaceAll(r.data, group, "{{ .Values.crd."+k+".group }}")
-		r.data = strings.ReplaceAll(r.data, plural, "{{ .Values.crd."+k+".plural }}")
-	}
-}

pkg/processor/rbac/clusterrolebinding.go

@@ -96,6 +96,3 @@ func (r *crbResult) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *crbResult) PostProcess(helmify.Values) {
-}

pkg/processor/rbac/role.go

@@ -72,16 +72,3 @@ func (r *rResult) Write(writer io.Writer) error {
 	_, err := writer.Write([]byte(r.data))
 	return err
 }
-
-func (r *rResult) PostProcess(values helmify.Values) {
-	crds, ok, err := unstructured.NestedMap(values, "crd")
-	if err != nil || !ok {
-		return
-	}
-	for k, v := range crds {
-		group := v.(map[string]interface{})["group"].(string)
-		plural := v.(map[string]interface{})["plural"].(string)
-		r.data = strings.ReplaceAll(r.data, group, "{{ .Values.crd."+k+".group }}")
-		r.data = strings.ReplaceAll(r.data, plural, "{{ .Values.crd."+k+".plural }}")
-	}
-}

pkg/processor/rbac/rolebinding.go

@@ -95,6 +95,3 @@ func (r *rbResult) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *rbResult) PostProcess(values helmify.Values) {
-}

pkg/processor/rbac/serviceaccount.go

@@ -60,6 +60,3 @@ func (r *saResult) Write(writer io.Writer) error {
 	_, err := writer.Write(r.data)
 	return err
 }
-
-func (r *saResult) PostProcess(values helmify.Values) {
-}