github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(restore): add S3 teaser [EE-6675] (#11096)

pull/11177/head
Dakota Walsh 2024-02-14 08:40:34 +13:00 committed by GitHub
parent aca6d33548
commit 24471a9ae1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 137 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
app/portainer/views/init/admin/initAdmin.html
View File

@ -131,48 +131,150 @@
</span> </span>
</div> </div>
</div> </div>
<!-- !note -->
<box-selector slim="true" options="restoreOptions" value="formValues.restoreFormType" on-change="(onChangeRestoreType)" radio-name="'restore-type'"></box-selector> <box-selector slim="true" options="restoreOptions" value="formValues.restoreFormType" on-change="(onChangeRestoreType)" radio-name="'restore-type'"></box-selector>
<div class="form-group"> <div ng-if="formValues.restoreFormType === RESTORE_FORM_TYPES.FILE">
<div class="col-sm-12"> <!-- note -->
<span class="small text-muted"> You can upload a backup file from your computer. </span> <div class="form-group">
<div class="col-sm-12">
<span class="small text-muted"> You can upload a backup file from your computer. </span>
</div>
</div> </div>
</div> <!-- !note -->
<!-- !note --> <!-- select-file-input -->
<!-- select-file-input --> <div class="form-group">
<div class="form-group"> <div class="col-sm-12 vertical-center">
<div class="col-sm-12 vertical-center"> <button
<button class="btn btn-sm btn-primary"
class="btn btn-sm btn-primary" ngf-select
ngf-select accept=".gz,.encrypted"
accept=".gz,.encrypted" ngf-accept="'application/x-tar,application/x-gzip'"
ngf-accept="'application/x-tar,application/x-gzip'" ng-model="formValues.BackupFile"
ng-model="formValues.BackupFile" auto-focus
auto-focus data-cy="init-selectBackupFileButton"
data-cy="init-selectBackupFileButton" >Select file</button
>Select file</button >
> <span class="space-left vertical-center">
<span class="space-left vertical-center"> {{ formValues.BackupFile.name }}
{{ formValues.BackupFile.name }} <pr-icon icon="'x-circle'" class-name="'icon-danger'" ng-if="!formValues.BackupFile"></pr-icon>
<pr-icon icon="'x-circle'" class-name="'icon-danger'" ng-if="!formValues.BackupFile"></pr-icon> </span>
</span> </div>
</div> </div>
<!-- password-input -->
<div class="form-group">
<label for="password" class="col-sm-3 control-label text-left">
Password
<portainer-tooltip
message="'If the backup is password protected, provide the password in order to extract the backup file, otherwise this field can be left empty.'"
></portainer-tooltip>
</label>
<div class="col-sm-4">
<input type="password" class="form-control" ng-model="formValues.Password" id="password" data-cy="init-backupPasswordInput" />
</div>
</div>
<!-- !password-input -->
</div> </div>
<!-- !select-file-input --> <!-- !select-file-input -->
<!-- password-input --> <div class="limited-be-content" ng-if="formValues.restoreFormType === RESTORE_FORM_TYPES.S3">
<div class="form-group"> <!-- Access key id -->
<label for="password" class="col-sm-3 control-label text-left"> <div class="form-group">
Password <label for="access_key_id" class="col-sm-3 control-label text-left">Access key ID</label>
<portainer-tooltip <div class="col-sm-9">
message="'If the backup is password protected, provide the password in order to extract the backup file, otherwise this field can be left empty.'" <input type="text" class="form-control" id="access_key_id" name="access_key_id" ng-model="formValues.AccessKeyId" required data-cy="init-accessKeyIdInput" />
></portainer-tooltip> </div>
</label>
<div class="col-sm-4">
<input type="password" class="form-control" ng-model="formValues.Password" id="password" data-cy="init-backupPasswordInput" />
</div> </div>
<!-- !Access key id -->
<!-- Secret access key -->
<div class="form-group">
<label for="secret_access_key" class="col-sm-3 control-label text-left">Secret access key</label>
<div class="col-sm-9">
<input
type="password"
class="form-control"
id="secret_access_key"
name="secret_access_key"
ng-model="formValues.SecretAccessKey"
required
data-cy="init-secretAccessKeyInput"
/>
</div>
</div>
<!-- !Secret access key -->
<!-- Region -->
<div class="form-group">
<label for="backup-s3-region" class="col-sm-3 control-label text-left">Region</label>
<div class="col-sm-9">
<input
type="text"
class="form-control"
placeholder="default region is us-east-1 if left empty"
id="backup-s3-region"
name="backup-s3-region"
ng-model="formValues.Region"
data-cy="init-s3RegionInput"
/>
</div>
</div>
<!-- !Region -->
<!-- Bucket name -->
<div class="form-group">
<label for="bucket_name" class="col-sm-3 control-label text-left">Bucket name</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="bucket_name" name="bucket_name" ng-model="formValues.BucketName" required data-cy="init-bucketNameInput" />
</div>
</div>
<!-- !Bucket name -->
<!-- S3 Compatible Host -->
<div class="form-group">
<label for="s3-compatible-host" class="col-sm-3 control-label text-left">
S3 Compatible Host
<portainer-tooltip message="'Hostname of a S3 service'"></portainer-tooltip>
</label>
<div class="col-sm-9">
<input
type="text"
class="form-control"
id="s3-compatible-host"
name="s3-compatible-host"
ng-model="formValues.S3CompatibleHost"
placeholder="leave empty for AWS S3"
data-cy="init-s3CompatibleHostInput"
/>
</div>
</div>
<!-- !S3 Compatible Host -->
<!-- Filename -->
<div class="form-group">
<label for="backup-s3-filename" class="col-sm-3 control-label text-left">Filename</label>
<div class="col-sm-9">
<input
type="text"
class="form-control"
id="backup-s3-filename"
name="backup-s3-filename"
ng-model="formValues.Filename"
required
data-cy="init-backupFilenameInput"
/>
</div>
</div>
<!-- !Filename -->
<!-- password-input -->
<div class="form-group">
<label for="password" class="col-sm-3 control-label text-left">
Password
<portainer-tooltip
message="'If the backup is password protected, provide the password in order to extract the backup file, otherwise this field can be left empty.'"
></portainer-tooltip>
</label>
<div class="col-sm-4">
<input type="password" class="form-control" ng-model="formValues.Password" id="password" data-cy="init-backupPasswordInput" />
</div>
</div>
<!-- !password-input -->
</div> </div>
<!-- !password-input -->
<!-- note --> <!-- note -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">

2
app/portainer/views/init/admin/initAdminController.js
View File

@ -17,12 +17,14 @@ angular.module('portainer.app').controller('InitAdminController', [
$scope.uploadBackup = uploadBackup; $scope.uploadBackup = uploadBackup;
$scope.logo = StateManager.getState().application.logo; $scope.logo = StateManager.getState().application.logo;
$scope.RESTORE_FORM_TYPES = { S3: 's3', FILE: 'file' };
$scope.formValues = { $scope.formValues = {
Username: 'admin', Username: 'admin',
Password: '', Password: '',
ConfirmPassword: '', ConfirmPassword: '',
enableTelemetry: process.env.NODE_ENV === 'production', enableTelemetry: process.env.NODE_ENV === 'production',
restoreFormType: $scope.RESTORE_FORM_TYPES.FILE,
}; };
$scope.state = { $scope.state = {