From 92d0420a45f6687b20e02641083bdbacc2f2ea83 Mon Sep 17 00:00:00 2001
From: "lean.dev" <34773040+leandro-deveikis@users.noreply.github.com>
Date: Wed, 10 Aug 2022 16:23:55 -0300
Subject: [PATCH] Adding logs during migration of secrets to plugin (#53426)

---
 pkg/services/secrets/kvstore/plugin_mig.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/services/secrets/kvstore/plugin_mig.go b/pkg/services/secrets/kvstore/plugin_mig.go
index 92694a65003..a1c48f0315a 100644
--- a/pkg/services/secrets/kvstore/plugin_mig.go
+++ b/pkg/services/secrets/kvstore/plugin_mig.go
@@ -2,6 +2,7 @@ package kvstore
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -62,23 +63,28 @@ func (s *PluginSecretMigrationService) Migrate(ctx context.Context) error {
 		namespacedKVStore := GetNamespacedKVStore(s.kvstore)
 		wasFatal, err := isPluginStartupErrorFatal(ctx, namespacedKVStore)
 		if err != nil {
-			s.logger.Warn("unabled to determine whether plugin startup failures are fatal - continuing migration anyway.")
+			s.logger.Warn("unable to determine whether plugin startup failures are fatal - continuing migration anyway.")
 		}
 
 		allSec, err := secretsSql.GetAll(ctx)
 		if err != nil {
 			return nil
 		}
+		totalSec := len(allSec)
 		// We just set it again as the current secret store should be the plugin secret
-		for _, sec := range allSec {
+		s.logger.Debug(fmt.Sprintf("Total amount of secrets to migrate: %d", totalSec))
+		for i, sec := range allSec {
+			s.logger.Debug(fmt.Sprintf("Migrating secret %d of %d", i+1, totalSec), "current", i+1, "secretCount", totalSec)
 			err = s.secretsStore.Set(ctx, *sec.OrgId, *sec.Namespace, *sec.Type, sec.Value)
 			if err != nil {
 				return err
 			}
 		}
-		s.logger.Debug("migrated unified secrets to plugin", "number of secrets", len(allSec))
+		s.logger.Debug("migrated unified secrets to plugin", "number of secrets", totalSec)
 		// as no err was returned, when we delete all the secrets from the sql store
 		for index, sec := range allSec {
+			s.logger.Debug(fmt.Sprintf("Cleaning secret %d of %d", index+1, totalSec), "current", index+1, "secretCount", totalSec)
+
 			err = secretsSql.Del(ctx, *sec.OrgId, *sec.Namespace, *sec.Type)
 			if err != nil {
 				s.logger.Error("plugin migrator encountered error while deleting unified secrets")
@@ -94,7 +100,7 @@ func (s *PluginSecretMigrationService) Migrate(ctx context.Context) error {
 				return err
 			}
 		}
-		s.logger.Debug("deleted unified secrets after migration", "number of secrets", len(allSec))
+		s.logger.Debug("deleted unified secrets after migration", "number of secrets", totalSec)
 	}
 	return nil
 }