Merge branch 'develop' into fix/migrate-config-whitespaces

Author: edif2008

internals/secrethub/migrate_config_envfile.go

@@ -1,9 +1,9 @@
 package secrethub
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"regexp"
 
 	"github.com/secrethub/secrethub-cli/internals/cli"
@@ -39,12 +39,22 @@ func (cmd *MigrateConfigEnvfileCommand) Run() error {
 		return err
 	}
 
-	replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), ".env", refMapping, "{{ %s }}")
+	output, replaceCount, err := migrateTemplateTags(string(inFileContents), refMapping, "{{ %s }}")
 	if err != nil {
 		return err
 	}
 
-	fmt.Fprintf(cmd.io.Output(), "Created new .env file with %d op:// references\n", len(replaceCount))
+	inFileInfo, err := os.Stat(filepath)
+	if err != nil {
+		return ErrReadFile(filepath, err)
+	}
+
+	err = ioutil.WriteFile(".env", []byte(output), inFileInfo.Mode())
+	if err != nil {
+		return err
+	}
+
+	fmt.Fprintf(cmd.io.Output(), "Created new .env file with %d op:// references\n", replaceCount)
 
 	return nil
 }

internals/secrethub/migrate_config_references.go

@@ -3,6 +3,7 @@ package secrethub
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 
@@ -60,7 +61,12 @@ func migrateReferences(inFile string, outFile string, mapping referenceMapping)
 		return nil, fmt.Errorf("no 1Password equivalent present in your migration plan for the following secrets:\n- %s", strings.Join(misses, "\n- "))
 	}
 
-	err = ioutil.WriteFile(outFile, []byte(output), 0666)
+	inFileInfo, err := os.Stat(inFile)
+	if err != nil {
+		return nil, ErrReadFile(inFile, err)
+	}
+
+	err = ioutil.WriteFile(outFile, []byte(output), inFileInfo.Mode())
 	if err != nil {
 		return nil, err
 	}

internals/secrethub/migrate_config_templates.go

@@ -1,10 +1,9 @@
 package secrethub
 
 import (
-	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 
@@ -36,23 +35,28 @@ func (cmd *MigrateConfigTemplatesCommand) Run() error {
 			return ErrReadFile(filepath, err)
 		}
 
-		replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), filepath, refMapping, "{{ %s }}")
+		output, replaceCount, err := migrateTemplateTags(string(inFileContents), refMapping, "{{ %s }}")
 		if err != nil {
 			return err
 		}
 
-		fmt.Fprintf(cmd.io.Output(), "Updated %s with %d op:// references\n", filepath, len(replaceCount))
+		inFileInfo, err := os.Stat(filepath)
+		if err != nil {
+			return ErrReadFile(filepath, err)
+		}
+
+		err = ioutil.WriteFile(filepath, []byte(output), inFileInfo.Mode())
+		if err != nil {
+			return err
+		}
+
+		fmt.Fprintf(cmd.io.Output(), "Updated %s with %d op:// references\n", filepath, replaceCount)
 	}
 
 	return nil
 }
 
-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)
-	}
-
+func migrateTemplateTags(inFileContents string, mapping referenceMapping, formatString string) (string, int, error) {
 	var hits, misses []string
 	output := regexpSecretTemplateTags.ReplaceAllStringFunc(string(raw), func(templateTag string) string {
 		path := regexpSecretTemplateTags.FindStringSubmatch(templateTag)[1]
@@ -81,15 +85,10 @@ func migrateTemplateTags(inFile io.Reader, outFile string, mapping referenceMapp
 			errMsg += "\nDid you specify every possible value for your template variables? E.g. --var varname1=a,b,c,d --var varname2=x,y,z"
 		}
 
-		return nil, fmt.Errorf(errMsg)
-	}
-
-	err = ioutil.WriteFile(outFile, []byte(output), 0666)
-	if err != nil {
-		return nil, err
+		return "", 0, fmt.Errorf(errMsg)
 	}
 
-	return hits, nil
+	return output, len(hits), nil
 }
 
 type MigrateConfigTemplatesCommand struct {

internals/secrethub/migrate_config_test.go

@@ -1,8 +1,6 @@
 package secrethub
 
 import (
-	"bytes"
-	"io/ioutil"
 	"testing"
 
 	"github.com/secrethub/secrethub-go/internals/assert"
@@ -194,21 +192,20 @@ func TestMigrateTemplates(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
+			var out string
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
 			err := m.addVarPossibilities(tc.vars)
 			assert.OK(t, err)
 
-			_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), "test.yml.tpl", m, "{{ %s }}")
+			out, _, err = migrateTemplateTags(tc.in, m, "{{ %s }}")
 			if tc.expectedErr {
 				assert.Equal(t, err != nil, true)
 				return
 			}
 
 			assert.OK(t, err)
-			res, err := ioutil.ReadFile("test.yml.tpl")
-			assert.OK(t, err)
-			assert.Equal(t, string(res), tc.expected)
+			assert.Equal(t, out, tc.expected)
 		})
 	}
 }
@@ -399,6 +396,7 @@ func TestMigrateEnvfile(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
+			var out string
 			m := referenceMapping(tc.mapping)
 			m.stripSecretHubURIScheme()
 			err := m.addVarPossibilities(tc.vars)
@@ -410,7 +408,7 @@ func TestMigrateEnvfile(t *testing.T) {
 					return err
 				}
 
-				_, err = migrateTemplateTags(bytes.NewReader([]byte(tc.in)), ".env", m, "%s")
+				out, _, err = migrateTemplateTags(tc.in, m, "%s")
 				return err
 			}()
 
@@ -420,9 +418,7 @@ func TestMigrateEnvfile(t *testing.T) {
 			}
 
 			assert.OK(t, err)
-			res, err := ioutil.ReadFile(".env")
-			assert.OK(t, err)
-			assert.Equal(t, string(res), tc.expected)
+			assert.Equal(t, out, tc.expected)
 		})
 	}
 }