Rework snapshot filtering #3951
Merged
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
MichaelEischer
force-pushed
the
rework-snapshot-filter
branch
2 times, most recently
from
382805d
to
f903e17
Compare
|
LGTM. |
…pshotIDs FindFilteredSnapshots no longer prints errors during snapshot loading on stderr, but instead passes the error to the callback to allow the caller to decide on what to do. In addition, it moves the logic to handle an explicit snapshot list from the main package to restic.
Use restic.FindFilteredSnapshot to resolve the snapshot ID. This ensures consistent behavior for all commands using initSingleSnapshotFilterOptions.
MichaelEischer
force-pushed
the
rework-snapshot-filter
branch
from
f903e17
to
de9bc03
Compare
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 does this PR change? What problem does it solve?
The code to filter snapshots is currently dispersed throughout the code. When loading a single snapshot, the special id "latest" must be handled manually (except for
lswhich used the code to load multiple snapshots). When loading multiple snapshots, half of the code was located incmd/restic/find.goand the other half ininternal/restic/snapshot_find.gowhich is rather confusing. Some of the snapshot functions also only returned the snapshot ID making it necessary to add code to load the snapshot each time.This PR unifies the snapshot loading into three functions
FindSnapshot,FindFilteredSnapshotandFindFilteredSnapshotsas part of the restic package. This unification complements #3912,initSingleSnapshotFilterOptionsis now always used together withFindFilteredSnapshotandinitMultiSnapshotFilterOptionswithFindFilteredSnapshots. This ensures consistent behavior across commands.The user visible changes are rather minimal. The help text for
dumphas been fixed. Andlsreturns exit code 1 the snapshot cannot be loaded. Besides that some error messages have changed if a snapshot fails to load.Was the change previously discussed in an issue or on the forum?
No.
Checklist
[ ] I have added documentation for relevant changes (in the manual).changelog/unreleased/that describes the changes for our users (see template).gofmton the code in all commits.