Auto-detect dotenv format on load

Signed-off-by: Ilia Choly <ilia.choly@gmail.com>

Author: icholy

README.rst

@@ -2102,7 +2102,7 @@ The store configuration object can have the following keys:
 * ``dotenv``: this is an object, supporting the following keys:
 
   * ``quote`` (boolean; default ``false``): when ``true``, values are
-    double-quoted on emit and must be double-quoted on load.
+    double-quoted on emit.
 
 * ``ini``: this is an object. Right now no keys are supported.
 

stores/dotenv/store.go

@@ -83,10 +83,27 @@ func (store *Store) LoadEncryptedFile(in []byte) (sops.Tree, error) {
 // LoadPlainFile returns the contents of a plaintext file loaded onto a
 // sops runtime object
 func (store *Store) LoadPlainFile(in []byte) (sops.TreeBranches, error) {
+	lines := bytes.Split(in, []byte("\n"))
+
+	// Detect the dialect from the first sops_* line: leading '"' means
+	// quoted, otherwise unquoted.
+	quote := store.config.Quote
+	for _, line := range lines {
+		if !bytes.HasPrefix(line, []byte(SopsPrefix)) {
+			continue
+		}
+		_, raw, ok := bytes.Cut(line, []byte("="))
+		if !ok {
+			continue
+		}
+		quote = bytes.HasPrefix(raw, []byte(`"`))
+		break
+	}
+
 	var branches sops.TreeBranches
 	var branch sops.TreeBranch
 
-	for _, line := range bytes.Split(in, []byte("\n")) {
+	for _, line := range lines {
 		if len(line) == 0 {
 			continue
 		}
@@ -101,7 +118,7 @@ func (store *Store) LoadPlainFile(in []byte) (sops.TreeBranches, error) {
 				return nil, fmt.Errorf("invalid dotenv input line: %s", line)
 			}
 			var value string
-			if store.config.Quote {
+			if quote {
 				var err error
 				value, err = strconv.Unquote(string(line[pos+1:]))
 				if err != nil {

stores/dotenv/store_test.go

@@ -140,6 +140,26 @@ func TestQuotedEmitPlainFile(t *testing.T) {
 	assert.Equal(t, QUOTED_PLAIN, bytes)
 }
 
+func TestQuotedLoadDetectsUnquoted(t *testing.T) {
+	unquoted, err := (&Store{}).EmitEncryptedFile(sops.Tree{
+		Branches: sops.TreeBranches{BRANCH},
+	})
+	assert.Nil(t, err)
+	branches, err := (&Store{config: config.DotenvStoreConfig{Quote: true}}).LoadPlainFile(unquoted)
+	assert.Nil(t, err)
+	assert.Equal(t, BRANCH, branches[0][:len(BRANCH)])
+}
+
+func TestUnquotedLoadDetectsQuoted(t *testing.T) {
+	quoted, err := (&Store{config: config.DotenvStoreConfig{Quote: true}}).EmitEncryptedFile(sops.Tree{
+		Branches: sops.TreeBranches{BRANCH},
+	})
+	assert.Nil(t, err)
+	branches, err := (&Store{}).LoadPlainFile(quoted)
+	assert.Nil(t, err)
+	assert.Equal(t, BRANCH, branches[0][:len(BRANCH)])
+}
+
 func TestHasSopsTopLevelKey(t *testing.T) {
 	ok := (&Store{}).HasSopsTopLevelKey(sops.TreeBranch{
 		sops.TreeItem{