Merge pull request #168 from mailgun/oelze/parse-bools-uri

Handle boolean values in mongoutil.Config
mailgun · Mar 13, 2023 · 2f66002 · 2f66002
2 parents 7f049c0 + 9efeba5
commit 2f66002
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/mongoutil/uri.go b/mongoutil/uri.go
@@ -66,6 +66,8 @@ func (c Config) URIWithOptions() string {
 				options = append(options, opt{key: toCamelCase(optName), value: strconv.Itoa(int(optVal))})
 			case string:
 				options = append(options, opt{key: toCamelCase(optName), value: optVal})
+			case bool:
+				options = append(options, opt{key: toCamelCase(optName), value: strconv.FormatBool(optVal)})
 			}
 		}
 	}

diff --git a/mongoutil/uri_test.go b/mongoutil/uri_test.go
@@ -103,7 +103,8 @@ func TestMongoURIFromJSON(t *testing.T) {
 			{"compressors": "snappy,zlib"},
 			{"replica_set": "v34_queue"},
 			{"read_preference": "secondaryPreferred"},
-			{"max_pool_size": 5}
+			{"max_pool_size": 5},
+			{"ssl": true}
 		]
 	}`)
 	var conf mongoutil.Config
@@ -113,7 +114,7 @@ func TestMongoURIFromJSON(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t,
 		"mongodb://127.0.0.1:27017/foo?compressors=snappy,zlib&replicaSet=v34_queue&"+
-			"readPreference=secondaryPreferred&maxPoolSize=5", conf.URIWithOptions())
+			"readPreference=secondaryPreferred&maxPoolSize=5&ssl=true", conf.URIWithOptions())
 }
 
 func TestMongoURIFromYAML(t *testing.T) {
@@ -137,6 +138,6 @@ options:
 	require.NoError(t, err)
 	require.Equal(t, "mongodb://mongo-routes-n01-us-east-1.postgun.com:27017,"+
 		"mongo-routes-n02-us-east-1.postgun.com:27017,mongo-routes-n03-us-east-1.postgun.com:27017/mg_prod?"+
-		"tlsCertificateKeyFile=/etc/mailgun/ssl/mongo.pem&tlsCAFile=/etc/mailgun/ssl/mongo-ca.crt&"+
+		"ssl=true&tlsCertificateKeyFile=/etc/mailgun/ssl/mongo.pem&tlsCAFile=/etc/mailgun/ssl/mongo-ca.crt&"+
 		"replicaSet=routes&readPreferenceTags=dc:use1&readPreferenceTags=dc:usw2", conf.URIWithOptions())
 }