Skip to content

fix: remove MongoDB legacy advanced param ignore paths #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Seechi-Yolo merged 4 commits into from
Jul 28, 2026
Merged

fix: remove MongoDB legacy advanced param ignore paths #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55947c9
fix: ignore MongoDB legacy advanced params in DMS paths
LordofAvernus Jul 28, 2026
a1a21e2
test: update sql_workbench MongoDB option expectations
LordofAvernus Jul 28, 2026
75fe95e
fix: remove MongoDB legacy advanced param ignore paths
LordofAvernus Jul 28, 2026
5ae363c
test: drop MongoDB legacy advanced param ignore expectations
LordofAvernus Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions internal/sql_workbench/service/sql_workbench_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,13 +861,9 @@ type datasourceBaseInfo struct {
}

const (
mongoDefaultDatabaseParam = "default_database"
mongoAuthDatabaseParam = "auth_source"
mongoAuthMechanismParam = "auth_mechanism"
mongoReplicaSetParam = "replica_set"
mongoTLSEnabledParam = "tls"
mongoDirectConnectionParam = "direct_connection"
mongoTLSSkipVerifyParam = "tls_skip_verify"
mongoDefaultDatabaseParam = "default_database"
mongoAuthDatabaseParam = "auth_source"
mongoReplicaSetParam = "replica_set"
redisDefaultDatabaseParam = "default_database"
)

Expand Down Expand Up @@ -1039,25 +1035,9 @@ func buildMongoDatasourceOptions(dbService *biz.DBService) (*string, interface{}
if authDB := dbService.AdditionalParams.GetParam(mongoAuthDatabaseParam).String(); authDB != "" {
jdbcParams["authSource"] = authDB
}
if authMechanism := dbService.AdditionalParams.GetParam(mongoAuthMechanismParam).String(); authMechanism != "" {
jdbcParams["authMechanism"] = authMechanism
}
if replicaSet := dbService.AdditionalParams.GetParam(mongoReplicaSetParam).String(); replicaSet != "" {
jdbcParams["replicaSet"] = replicaSet
}
if tlsParam := dbService.AdditionalParams.GetParam(mongoTLSEnabledParam); tlsParam != nil && tlsParam.String() != "" {
if tlsParam.Bool() {
jdbcParams["tls"] = "true"
} else {
jdbcParams["tls"] = "false"
}
}
if dbService.AdditionalParams.GetParam(mongoDirectConnectionParam).Bool() {
jdbcParams["directConnection"] = true
}
if dbService.AdditionalParams.GetParam(mongoTLSSkipVerifyParam).Bool() {
jdbcParams["tlsInsecure"] = true
}

if len(jdbcParams) == 0 {
return defaultSchema, nil, nil
Expand Down
25 changes: 8 additions & 17 deletions internal/sql_workbench/service/sql_workbench_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,7 @@ func Test_buildMongoDatasourceOptions(t *testing.T) {
AdditionalParams: pkgParams.Params{
&pkgParams.Param{Key: mongoDefaultDatabaseParam, Value: defaultDB, Type: pkgParams.ParamTypeString},
&pkgParams.Param{Key: mongoAuthDatabaseParam, Value: "admin", Type: pkgParams.ParamTypeString},
&pkgParams.Param{Key: mongoAuthMechanismParam, Value: "SCRAM-SHA-256", Type: pkgParams.ParamTypeString},
&pkgParams.Param{Key: mongoReplicaSetParam, Value: "rs0", Type: pkgParams.ParamTypeString},
&pkgParams.Param{Key: mongoTLSEnabledParam, Value: "true", Type: pkgParams.ParamTypeBool},
&pkgParams.Param{Key: mongoDirectConnectionParam, Value: "true", Type: pkgParams.ParamTypeBool},
&pkgParams.Param{Key: mongoTLSSkipVerifyParam, Value: "true", Type: pkgParams.ParamTypeBool},
},
})
if defaultSchema == nil || *defaultSchema != defaultDB {
Expand All @@ -233,32 +229,27 @@ func Test_buildMongoDatasourceOptions(t *testing.T) {
if jdbcParams["authSource"] != "admin" {
t.Fatalf("unexpected authSource: %#v", jdbcParams["authSource"])
}
if jdbcParams["authMechanism"] != "SCRAM-SHA-256" {
t.Fatalf("unexpected authMechanism: %#v", jdbcParams["authMechanism"])
}
if jdbcParams["replicaSet"] != "rs0" {
t.Fatalf("unexpected replicaSet: %#v", jdbcParams["replicaSet"])
}
if jdbcParams["tls"] != "true" {
t.Fatalf("unexpected tls: %#v", jdbcParams["tls"])
}
if jdbcParams["directConnection"] != true || jdbcParams["tlsInsecure"] != true {
t.Fatalf("unexpected jdbc params: %#v", jdbcParams)
}
}

func Test_buildMongoDatasourceOptions_tlsOnly(t *testing.T) {
func Test_buildMongoDatasourceOptions_authAndReplicaOnly(t *testing.T) {
_, propertiesValue, jdbcParams := buildMongoDatasourceOptions(&biz.DBService{
DBType: string(pkgConst.DBTypeMongoDB),
AdditionalParams: pkgParams.Params{
&pkgParams.Param{Key: mongoTLSEnabledParam, Value: "true", Type: pkgParams.ParamTypeBool},
&pkgParams.Param{Key: mongoAuthDatabaseParam, Value: "admin", Type: pkgParams.ParamTypeString},
&pkgParams.Param{Key: mongoReplicaSetParam, Value: "rs0", Type: pkgParams.ParamTypeString},
},
})
if propertiesValue != nil {
t.Fatalf("expected nil properties, got %#v", propertiesValue)
}
if jdbcParams["tls"] != "true" {
t.Fatalf("expected tls in jdbcUrlParameters when only tls is configured, got %#v", jdbcParams)
if jdbcParams["authSource"] != "admin" || jdbcParams["replicaSet"] != "rs0" {
t.Fatalf("unexpected jdbc params: %#v", jdbcParams)
}
if len(jdbcParams) != 2 {
t.Fatalf("expected only authSource+replicaSet, got %#v", jdbcParams)
}
}

Expand Down