fixed bug cannot get value when has =

prongbang · Jun 14, 2020 · 8a8e49d · 8a8e49d
1 parent 9ea5fb5
commit 8a8e49d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,6 @@
+# Database Connection
 DB_USER=root
-DB_PASS=1234
+DB_PASS=1234
+
+# Basic authentication
+BASIC_AUTHORIZATION=Basic dXNlcjpwYXNz==
diff --git a/cover.out b/cover.out
@@ -12,5 +12,5 @@ github.com/prongbang/goenv/goenv.go:39.37,41.2 1 1
 github.com/prongbang/goenv/goenv.go:43.29,47.21 3 1
 github.com/prongbang/goenv/goenv.go:59.2,59.12 1 1
 github.com/prongbang/goenv/goenv.go:47.21,49.34 2 1
-github.com/prongbang/goenv/goenv.go:49.34,51.24 2 1
-github.com/prongbang/goenv/goenv.go:51.24,55.5 3 1
+github.com/prongbang/goenv/goenv.go:49.34,51.14 2 1
+github.com/prongbang/goenv/goenv.go:51.14,55.5 3 1
diff --git a/coverage.html b/coverage.html
@@ -117,10 +117,10 @@
         for scanner.Scan() </span><span class="cov8" title="1">{
                 text := scanner.Text()
                 if strings.Contains(text, "=") </span><span class="cov8" title="1">{
-                        keyVal := strings.Split(text, "=")
-                        if len(keyVal) &gt;= 2 </span><span class="cov8" title="1">{
-                                key := keyVal[0]
-                                val := keyVal[1]
+                        i := strings.Index(text, "=")
+                        if i &gt; -1 </span><span class="cov8" title="1">{
+                                key := text[:i]
+                                val := text[i+1:]
                                 env[key] = val
                         }</span>
                 }

diff --git a/go.mod b/go.mod
@@ -1 +1,3 @@
 module github.com/prongbang/goenv
+
+go 1.14
diff --git a/goenv.go b/goenv.go
@@ -47,10 +47,10 @@ func parse(r io.Reader) Env {
 	for scanner.Scan() {
 		text := scanner.Text()
 		if strings.Contains(text, "=") {
-			keyVal := strings.Split(text, "=")
-			if len(keyVal) >= 2 {
-				key := keyVal[0]
-				val := keyVal[1]
+			i := strings.Index(text, "=")
+			if i > -1 {
+				key := text[:i]
+				val := text[i+1:]
 				env[key] = val
 			}
 		}

diff --git a/goenv_test.go b/goenv_test.go
@@ -21,6 +21,19 @@ func TestLoadEnvDefault(t *testing.T) {
 	}
 }
 
+func TestLoadEnvBasicAuthen(t *testing.T) {
+	err := goenv.LoadEnv()
+	basic := os.Getenv("BASIC_AUTHORIZATION")
+
+	if err != nil {
+		t.Error("Read .env file wrong.")
+	}
+
+	if basic != "Basic dXNlcjpwYXNz==" {
+		t.Error("Read .env file wrong.")
+	}
+}
+
 func TestLoadEnvByFile(t *testing.T) {
 	err := goenv.LoadEnv(".testenv")
 	dbUser := os.Getenv("DB_USER")