From 8673c757a59baff233bd68b5ed0ccb6015b4c8e0 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Thu, 17 Oct 2024 17:15:30 +0200 Subject: [PATCH] CloudMigrations: only append notification policy if feature flag is on and it exists (#94896) --- .../cloudmigrationimpl/snapshot_mgmt.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go index 119c5856539..bc95dbb4b78 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go @@ -167,13 +167,15 @@ func (s *Service) getMigrationDataJSON(ctx context.Context, signedInUser *user.S }) } - // Notification Policy can only be managed by updating its entire tree, so we send the whole thing as one item. - migrationDataSlice = append(migrationDataSlice, cloudmigration.MigrateDataRequestItem{ - Type: cloudmigration.NotificationPolicyType, - RefID: notificationPolicies.Name, // no UID available - Name: notificationPolicies.Name, - Data: notificationPolicies.Routes, - }) + if s.features.IsEnabledGlobally(featuremgmt.FlagOnPremToCloudMigrationsAlerts) && len(notificationPolicies.Name) > 0 { + // Notification Policy can only be managed by updating its entire tree, so we send the whole thing as one item. + migrationDataSlice = append(migrationDataSlice, cloudmigration.MigrateDataRequestItem{ + Type: cloudmigration.NotificationPolicyType, + RefID: notificationPolicies.Name, // no UID available + Name: notificationPolicies.Name, + Data: notificationPolicies.Routes, + }) + } // Obtain the names of parent elements for Dashboard and Folders data types parentNamesByType, err := s.getParentNames(ctx, signedInUser, dashs, folders, libraryElements)