Adding default port for ydbs URLs

xo · Dec 3, 2023 · ffa572d · ffa572d
1 parent 18ad730
commit ffa572d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dburl_test.go b/dburl_test.go
@@ -894,6 +894,12 @@ func TestParse(t *testing.T) {
 			`grpc://localhost:2136/`,
 			``,
 		},
+		{
+			`yds://`,
+			`ydb`,
+			`grpcs://localhost:2135/`,
+			``,
+		},
 		{
 			`ydbs://user:pass@localhost:8888/?opt1=a&opt2=b`,
 			`ydb`,

diff --git a/dsn.go b/dsn.go
@@ -619,11 +619,10 @@ func GenVoltdb(u *URL) (string, string, error) {
 
 // GenYDB generates a ydb dsn from the passed URL.
 func GenYDB(u *URL) (string, string, error) {
-	scheme := "grpc"
+	scheme, host, port := "grpc", "localhost", "2136"
 	if strings.HasSuffix(strings.ToLower(u.OriginalScheme), "s") {
-		scheme += "s"
+		scheme, port = "grpcs", "2135"
 	}
-	host, port := "localhost", "2136"
 	if h := u.Hostname(); h != "" {
 		host = h
 	}