Merge pull request #393 from untangle/MFW-4989

Mfw 4989
untangle · May 10, 2024 · 2528e36 · 2528e36
2 parents c2c0551 + 16f32b6
commit 2528e36
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/services/settings/database_settings/database.go b/services/settings/database_settings/database.go
@@ -1,17 +1,17 @@
 package database_settings
 
 type Database struct {
-	Enabled           bool   `json:"enabled"`
-	ID                string `json:"id"`
-	Database          string `json:"db_name"`
-	UserName          string `json:"db_username"`
-	Password          string `json:"db_password"`
-	PasswordEncrypted string `json:"db_password_encrypted"`
-	Server            string `json:"db_server"`
-	Port              int    `json:"db_port"`
-	Description       string `json:"description"`
-	Name              string `json:"name"`
-	Type              string `json:"type"`
-	ConnectionString  string `json:"db_connection_string"`
-	Default           bool   `json:"default"`
+	Enabled           bool    `json:"enabled"`
+	ID                string  `json:"id"`
+	Database          string  `json:"db_name"`
+	UserName          *string `json:"db_username,omitempty"`
+	Password          *string `json:"db_password,omitempty"`
+	PasswordEncrypted *string `json:"db_password_encrypted,omitempty"`
+	Server            *string `json:"db_server,omitempty"`
+	Port              *int    `json:"db_port,omitempty"`
+	Description       string  `json:"description"`
+	Name              string  `json:"name"`
+	Type              string  `json:"type"`
+	ConnectionString  string  `json:"db_connection_string"`
+	Default           bool    `json:"default"`
 }
diff --git a/services/settings/database_settings/database_settings_test.go b/services/settings/database_settings/database_settings_test.go
@@ -32,6 +32,10 @@ func runUnmarshalTest(t *testing.T, tests []unmarshalTest) {
 
 // TestDatabaseUnmarshal tests unmarshalling the database settings
 func TestDatabaseUnmarshal(t *testing.T) {
+	var userNames = []string{"test_user", ""}
+	var passwords = []string{"test_pw", ""}
+	var servers = []string{"test_server", ""}
+	var portValues = []int{5, 0}
 	tests := []unmarshalTest{
 		{
 			name: "Generic database settings unmarshal test",
@@ -53,10 +57,10 @@ func TestDatabaseUnmarshal(t *testing.T) {
 					{
 						Enabled:          true,
 						Database:         "testingdb",
-						UserName:         "test_user",
-						Password:         "test_pw",
-						Server:           "test_server",
-						Port:             5,
+						UserName:         &userNames[0],
+						Password:         &passwords[0],
+						Server:           &servers[0],
+						Port:             &portValues[0],
 						Description:      "Some desc",
 						Name:             "New DB Source",
 						Type:             "DB Type 5",
@@ -90,10 +94,10 @@ func TestDatabaseUnmarshal(t *testing.T) {
 						Enabled:          true,
 						ConnectionString: "sqlite:///tmp/reports.db",
 						Database:         "reports.db",
-						UserName:         "",
-						Password:         "",
-						Server:           "",
-						Port:             0,
+						UserName:         &userNames[1],
+						Password:         &passwords[1],
+						Server:           &servers[1],
+						Port:             &portValues[1],
 						Description:      "Local reports database",
 						Name:             "Local DB",
 						Type:             "sqlite",