[v10.1.x] Provisioning: Fix overwrite SecureJSONData on provisioning (#72455)

Provisioning: Fix overwrite SecureJSONData on provisioning (#72395)

* Overwrite SecureJSONData on provisioning

(cherry picked from commit a912c970e3)

Co-authored-by: Hugo Kiyodi Oshiro <hugo.oshiro@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-07-27 15:52:34 +02:00
committed by GitHub
co-authored by Hugo Kiyodi Oshiro
parent 3dc60cd2d7
commit a8ee1f1b8f
4 changed files with 113 additions and 19 deletions
+17 -16
View File
@@ -242,21 +242,22 @@ func createUpdateCommand(ds *upsertDataSourceFromConfig, id int64) *datasources.
}
return &datasources.UpdateDataSourceCommand{
ID: id,
UID: ds.UID,
OrgID: ds.OrgID,
Name: ds.Name,
Type: ds.Type,
Access: datasources.DsAccess(ds.Access),
URL: ds.URL,
User: ds.User,
Database: ds.Database,
BasicAuth: ds.BasicAuth,
BasicAuthUser: ds.BasicAuthUser,
WithCredentials: ds.WithCredentials,
IsDefault: ds.IsDefault,
JsonData: jsonData,
SecureJsonData: ds.SecureJSONData,
ReadOnly: !ds.Editable,
ID: id,
UID: ds.UID,
OrgID: ds.OrgID,
Name: ds.Name,
Type: ds.Type,
Access: datasources.DsAccess(ds.Access),
URL: ds.URL,
User: ds.User,
Database: ds.Database,
BasicAuth: ds.BasicAuth,
BasicAuthUser: ds.BasicAuthUser,
WithCredentials: ds.WithCredentials,
IsDefault: ds.IsDefault,
JsonData: jsonData,
SecureJsonData: ds.SecureJSONData,
ReadOnly: !ds.Editable,
IgnoreOldSecureJsonData: true,
}
}