[MM-63760] Only partially sanitize DB datasources for Support Packet (#30728)
Co-authored-by: Claude <noreply@anthropic.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
160cb91ab9
Коммит
5b389c5224
@@ -409,7 +409,7 @@ func (ds *DatabaseStore) RemoveFile(name string) error {
|
||||
func (ds *DatabaseStore) String() string {
|
||||
// This is called during the running of MM, so we expect the parsing of DSN
|
||||
// to be successful.
|
||||
sanitized, _ := sqlUtils.SanitizeDataSource(ds.driverName, ds.originalDsn)
|
||||
sanitized, _ := model.SanitizeDataSource(ds.driverName, ds.originalDsn)
|
||||
return sanitized
|
||||
}
|
||||
|
||||
|
||||
@@ -65,19 +65,19 @@ func (cd ConfigDiffs) Sanitize() ConfigDiffs {
|
||||
|
||||
cfgPtr, ok := cd[0].BaseVal.(*model.Config)
|
||||
if ok {
|
||||
cfgPtr.Sanitize(pluginManifests)
|
||||
cfgPtr.Sanitize(pluginManifests, nil)
|
||||
}
|
||||
cfgPtr, ok = cd[0].ActualVal.(*model.Config)
|
||||
if ok {
|
||||
cfgPtr.Sanitize(pluginManifests)
|
||||
cfgPtr.Sanitize(pluginManifests, nil)
|
||||
}
|
||||
cfgVal, ok := cd[0].BaseVal.(model.Config)
|
||||
if ok {
|
||||
cfgVal.Sanitize(pluginManifests)
|
||||
cfgVal.Sanitize(pluginManifests, nil)
|
||||
}
|
||||
cfgVal, ok = cd[0].ActualVal.(model.Config)
|
||||
if ok {
|
||||
cfgVal.Sanitize(pluginManifests)
|
||||
cfgVal.Sanitize(pluginManifests, nil)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ func TestDiffSanitized(t *testing.T) {
|
||||
Path: "",
|
||||
BaseVal: func() model.Config {
|
||||
cfg := defaultConfigGen()
|
||||
cfg.Sanitize(nil)
|
||||
cfg.Sanitize(nil, nil)
|
||||
return *cfg
|
||||
}(),
|
||||
ActualVal: model.Config{},
|
||||
@@ -131,7 +131,7 @@ func TestDiffSanitized(t *testing.T) {
|
||||
BaseVal: model.Config{},
|
||||
ActualVal: func() model.Config {
|
||||
cfg := defaultConfigGen()
|
||||
cfg.Sanitize(nil)
|
||||
cfg.Sanitize(nil, nil)
|
||||
return *cfg
|
||||
}(),
|
||||
},
|
||||
|
||||
Ссылка в новой задаче
Block a user