Merge pull request #7 from codacy/target-dir-option

add target-dir flag

Author: paulopontesm

README.md

@@ -43,6 +43,7 @@ $ helm ssm [flags]
 ```sh
   -d, --dry-run                 doesn't replace the file content
   -h, --help                    help for ssm
+  -t, --target-dir string       dir to output content
   -f, --values valueFilesList   specify values in a YAML file (can specify multiple) (default [])
   -v, --verbose                 show the computed YAML values file/s
 ```

cmd/main.go

@@ -3,13 +3,15 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 
 	hssm "github.com/codacy/helm-ssm/internal"
 	"github.com/spf13/cobra"
 )
 
 var valueFiles valueFilesList
+var targetDir string
 var verbose bool
 var dryRun bool
 
@@ -41,8 +43,10 @@ func main() {
 	f.VarP(&valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
 	f.BoolVarP(&verbose, "verbose", "v", false, "show the computed YAML values file/s")
 	f.BoolVarP(&dryRun, "dry-run", "d", false, "doesn't replace the file content")
+	f.StringVarP(&targetDir, "target-dir", "o", "", "dir to output content")
 
 	cmd.MarkFlagRequired("values")
+
 	if err := cmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -52,9 +56,21 @@ func main() {
 func run(cmd *cobra.Command, args []string) error {
 	funcMap := hssm.GetFuncMap()
 	for _, filePath := range valueFiles {
-		if err := hssm.ExecuteTemplate(filePath, funcMap, verbose, dryRun); err != nil {
+		content, err := hssm.ExecuteTemplate(filePath, funcMap, verbose)
+		if err != nil {
 			return err
 		}
+		if !dryRun {
+			write(filePath, targetDir, content)
+		}
 	}
 	return nil
 }
+
+func write(filePath string, targetDir string, content string) error {
+	if targetDir != "" {
+		fileName := filepath.Base(filePath)
+		return hssm.WriteFileD(fileName, targetDir, content)
+	}
+	return hssm.WriteFile(filePath, content)
+}

internal/template.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"strconv"
 	"strings"
 	"text/template"
@@ -13,29 +14,37 @@ import (
 	"k8s.io/helm/pkg/engine"
 )
 
+// WriteFileD dumps a given content on the file with path `targetDir/fileName`.
+func WriteFileD(fileName string, targetDir string, content string) error {
+	targetFilePath := targetDir + "/" + fileName
+	_ = os.Mkdir(targetDir, os.ModePerm)
+	return WriteFile(targetFilePath, content)
+}
+
+// WriteFile dumps a given content on the file with path `targetFilePath`.
+func WriteFile(targetFilePath string, content string) error {
+	return ioutil.WriteFile(targetFilePath, []byte(content), 0777)
+}
+
 // ExecuteTemplate loads a template file, executes is against a given function map and writes the output
-func ExecuteTemplate(sourceFilePath string, funcMap template.FuncMap, verbose bool, dryRun bool) error {
+func ExecuteTemplate(sourceFilePath string, funcMap template.FuncMap, verbose bool) (string, error) {
 	fileContent, err := ioutil.ReadFile(sourceFilePath)
 	if err != nil {
-		return err
+		return "", err
 	}
 	t := template.New("ssmtpl").Funcs(funcMap)
 	if _, err := t.Parse(string(fileContent)); err != nil {
-		return err
+		return "", err
 	}
 	var buf bytes.Buffer
 	vals := map[string]interface{}{}
 	if err := t.Execute(&buf, vals); err != nil {
-		return err
+		return "", err
 	}
 	if verbose {
 		fmt.Println(string(buf.Bytes()))
 	}
-	if !dryRun {
-		ioutil.WriteFile(sourceFilePath, buf.Bytes(), 0777)
-	}
-
-	return nil
+	return buf.String(), nil
 }
 
 // GetFuncMap builds the relevant function map to helm_ssm

internal/template_test.go

@@ -26,9 +26,22 @@ func TestExecuteTemplate(t *testing.T) {
 	}
 	defer syscall.Unlink(templateFilePath)
 	ioutil.WriteFile(templateFilePath, []byte(templateContent), 0644)
-	if err := ExecuteTemplate(templateFilePath, template.FuncMap{}, false, false); err != nil {
-		t.Error(err)
+	content, err := ExecuteTemplate(templateFilePath, template.FuncMap{}, false)
+	if content != expectedOutput {
+		t.Errorf("Expected content \"%s\". Got \"%s\"", expectedOutput, content)
+	}
+}
+
+func TestWriteFile(t *testing.T) {
+	templateContent := "write_file_example: true"
+	expectedOutput := "write_file_example: true"
+	t.Logf("Template with content: %s , should out put a file with content: %s", templateContent, expectedOutput)
+
+	templateFilePath, err := createTempFile()
+	if err != nil {
+		panic(err)
 	}
+	WriteFile(templateFilePath, templateContent)
 	fileContent, err := ioutil.ReadFile(templateFilePath)
 	if err != nil {
 		panic(err)
@@ -38,10 +51,10 @@ func TestExecuteTemplate(t *testing.T) {
 		t.Errorf("Expected file with content \"%s\". Got \"%s\"", expectedOutput, content)
 	}
 }
-
 func TestFailExecuteTemplate(t *testing.T) {
 	t.Logf("Non existing template should return \"no such file or directory\" error.")
-	if err := ExecuteTemplate("", template.FuncMap{}, false, false); err == nil {
+	_, err := ExecuteTemplate("", template.FuncMap{}, false)
+	if err == nil {
 		t.Error("Should fail with \"no such file or directory\"")
 	}
 }

plugin.yaml

@@ -1,5 +1,5 @@
 name: "ssm"
-version: "1.0.1"
+version: "1.0.2"
 usage: "Inject AWS SSM parameters into Helm values files"
 description: |-
   Inject AWS SSM parameters into Helm values files