refactored flag into config.Config struct

Author: gprossliner

cmd/helmify/flags.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 
 	"github.com/arttor/helmify/pkg/config"
-	"github.com/arttor/helmify/pkg/processor/imagePullSecrets"
 )
 
 const helpText = `Helmify parses kubernetes resources from std.in and converts it to a Helm chart.
@@ -37,7 +36,7 @@ func ReadFlags() config.Config {
 	flag.BoolVar(&result.Verbose, "v", false, "Enable verbose output (print WARN & INFO). Example: helmify -v")
 	flag.BoolVar(&result.VeryVerbose, "vv", false, "Enable very verbose output. Same as verbose but with DEBUG. Example: helmify -vv")
 	flag.BoolVar(&crd, "crd-dir", false, "Enable crd install into 'crds' directory.\nWarning: CRDs placed in 'crds' directory will not be templated by Helm.\nSee https://helm.sh/docs/chart_best_practices/custom_resource_definitions/#some-caveats-and-explanations\nExample: helmify -crd-dir")
-	flag.BoolVar(&imagePullSecrets.Enabled, "image-pull-secrets", false, "Allows the user to use existing secrets as imagePullSecrets in values.yaml")
+	flag.BoolVar(&result.ImagePullSecrets, "image-pull-secrets", false, "Allows the user to use existing secrets as imagePullSecrets in values.yaml")
 
 	flag.Parse()
 	if h || help {

pkg/config/config.go

@@ -21,6 +21,8 @@ type Config struct {
 	VeryVerbose bool
 	// crd-dir set true to enable crd folder.
 	Crd bool
+	// ImagePullSecrets flag
+	ImagePullSecrets bool
 }
 
 func (c *Config) Validate() error {

pkg/processor/daemonset/daemonset.go

@@ -149,7 +149,9 @@ func (d daemonset) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstru
 		return true, nil, err
 	}
 
-	imagePullSecrets.ProcessSpecMap(specMap, &values)
+	if appMeta.Config().ImagePullSecrets {
+		imagePullSecrets.ProcessSpecMap(specMap, &values)
+	}
 
 	spec, err := yamlformat.Marshal(specMap, 6)
 	if err != nil {

pkg/processor/deployment/deployment.go

@@ -156,7 +156,9 @@ func (d deployment) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstr
 		return true, nil, err
 	}
 
-	imagePullSecrets.ProcessSpecMap(specMap, &values)
+	if appMeta.Config().ImagePullSecrets {
+		imagePullSecrets.ProcessSpecMap(specMap, &values)
+	}
 
 	spec, err := yamlformat.Marshal(specMap, 6)
 	if err != nil {

pkg/processor/imagePullSecrets/imagePullSecrets.go

@@ -4,17 +4,10 @@ import "github.com/arttor/helmify/pkg/helmify"
 
 const helmExpression = "{{ .Values.imagePullSecrets | default list | toJson }}"
 
-// Enabled is set by flags to enable the feature
-var Enabled bool
-
 // ProcessSpecMap adds 'imagePullSecrets' to the podSpec in specMap, if it doesn't
 // already has one defined.
 func ProcessSpecMap(specMap map[string]interface{}, values *helmify.Values) {
 
-	if !Enabled {
-		return
-	}
-
 	if _, defined := specMap["imagePullSecrets"]; !defined {
 		specMap["imagePullSecrets"] = helmExpression
 		(*values)["imagePullSecrets"] = []string{}

pkg/processor/imagePullSecrets/imagePullSecrets_test.go

@@ -8,7 +8,6 @@ import (
 )
 
 func Test_imagePullSecrets_RespectExistingSpec(t *testing.T) {
-	Enabled = true
 	spec := make(map[string]interface{})
 
 	type ipsReference struct {
@@ -28,7 +27,6 @@ func Test_imagePullSecrets_RespectExistingSpec(t *testing.T) {
 }
 
 func Test_imagePullSecrets_ProvideDefault(t *testing.T) {
-	Enabled = true
 	spec := make(map[string]interface{})
 
 	values := &helmify.Values{}
@@ -40,16 +38,3 @@ func Test_imagePullSecrets_ProvideDefault(t *testing.T) {
 	assert.Equal(t, ips, helmExpression)
 	assert.Equal(t, 1, len(*values))
 }
-
-func Test_imagePullSecrets_DoNothingIfNotEnabled(t *testing.T) {
-	Enabled = false
-	spec := make(map[string]interface{})
-
-	values := &helmify.Values{}
-	ProcessSpecMap(spec, values)
-
-	_, found := spec["imagePullSecrets"]
-	assert.False(t, found)
-
-	assert.Equal(t, 0, len(*values))
-}