Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Backup/FileRestore): does not take into consideration S3 backups #6116

Merged
merged 8 commits into from
Feb 18, 2022
Merged

fix(Backup/FileRestore): does not take into consideration S3 backups #6116

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cee1f7e
fix(Backup/FileRestore): does not take into consideration S3 backup
MathieuRA Feb 10, 2022
1a2eeec
remove unrelated change
MathieuRA Feb 10, 2022
168bd03
changelog
MathieuRA Feb 10, 2022
e0988d7
service side check
MathieuRA Feb 14, 2022
b32ab84
Update CHANGELOG.unreleased.md
MathieuRA Feb 14, 2022
d49a68f
add comment
MathieuRA Feb 17, 2022
bd1a060
remove unneeded comment
MathieuRA Feb 18, 2022
19e0253
Merge branch 'master' into s3RestoreUI
MathieuRA Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
> Users must be able to say: “I had this issue, happy to know it's fixed”

- [Self service] Change identifiers used for VM templates to avoid them from being removed on XCP-ng upgrade
- [Backup/File restore] Do not list backups on non-compatible remotes (S3) (PR [#6116](https://github.com/vatesfr/xen-orchestra/pull/6116))

### Packages to release

Expand All @@ -36,3 +37,4 @@
- @xen-orchestra/proxy patch
- xo-cli minor
- xo-server minor
- xo-web patch
6 changes: 5 additions & 1 deletion packages/xo-web/src/xo-app/backup/file-restore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ export default class Restore extends Component {
}

_refreshBackupList = async (_remotes = this.props.remotes, jobs = this.props.jobs) => {
const remotes = keyBy(filter(_remotes, 'enabled'), 'id')
const remotes = keyBy(
Rajaa-BARHTAOUI marked this conversation as resolved.
Show resolved Hide resolved
// S3 remote not supported
julien-f marked this conversation as resolved.
Show resolved Hide resolved
filter(_remotes, remote => remote.enabled && remote.supportFileRestore),
'id'
)
const backupsByRemote = await listVmBackups(toArray(remotes))

const backupDataByVm = {}
Expand Down