Fix migrate config templates command

The command would throw an error because it did not have write permission for overwriting the provided file.

Author: edif2008

internals/secrethub/migrate_config_envfile.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"regexp"
 
 	"github.com/secrethub/secrethub-cli/internals/cli"
@@ -40,13 +39,7 @@ func (cmd *MigrateConfigEnvfileCommand) Run() error {
 		return err
 	}
 
-	outFile, err := os.Create(".env")
-	if err != nil {
-		return fmt.Errorf("cannot create output .env file: %s", err)
-	}
-	defer outFile.Close()
-
-	replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), outFile, refMapping, "%s")
+	replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), ".env", refMapping, "%s")
 	if err != nil {
 		return err
 	}

internals/secrethub/migrate_config_templates.go

@@ -1,10 +1,10 @@
 package secrethub
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"os"
 	"regexp"
 	"strings"
 
@@ -31,13 +31,12 @@ func (cmd *MigrateConfigTemplatesCommand) Run() error {
 	refMapping.stripSecretHubURIScheme()
 
 	for _, filepath := range cmd.inFiles {
-		file, err := os.Open(filepath)
+		inFileContents, err := ioutil.ReadFile(filepath)
 		if err != nil {
 			return ErrReadFile(filepath, err)
 		}
-		defer file.Close()
 
-		replaceCount, err := migrateTemplateTags(file, file, refMapping, "{{ %s }}")
+		replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), filepath, refMapping, "{{ %s }}")
 		if err != nil {
 			return err
 		}
@@ -48,7 +47,7 @@ func (cmd *MigrateConfigTemplatesCommand) Run() error {
 	return nil
 }
 
-func migrateTemplateTags(inFile io.Reader, outFile io.Writer, mapping referenceMapping, formatString string) ([]string, error) {
+func migrateTemplateTags(inFile io.Reader, outFile string, mapping referenceMapping, formatString string) ([]string, error) {
 	raw, err := ioutil.ReadAll(inFile)
 	if err != nil {
 		return nil, ErrReadFile(inFile, err)
@@ -89,7 +88,7 @@ func migrateTemplateTags(inFile io.Reader, outFile io.Writer, mapping referenceM
 		return nil, fmt.Errorf(errMsg)
 	}
 
-	_, err = io.WriteString(outFile, output)
+	err = ioutil.WriteFile(outFile, []byte(output), 0666)
 	if err != nil {
 		return nil, err
 	}

internals/secrethub/migrate_config_test.go

@@ -2,6 +2,7 @@ package secrethub
 
 import (
 	"bytes"
+	"io/ioutil"
 	"testing"
 
 	"github.com/secrethub/secrethub-go/internals/assert"
@@ -103,20 +104,21 @@ func TestMigrateTemplates(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-			var out bytes.Buffer
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
 			err := m.addVarPossibilities(tc.vars)
 			assert.OK(t, err)
 
-			_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), &out, m, "{{ %s }}")
+			_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), "test.yml.tpl", m, "{{ %s }}")
 			if tc.expectedErr {
 				assert.Equal(t, err != nil, true)
 				return
 			}
 
 			assert.OK(t, err)
-			assert.Equal(t, out.String(), tc.expected)
+			res, err := ioutil.ReadFile("test.yml.tpl")
+			assert.OK(t, err)
+			assert.Equal(t, string(res), tc.expected)
 		})
 	}
 }
@@ -225,7 +227,6 @@ func TestMigrateEnvfile(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-			var out bytes.Buffer
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
 			err := m.addVarPossibilities(tc.vars)
@@ -237,7 +238,7 @@ func TestMigrateEnvfile(t *testing.T) {
 					return err
 				}
 
-				_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), &out, m, "%s")
+				_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), ".env", m, "%s")
 				return err
 			}()
 
@@ -247,7 +248,9 @@ func TestMigrateEnvfile(t *testing.T) {
 			}
 
 			assert.OK(t, err)
-			assert.Equal(t, out.String(), tc.expected)
+			res, err := ioutil.ReadFile(".env")
+			assert.OK(t, err)
+			assert.Equal(t, string(res), tc.expected)
 		})
 	}
 }