Merge branch 'develop' into release/v0.43.0

Author: edif2008

internals/secrethub/migrate_config_envfile.go

@@ -1,7 +1,6 @@
 package secrethub
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -40,18 +39,22 @@ func (cmd *MigrateConfigEnvfileCommand) Run() error {
 		return err
 	}
 
-	outFile, err := os.Create(".env")
+	output, replaceCount, err := migrateTemplateTags(string(inFileContents), refMapping, "%s")
 	if err != nil {
-		return fmt.Errorf("cannot create output .env file: %s", err)
+		return err
+	}
+
+	inFileInfo, err := os.Stat(filepath)
+	if err != nil {
+		return ErrReadFile(filepath, err)
 	}
-	defer outFile.Close()
 
-	replaceCount, err := migrateTemplateTags(bytes.NewBuffer(inFileContents), outFile, refMapping, "%s")
+	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", len(replaceCount))
+	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

@@ -2,7 +2,6 @@ package secrethub
 
 import (
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
 	"regexp"
@@ -13,7 +12,7 @@ import (
 )
 
 var regexpSecretTemplatePath = regexp.MustCompile(`[A-Za-z0-9_\.\-\$\{\}]{2,}\/[A-Za-z0-9_\.\-\$\{\}]{2,}\/[A-Za-z0-9_\.\-\$\{\}\/]{2,}`)
-var regexpSecretTemplateTags = regexp.MustCompile(`{{(\s)*?(` + regexpSecretTemplatePath.String() + `)(\s)*?}}`)
+var regexpSecretTemplateTags = regexp.MustCompile(`{{\s*?(` + regexpSecretTemplatePath.String() + `)\s*?}}`)
 
 func (cmd *MigrateConfigTemplatesCommand) Run() error {
 	plan, err := getPlan(cmd.planFile)
@@ -31,36 +30,36 @@ 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 }}")
+		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 io.Writer, 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 := regexpSecretTemplatePath.FindString(templateTag)
-		if path == "" {
-			misses = append(misses, templateTag)
-			return ""
-		}
+	output := regexpSecretTemplateTags.ReplaceAllStringFunc(inFileContents, func(templateTag string) string {
+		path := regexpSecretTemplateTags.FindStringSubmatch(templateTag)[1]
 
 		opRef, ok := mapping[path]
 		if !ok {
@@ -86,15 +85,10 @@ func migrateTemplateTags(inFile io.Reader, outFile io.Writer, mapping referenceM
 			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 = io.WriteString(outFile, output)
-	if err != nil {
-		return nil, err
+		return "", 0, fmt.Errorf(errMsg)
 	}
 
-	return hits, nil
+	return output, len(hits), nil
 }
 
 type MigrateConfigTemplatesCommand struct {