Skip to content

Commit

Permalink
fix(Backup/FileRestore): hide unsupported S3 backups (#6116)
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuRA authored Feb 18, 2022
1 parent 1dad6b3 commit 3842f5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- [Self service] Change identifiers used for VM templates to avoid them from being removed on XCP-ng upgrade
- [Proxy] Always connect to XAPI via [backup network if defined](https://xen-orchestra.com/blog/xen-orchestra-5-64/#backupmigrationnetwork)
- [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 @@ -39,3 +40,4 @@
- @xen-orchestra/proxy patch
- xo-cli minor
- xo-server minor
- xo-web patch
5 changes: 4 additions & 1 deletion packages/xo-web/src/xo-app/backup/file-restore/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ 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(
filter(_remotes, remote => remote.enabled && remote.supportFileRestore),
'id'
)
const backupsByRemote = await listVmBackups(toArray(remotes))

const backupDataByVm = {}
Expand Down

0 comments on commit 3842f5b

Please sign in to comment.