Unable to restore EE backups by default BACKUP name

Summary

Exporting a backup with EE creates a filename with embedded suffix <BACKUP_TOKEN>-ee. However, the docs for restore only mention supplying the BACKUP_TOKEN without that suffix.

Steps to reproduce

1. gitlab-rake gitlab:backup:create
2. gitlab-rake gitlab:backup:restore BACKUP='${MY_BACKUP_TOKEN}' force=yes

What is the current bug behavior?

See screenshot. Restore fails to find backup.

What is the expected correct behavior?

Restore find the default backup by expected filename format with given BACKUP_TOKEN

Possible fixes

To fix, I have to hack my BACKUP token.

MY_BACKUP_TOKEN="${MY_BACKUP_TOKEN}-ee"