[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>
2023-07-27 15:52:34 +02:00
parent 3dc60cd2d7
commit a8ee1f1b8f
4 changed files with 113 additions and 19 deletions
@@ -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
+			}
 		}
 	}