💚 test: fix the internal ParseEnvLines in some case error

Author: inhere

envutil/envutil.go

@@ -51,7 +51,9 @@ func ParseEnvValue(val string) string { return varexpr.SafeParse(val) }
 
 // SplitText2map parse ENV text to map. Can use to parse .env file contents.
 func SplitText2map(text string) map[string]string {
-	envMp, _ := comfunc.ParseEnvLines(text, true)
+	envMp, _ := comfunc.ParseEnvLines(text, comfunc.ParseEnvLineOption{
+		SkipOnErrorLine: true,
+	})
 	return envMp
 }
 
@@ -60,5 +62,5 @@ func SplitLineToKv(line string) (string, string) {
 	if line = strings.TrimSpace(line); line == "" {
 		return "", ""
 	}
-	return comfunc.SplitLineToKv(line, "")
+	return comfunc.SplitLineToKv(line, "=")
 }

internal/comfunc/str_func.go

@@ -3,11 +3,20 @@ package comfunc
 import (
 	"fmt"
 	"strings"
-
 )
 
 var commentsPrefixes = []string{"#", ";", "//"}
 
+// ParseEnvLineOption parse env line options
+type ParseEnvLineOption struct {
+	// NotInlineComments dont parse inline comments.
+	//  - default: false. will parse inline comments
+	NotInlineComments bool
+	// SkipOnErrorLine skip error line, continue parse next line
+	//  - False: return error, clear parsed map
+	SkipOnErrorLine bool
+}
+
 // ParseEnvLines parse simple multiline k-v string to a string-map.
 // Can use to parse simple INI or DOTENV file contents.
 //
@@ -17,7 +26,7 @@ var commentsPrefixes = []string{"#", ";", "//"}
 //   - Support comments line starts with: "#", ";", "//"
 //   - Support inline comments split with: " #" eg: name=tom # a comments
 //   - DON'T support submap parse.
-func ParseEnvLines(text string, parseInlineComments bool) (mp map[string]string, err error) {
+func ParseEnvLines(text string, opt ParseEnvLineOption) (mp map[string]string, err error) {
 	lines := strings.Split(text, "\n")
 	ln := len(lines)
 	if ln == 0 {
@@ -32,11 +41,16 @@ func ParseEnvLines(text string, parseInlineComments bool) (mp map[string]string,
 		}
 
 		// skip comments line
-		if strings.HasPrefix(line, "#") || strings.HasPrefix(line, ";") || strings.HasPrefix(line, "//") {
+		if line[0] == '#' || line[0] == ';' || strings.HasPrefix(line, "//") {
 			continue
 		}
 
-		if !strings.ContainsRune(line, '=') {
+		// invalid line
+		if strings.IndexByte(line, '=') < 1 {
+			if opt.SkipOnErrorLine {
+				continue
+			}
+
 			strMap = nil
 			err = fmt.Errorf("invalid line contents: must match `KEY=VAL`(line: %s)", line)
 			return
@@ -45,7 +59,7 @@ func ParseEnvLines(text string, parseInlineComments bool) (mp map[string]string,
 		key, value := SplitLineToKv(line, "=")
 
 		// check and remove inline comments
-		if parseInlineComments {
+		if !opt.NotInlineComments {
 			if pos := strings.Index(value, " #"); pos > 0 {
 				value = strings.TrimRight(value[0:pos], " \t")
 			}
@@ -58,7 +72,8 @@ func ParseEnvLines(text string, parseInlineComments bool) (mp map[string]string,
 }
 
 // SplitLineToKv parse string line to k-v. eg:
-// 	'DEBUG=true' => ['DEBUG', 'true']
+//
+//	'DEBUG=true' => ['DEBUG', 'true']
 //
 // NOTE: line must contain '=', allow: 'ENV_KEY='
 func SplitLineToKv(line, sep string) (string, string) {
@@ -77,4 +92,4 @@ func SplitLineToKv(line, sep string) (string, string) {
 		return "", ""
 	}
 	return envKey, strings.TrimSpace(nodes[1])
-}
+}

strutil/textutil/textutil.go

@@ -72,7 +72,7 @@ func ParseInlineINI(tagVal string, keys ...string) (mp maputil.SMap, err error)
 //   - it's like INI format contents.
 //   - support comments line with: "#", ";", "//"
 //   - support inline comments with: " #" eg: name=tom # a comments
-//   - don't support submap parse.
+//   - DON'T support submap parse.
 func ParseSimpleINI(text string) (mp maputil.SMap, err error) {
-	return comfunc.ParseEnvLines(text, true)
+	return comfunc.ParseEnvLines(text, comfunc.ParseEnvLineOption{})
 }

strutil/textutil/textutil_test.go

@@ -171,7 +171,7 @@ func TestParseSimpleINI(t *testing.T) {
 		input := "invalid line"
 		mp, err := textutil.ParseSimpleINI(input)
 		assert.Err(t, err)
-		assert.Contains(t, err.Error(), "invalid config line")
+		assert.Contains(t, err.Error(), "invalid line contents")
 		assert.Nil(t, mp)
 	})
 
@@ -202,7 +202,7 @@ func TestParseSimpleINI(t *testing.T) {
 		input := "# comment\nkey1=value1\n\nkey2=value2 # inline comment\ninvalidline"
 		mp, err := textutil.ParseSimpleINI(input)
 		assert.Err(t, err)
-		assert.ErrMsgContains(t, err, "invalid config line")
+		assert.ErrMsgContains(t, err, "invalid line contents")
 		assert.Empty(t, mp)
 	})
 }