fix settings check & tests

questdb · Feb 21, 2024 · 956abc0 · 956abc0
1 parent b045431
commit 956abc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/plugin/settings.go b/pkg/plugin/settings.go
@@ -49,7 +49,7 @@ func (settings *Settings) isValid() (err error) {
 	if settings.Port <= 0 {
 		return ErrorMessageInvalidPort
 	}
-	if len(settings.TlsMode) == 0 {
+	if len(settings.Username) == 0 {
 		return ErrorMessageInvalidUserName
 	}
 	if len(settings.Password) == 0 {

diff --git a/pkg/plugin/settings_test.go b/pkg/plugin/settings_test.go
@@ -133,13 +133,15 @@ func TestLoadSettings(t *testing.T) {
 				name: "should converting string values to the correct type",
 				args: args{
 					config: backend.DataSourceInstanceSettings{
-						JSONData:                []byte(`{"server": "test", "port": "1234", "timeout": "15", "queryTimeout": "25", "maxOpenConnections": 10, "maxIdleConnections": 5, "maxConnectionLifetime": 3600   }`),
-						DecryptedSecureJSONData: map[string]string{},
+						JSONData:                []byte(`{"server": "test", "username": "u", "port": "1234", "timeout": "15", "queryTimeout": "25", "maxOpenConnections": 10, "maxIdleConnections": 5, "maxConnectionLifetime": 3600   }`),
+						DecryptedSecureJSONData: map[string]string{"password": "p"},
 					},
 				},
 				wantSettings: Settings{
 					Server:                "test",
 					Port:                  1234,
+					Username:              "u",
+					Password:              "p",
 					Timeout:               "15",
 					QueryTimeout:          "25",
 					MaxOpenConnections:    10,