public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provisioning: Fix overwrite SecureJSONData on provisioning (#72395)

Browse Source 
* Overwrite SecureJSONData on provisioning
This commit is contained in:
Hugo Kiyodi Oshiro
2023-07-27 11:11:43 +02:00
committed by GitHub
parent a4a87f6228
commit a912c970e3
4 changed files with 113 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource.go
+5 -3
View File
@@ -644,9 +644,11 @@ func (s *Service) fillWithSecureJSONData(ctx context.Context, cmd *datasources.U
cmd.SecureJsonData = make(map[string]string)
}
for k, v := range decrypted {
if _, ok := cmd.SecureJsonData[k]; !ok {
cmd.SecureJsonData[k] = v
if !cmd.IgnoreOldSecureJsonData {
for k, v := range decrypted {
if _, ok := cmd.SecureJsonData[k]; !ok {
cmd.SecureJsonData[k] = v
}
}
}