Refactor bookmarks ssl params

pkg/bookmarks/bookmarks.go

@@ -21,7 +21,7 @@ type Bookmark struct {
 	User     string          `json:"user"`     // Database user
 	Password string          `json:"password"` // User password
 	Database string          `json:"database"` // Database name
-	Ssl      string          `json:"ssl"`      // Connection SSL mode
+	SSLMode  string          `json:"ssl"`      // Connection SSL mode
 	SSH      *shared.SSHInfo `json:"ssh"`      // SSH tunnel config
 }
 
@@ -33,13 +33,13 @@ func (b Bookmark) SSHInfoIsEmpty() bool {
 // ConvertToOptions returns an options struct from connection details
 func (b Bookmark) ConvertToOptions() command.Options {
 	return command.Options{
-		URL:    b.URL,
-		Host:   b.Host,
-		Port:   b.Port,
-		User:   b.User,
-		Pass:   b.Password,
-		DbName: b.Database,
-		Ssl:    b.Ssl,
+		URL:     b.URL,
+		Host:    b.Host,
+		Port:    b.Port,
+		User:    b.User,
+		Pass:    b.Password,
+		DbName:  b.Database,
+		SSLMode: b.SSLMode,
 	}
 }
 
@@ -62,7 +62,7 @@ func readServerConfig(path string) (Bookmark, error) {
 	valid := false
 
 	for _, mode := range modes {
-		if bookmark.Ssl == mode {
+		if bookmark.SSLMode == mode {
 			valid = true
 			break
 		}
@@ -70,8 +70,8 @@ func readServerConfig(path string) (Bookmark, error) {
 
 	// Fall back to a default mode if mode is not set or invalid
 	// Typical typo: ssl mode set to "disabled"
-	if bookmark.Ssl == "" || !valid {
-		bookmark.Ssl = "disable"
+	if bookmark.SSLMode == "" || !valid {
+		bookmark.SSLMode = "disable"
 	}
 
 	// Set default SSH port if it's not provided by user

pkg/bookmarks/bookmarks_test.go

@@ -24,13 +24,13 @@ func Test_Bookmark(t *testing.T) {
 	assert.Equal(t, 5432, bookmark.Port)
 	assert.Equal(t, "postgres", bookmark.User)
 	assert.Equal(t, "mydatabase", bookmark.Database)
-	assert.Equal(t, "disable", bookmark.Ssl)
+	assert.Equal(t, "disable", bookmark.SSLMode)
 	assert.Equal(t, "", bookmark.Password)
 	assert.Equal(t, "", bookmark.URL)
 
 	bookmark, err = readServerConfig("../../data/bookmark_invalid_ssl.toml")
 	assert.Equal(t, nil, err)
-	assert.Equal(t, "disable", bookmark.Ssl)
+	assert.Equal(t, "disable", bookmark.SSLMode)
 }
 
 func Test_Bookmark_URL(t *testing.T) {
@@ -42,7 +42,7 @@ func Test_Bookmark_URL(t *testing.T) {
 	assert.Equal(t, 5432, bookmark.Port)
 	assert.Equal(t, "", bookmark.User)
 	assert.Equal(t, "", bookmark.Database)
-	assert.Equal(t, "disable", bookmark.Ssl)
+	assert.Equal(t, "disable", bookmark.SSLMode)
 	assert.Equal(t, "", bookmark.Password)
 }
 
@@ -79,7 +79,7 @@ func Test_GetBookmark(t *testing.T) {
 		User:     "postgres",
 		Password: "",
 		Database: "mydatabase",
-		Ssl:      "disable",
+		SSLMode:  "disable",
 	}
 	b, err := GetBookmark("../../data", "bookmark")
 	if assert.NoError(t, err) {
@@ -124,17 +124,17 @@ func Test_ConvertToOptions(t *testing.T) {
 		User:     "postgres",
 		Password: "password",
 		Database: "mydatabase",
-		Ssl:      "disable",
+		SSLMode:  "disable",
 	}
 
 	expOpt := command.Options{
-		URL:    "postgres://username:password@host:port/database?sslmode=disable",
-		Host:   "localhost",
-		Port:   5432,
-		User:   "postgres",
-		Pass:   "password",
-		DbName: "mydatabase",
-		Ssl:    "disable",
+		URL:     "postgres://username:password@host:port/database?sslmode=disable",
+		Host:    "localhost",
+		Port:    5432,
+		User:    "postgres",
+		Pass:    "password",
+		DbName:  "mydatabase",
+		SSLMode: "disable",
 	}
 	opt := b.ConvertToOptions()
 	assert.Equal(t, expOpt, opt)