creating urlOptions struct to avoid flaky tests with maps

TykTechnologies · Aug 3, 2023 · 94cb84a · 94cb84a
1 parent f60dda8
commit 94cb84a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/persistent/internal/driver/mongo/life_cycle.go b/persistent/internal/driver/mongo/life_cycle.go
@@ -64,7 +64,12 @@ type urlInfo struct {
 	user    string
 	pass    string
 	db      string
-	options map[string]string
+	options []urlOptions
+}
+
+type urlOptions struct {
+	key string
+	val string
 }
 
 func isOptSep(c rune) bool {
@@ -112,14 +117,12 @@ func parseURL(s string) (string, *urlInfo, error) {
 
 	connString += strings.Join(info.addrs, ",")
 
-	if info.db != "" {
-		connString += "/" + info.db
-	}
+	connString += "/" + info.db
 
 	if len(info.options) > 0 {
 		connString += "?"
-		for k, v := range info.options {
-			connString += k + "=" + v + "&"
+		for _, v := range info.options {
+			connString += v.key + "=" + v.val + "&"
 		}
 
 		connString = connString[:len(connString)-1]
@@ -129,7 +132,7 @@ func parseURL(s string) (string, *urlInfo, error) {
 }
 
 func extractURL(s string) (*urlInfo, error) {
-	info := &urlInfo{options: make(map[string]string)}
+	info := &urlInfo{options: make([]urlOptions, 0)}
 
 	if c := strings.Index(s, "?"); c != -1 {
 		for _, pair := range strings.FieldsFunc(s[c+1:], isOptSep) {
@@ -138,7 +141,7 @@ func extractURL(s string) (*urlInfo, error) {
 				return nil, errors.New("connection option must be key=value: " + pair)
 			}
 
-			info.options[l[0]] = l[1]
+			info.options = append(info.options, urlOptions{key: l[0], val: l[1]})
 		}
 
 		s = s[:c]

diff --git a/persistent/internal/driver/mongo/life_cycle_test.go b/persistent/internal/driver/mongo/life_cycle_test.go
@@ -1,6 +1,3 @@
-//go:build mongo
-// +build mongo
-
 package mongo
 
 import (
@@ -147,7 +144,7 @@ func TestConnect(t *testing.T) {
 		{
 			name: "valid connection_string",
 			opts: &types.ClientOpts{
-				ConnectionString: "mongodb://localhost:27017/test",
+				ConnectionString: "mongodb+srv://tyk:6}3cZQU.9KvM/hVR4qkm-hHqZTu3yg=G@cluster0.zlgvyel.mongodb.net/?retryWrites=true&w=majority",
 				UseSSL:           false,
 				Type:             "mongodb",
 			},
@@ -211,7 +208,7 @@ func TestParseURL(t *testing.T) {
 		{
 			name: "valid connection string with @",
 			url:  "mongodb://user:p@ssword@localhost:27017",
-			want: "mongodb://user:p@ssword@localhost:27017",
+			want: "mongodb://user:p@ssword@localhost:27017/",
 		},
 		{
 			name: "valid connection string with @ and /",
@@ -268,13 +265,18 @@ func TestParseURL(t *testing.T) {
 		{
 			name: "connection string without database",
 			url:  "mongodb://user:password@localhost:27017",
-			want: "mongodb://user:password@localhost:27017",
+			want: "mongodb://user:password@localhost:27017/",
 		},
 		{
 			name: "cosmosdb url",
 			url:  "mongodb+srv://4-0-qa:zFAQ==@4-0-qa.azure:10/a1?appName=@4-testing@&maxIdleTimeMS=120000",
 			want: "mongodb+srv://4-0-qa:zFAQ%3D%3D@4-0-qa.azure:10/a1?appName=@4-testing@&maxIdleTimeMS=120000",
 		},
+		{
+			name: "cosmosdb url without database with options",
+			url:  "mongodb+srv://tyk:6}3cZQU.9KvM/hVR4qkm-hHqZTu3yg=G@cluster0.zlgvyel.mongodb.net/?retryWrites=true&w=majority",
+			want: "mongodb+srv://tyk:6%7D3cZQU.9KvM%2FhVR4qkm-hHqZTu3yg%3DG@cluster0.zlgvyel.mongodb.net/?retryWrites=true&w=majority",
+		},
 	}
 
 	for _, test := range tests {