feat(xo-server): s3 and encryption at rest are production ready (#7515)

vatesfr · Mar 28, 2024 · f26cbf4 · f26cbf4
1 parent 707f86b
commit f26cbf4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -9,6 +9,7 @@
 
 - [VMWare/Migration] Make one pass for the cold base disk and snapshots (PR [#7487](https://github.com/vatesfr/xen-orchestra/pull/7487))
 - [VMWare/Migration] Use NFS datastore from XO Remote to bypass VMFS6 lock (PR [#7487](https://github.com/vatesfr/xen-orchestra/pull/7487))
+- [Remotes] S3 (Object storage) and remote encryption are production ready (PR [#7515](https://github.com/vatesfr/xen-orchestra/pull/7515))
 
 ### Bug fixes
 
@@ -35,5 +36,6 @@
 - @xen-orchestra/vmware-explorer minor
 - vhd-lib patch
 - xo-acl-resolver minor
+- xo-web minor
 
 <!--packages-end-->
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -598,7 +598,7 @@ const messages = {
   remoteTypeLocal: 'Local',
   remoteTypeNfs: 'NFS',
   remoteTypeSmb: 'SMB',
-  remoteTypeS3: 'Amazon Web Services S3 (beta)',
+  remoteTypeS3: 'Amazon Web Services S3',
   remoteType: 'Type',
   remoteSmbWarningMessage:
     'SMB remotes are meant to work with Windows Server. For other systems (Linux Samba, which means almost all NAS), please use NFS.',

diff --git a/packages/xo-web/src/xo-app/settings/remotes/remote.js b/packages/xo-web/src/xo-app/settings/remotes/remote.js
@@ -230,7 +230,6 @@ export default decorate([
               {map(remoteTypes, (label, key) => _({ key }, label, message => <option value={key}>{message}</option>))}
             </select>
             {type === 'smb' && <em className='text-warning'>{_('remoteSmbWarningMessage')}</em>}
-            {type === 's3' && <em className='text-warning'>Backup to Amazon S3 is a BETA feature</em>}
           </div>
           <div className='form-group'>
             <input
@@ -478,10 +477,7 @@ export default decorate([
             </fieldset>
           )}
           <div className='form-group'>
-            <label>
-              {_('remoteEncryptionKey')}
-              <span className='tag tag-pill tag-info ml-1'>{_('alpha')}</span>
-            </label>
+            <label>{_('remoteEncryptionKey')}</label>
             {isEncrypted && !useVhdDirectory && (
               <p className='text-warning'>
                 <Icon icon='alarm' /> {_('remoteEncryptionMustUseVhd')}