support environment variable names that contain commas

Author: fumoboy007

env.go

@@ -161,14 +161,16 @@ func indirect(v reflect.Value) reflect.Value {
 
 // getName generates the environment variable name from a struct field tag and the field name.
 func getName(tag string, field string) (string, bool) {
-	secret := false
-	if idx := strings.Index(tag, ","); idx != -1 {
-		tag, secret = tag[:idx], tag[idx+1:] == "secret"
-	}
-	if tag == "" {
-		return camelCaseToSnake(field), secret
+	name := strings.TrimSuffix(tag, ",secret")
+	nameLen := len(name)
+
+	// If the `,secret` suffix was found, it would have been trimmed, so the length should be different.
+	secret := nameLen < len(tag)
+
+	if nameLen == 0 {
+		name = camelCaseToSnake(field)
 	}
-	return tag, secret
+	return name, secret
 }
 
 // camelCaseToSnake converts a name from camelCase format into snake format.

env_test.go

@@ -6,11 +6,12 @@ package env
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_indirect(t *testing.T) {
@@ -160,7 +161,8 @@ func Test_getName(t *testing.T) {
 		{"t3", "NaME", "Name", "NaME", false},
 		{"t4", "NaME,secret", "Name", "NaME", true},
 		{"t5", ",secret", "Name", "Name", true},
-		{"t6", "NaME,", "Name", "NaME", false},
+		{"t6", "NameWith,Comma", "Name", "NameWith,Comma", false},
+		{"t7", "NameWith,Comma,secret", "Name", "NameWith,Comma", true},
 	}
 
 	for _, test := range tests {