IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix decrypting in datasource update (#41704)

Browse Source
This commit is contained in:
Tania B
2021-11-16 16:47:59 +02:00
committed by GitHub
parent c907b5315a
commit b84496bc00
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/datasources.go
View File

@@ -294,14 +294,13 @@ func (hs *HTTPServer) fillWithSecureJSONData(ctx context.Context, cmd *models.Up
return models.ErrDatasourceIsReadOnly return models.ErrDatasourceIsReadOnly
} }
secureJSONData, err := hs.SecretsService.DecryptJsonData(ctx, ds.SecureJsonData) for k, v := range ds.SecureJsonData {
if err != nil {
return err
}
for k, v := range secureJSONData {
if _, ok := cmd.SecureJsonData[k]; !ok { if _, ok := cmd.SecureJsonData[k]; !ok {
cmd.SecureJsonData[k] = v decrypted, err := hs.SecretsService.Decrypt(ctx, v)
if err != nil {
return err
}
cmd.SecureJsonData[k] = string(decrypted)
} }
} }