Alerting: Prevent cleanup of non-empty folders on migration revert #76439
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JacobsonMT
added
area/alerting
JacobsonMT
changed the base branch from
main
to
jacobsonmt/migration_fix_permissions
JacobsonMT
requested review from
a team,
rwwiv,
yuri-tceretian and
grobinson-grafana
and removed request for
a team
JacobsonMT
force-pushed
the
jacobsonmt/migration_fix_permissions
branch
from
e56e6e7
to
dc6b396
Compare
JacobsonMT
force-pushed
the
jacobsonmt/migration_nonempty_folder
branch
from
9cc2691
to
2e86691
Compare
yuri-tceretian
approved these changes
Oct 12, 2023
| var descendantCounts []string | ||
| var cntErr error | ||
| for kind, cnt := range count { | ||
| if cnt > 0 { |
| errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, err)) | ||
| continue | ||
| } | ||
| var descendantCounts []string |
There was a problem hiding this comment.
could be pre-allocated
JacobsonMT
force-pushed
the
jacobsonmt/migration_nonempty_folder
branch
from
2e86691
to
56b4ba6
Compare
JacobsonMT
changed the title
darrenjaneczek
pushed a commit
that referenced
this pull request
Oct 23, 2023
…76439) Prevent cleanup of non-empty folders on revert
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
Currently, when the migration reverts, it cleans up folders created during the previous migration. If, between when the migration was run and revert, other resources were added to the automatically created folders, the revert will delete these descendants as well.
For example, if a dashboard is added to the folder, the dashboard will also be deleted.
This PR will verify that the folder is empty before deleting it. If it is not empty, a warning will be logged and the delete will be skipped.
Who is this feature for?
Users migrating from Legacy Alerting to Grafana Alerting.
Special notes for your reviewer:
When we attempt the create a folder during the migration, we can no longer fail if the folder already exists. As this possibility will become much more common now. Instead, we will log an informational message and use the existing folder.
This is not a perfect solution, as these existing folders could have different permissions that what would have otherwise been created by the migration. However, the risk of conflict is low because of the strict naming scheme for created folders.
Depends on: #74504
Please check that: