fix newlines at start of generated files

Author: dips-cbr

pkg/helmgen/generate.go

@@ -79,7 +79,7 @@ func (p *Patcher) doResource(resource string) error {
 		return fmt.Errorf("could not convert patched JSON to YAML: %v", err)
 	}
 
-	contents := make([]string, 2)
+	contents := make([]string, 0)
 	contents = append(contents, fmt.Sprintf("#filename %s", filename))
 	contents = append(contents, string(yamlData))
 

pkg/helmgen/generate_test.go

@@ -3,6 +3,7 @@ package helmgen
 import (
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	jsonIterator "github.com/json-iterator/go"
@@ -55,3 +56,56 @@ func TestParseCRD(t *testing.T) {
 		assert.NoError(t, err)
 	})
 }
+func TestParseAll(t *testing.T) {
+	t.Run("crd with escape chars in descriptions", func(t *testing.T) {
+		data, err := os.ReadFile(filepath.Join("..", "..", "test", "operator-helm-gen", "testdata", "kustomize-output.yaml"))
+
+		if assert.NoError(t, err) {
+			assert.NotEmpty(t, data)
+		}
+
+		outputDir := "generated_tmp"
+
+		err = os.Mkdir(outputDir, 0777)
+		if assert.Nil(t, err) {
+			files, err := os.ReadDir(outputDir)
+			if assert.Nil(t, err) {
+				assert.Equal(t, 0, len(files))
+			}
+		}
+
+		resources := GetResources(data)
+		assert.NotEmpty(t, resources)
+
+		keepers := make(map[string]string)
+		keepers["CustomResourceDefinition"] = "ok"
+		keepers["ClusterRoleBinding"] = "ok"
+		keepers["RoleBinding"] = "ok"
+		keepers["Role"] = "ok"
+		keepers["ClusterRole"] = "ok"
+
+		p := NewPatcher(Spec{KeepRresources: keepers, OutputDir: outputDir})
+		err = p.Generate(resources)
+
+		assert.NoError(t, err)
+
+		generatedFiles, err := os.ReadDir(outputDir)
+		if assert.Nil(t, err) {
+			assert.NotEqual(t, 0, len(generatedFiles))
+
+			for _, f := range generatedFiles {
+				assert.False(t, f.IsDir())
+
+				contents, err := os.ReadFile(filepath.Join(outputDir, f.Name()))
+				if assert.NoError(t, err) {
+					if assert.NotEmpty(t, contents) {
+						y := string(contents)
+						assert.False(t, strings.HasPrefix(y, "\n"), "did not expect file %s to start with newline", f.Name())
+					}
+				}
+			}
+
+			_ = os.RemoveAll(outputDir) //ignore error
+		}
+	})
+}