refactor: trim Redis datasource options to default_database only #873

Author: LordofAvernus

internal/sql_workbench/service/sql_workbench_service.go

@@ -863,12 +863,7 @@ const (
 	mongoTLSEnabledParam       = "tls"
 	mongoDirectConnectionParam = "direct_connection"
 	mongoTLSSkipVerifyParam    = "tls_skip_verify"
-	redisDefaultDatabaseParam  = "default_database"
-	redisTLSEnabledParam       = "tls"
-	redisTLSInsecureParam      = "tls_insecure"
-	redisScanCountParam        = "scan_count"
-	redisKeySeparatorParam     = "key_separator"
-	redisCommandTimeoutParam   = "command_timeout_ms"
+	redisDefaultDatabaseParam = "default_database"
 )
 
 // buildDatasourceBaseInfo 构建数据源基础信息
@@ -1065,29 +1060,12 @@ func buildMongoDatasourceOptions(dbService *biz.DBService) (*string, interface{}
 
 func buildRedisDatasourceOptions(dbService *biz.DBService) (*string, interface{}, map[string]interface{}) {
 	defaultDatabase := dbService.AdditionalParams.GetParam(redisDefaultDatabaseParam).String()
-	var defaultSchema *string
-	jdbcParams := map[string]interface{}{}
-	if defaultDatabase != "" {
-		defaultSchema = &defaultDatabase
-		jdbcParams["defaultDatabase"] = defaultDatabase
-	}
-	if tlsParam := dbService.AdditionalParams.GetParam(redisTLSEnabledParam); tlsParam != nil && tlsParam.String() != "" {
-		jdbcParams["tls"] = tlsParam.Bool()
-	}
-	if dbService.AdditionalParams.GetParam(redisTLSInsecureParam).Bool() {
-		jdbcParams["tlsInsecure"] = true
-	}
-	if scanCount := dbService.AdditionalParams.GetParam(redisScanCountParam).String(); scanCount != "" {
-		jdbcParams["scanCount"] = scanCount
-	}
-	if keySeparator := dbService.AdditionalParams.GetParam(redisKeySeparatorParam).String(); keySeparator != "" {
-		jdbcParams["keySeparator"] = keySeparator
+	if defaultDatabase == "" {
+		return nil, nil, nil
 	}
-	if timeout := dbService.AdditionalParams.GetParam(redisCommandTimeoutParam).String(); timeout != "" {
-		jdbcParams["commandTimeoutMs"] = timeout
-	}
-	if len(jdbcParams) == 0 {
-		return defaultSchema, nil, nil
+	defaultSchema := &defaultDatabase
+	jdbcParams := map[string]interface{}{
+		"defaultDatabase": defaultDatabase,
 	}
 	return defaultSchema, nil, jdbcParams
 }

internal/sql_workbench/service/sql_workbench_service_test.go

@@ -150,11 +150,6 @@ func Test_buildRedisDatasourceOptions(t *testing.T) {
 		Port:   "6379",
 		AdditionalParams: pkgParams.Params{
 			&pkgParams.Param{Key: redisDefaultDatabaseParam, Value: defaultDB, Type: pkgParams.ParamTypeString},
-			&pkgParams.Param{Key: redisTLSEnabledParam, Value: "true", Type: pkgParams.ParamTypeBool},
-			&pkgParams.Param{Key: redisTLSInsecureParam, Value: "true", Type: pkgParams.ParamTypeBool},
-			&pkgParams.Param{Key: redisScanCountParam, Value: "200", Type: pkgParams.ParamTypeString},
-			&pkgParams.Param{Key: redisKeySeparatorParam, Value: ":", Type: pkgParams.ParamTypeString},
-			&pkgParams.Param{Key: redisCommandTimeoutParam, Value: "3000", Type: pkgParams.ParamTypeString},
 		},
 	})
 	if defaultSchema == nil || *defaultSchema != defaultDB {
@@ -163,11 +158,8 @@ func Test_buildRedisDatasourceOptions(t *testing.T) {
 	if propertiesValue != nil {
 		t.Fatalf("expected nil properties, got %#v", propertiesValue)
 	}
-	if jdbcParams["defaultDatabase"] != defaultDB || jdbcParams["tls"] != true || jdbcParams["tlsInsecure"] != true {
-		t.Fatalf("unexpected redis base params: %#v", jdbcParams)
-	}
-	if jdbcParams["scanCount"] != "200" || jdbcParams["keySeparator"] != ":" || jdbcParams["commandTimeoutMs"] != "3000" {
-		t.Fatalf("unexpected redis tuning params: %#v", jdbcParams)
+	if jdbcParams["defaultDatabase"] != defaultDB {
+		t.Fatalf("unexpected redis jdbc params: %#v", jdbcParams)
 	}
 }
 
@@ -177,7 +169,7 @@ func Test_buildRedisDatasourceOptions_noSensitiveProperties(t *testing.T) {
 		User:     "default",
 		Password: "secret",
 		AdditionalParams: pkgParams.Params{
-			&pkgParams.Param{Key: redisTLSEnabledParam, Value: "false", Type: pkgParams.ParamTypeBool},
+			&pkgParams.Param{Key: redisDefaultDatabaseParam, Value: "0", Type: pkgParams.ParamTypeString},
 		},
 	})
 	if propertiesValue != nil {