[pbs-devel] [RFC proxmox-backup 27/39] ui: add S3 client edit window for configuration create/edit

Christian Ebner c.ebner at proxmox.com
Mon May 19 13:46:28 CEST 2025


Adds an edit window for creating or editing S3 client configurations.
Loosely based on the same edit window for the remote configuration.

Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
 pbs-datastore/src/datastore.rs |   5 +-
 www/window/S3BucketEdit.js     | 125 +++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 www/window/S3BucketEdit.js

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 68d3ac6e2..a15f82b5b 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -1461,8 +1461,9 @@ impl DataStore {
                 let mut chunk_count = 0;
                 let prefix = Some(".chunks/");
                 // Operates in batches of 1000 objects max per request
-                let mut list_bucket_result =
-                    proxmox_async::runtime::block_on(s3_client.list_objects_v2(prefix, None, None))?;
+                let mut list_bucket_result = proxmox_async::runtime::block_on(
+                    s3_client.list_objects_v2(prefix, None, None),
+                )?;
 
                 let mut delete_list = Vec::with_capacity(1000);
                 loop {
diff --git a/www/window/S3BucketEdit.js b/www/window/S3BucketEdit.js
new file mode 100644
index 000000000..1491ddbe5
--- /dev/null
+++ b/www/window/S3BucketEdit.js
@@ -0,0 +1,125 @@
+Ext.define('PBS.window.S3BucketEdit', {
+    extend: 'Proxmox.window.Edit',
+    alias: 'widget.pbsS3BucketEdit',
+    mixins: ['Proxmox.Mixin.CBind'],
+
+    onlineHelp: 'backup_s3bucket',
+
+    isAdd: true,
+
+    subject: gettext('S3 Bucket'),
+
+    fieldDefaults: { labelWidth: 120 },
+
+    cbindData: function(initialConfig) {
+	let me = this;
+
+	let baseurl = '/api2/extjs/config/s3';
+	let id = initialConfig.id;
+
+	me.isCreate = !id;
+	me.url = id ? `${baseurl}/${id}` : baseurl;
+	me.method = id ? 'PUT' : 'POST';
+	me.autoLoad = !!id;
+	return {
+	    passwordEmptyText: me.isCreate ? '' : gettext('Unchanged'),
+	};
+    },
+
+    items: {
+	xtype: 'inputpanel',
+	column1: [
+	    {
+		xtype: 'pmxDisplayEditField',
+		name: 'id',
+		fieldLabel: gettext('Unique Identifier'),
+		renderer: Ext.htmlEncode,
+		allowBlank: false,
+		minLength: 4,
+		cbind: {
+		    editable: '{isCreate}',
+		},
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'host',
+		fieldLabel: gettext('Host'),
+		allowBlank: false,
+		emptyText: gettext('FQDN or IP-address'),
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'port',
+		fieldLabel: gettext('Port'),
+		emptyText: gettext("default"),
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
+	    },
+	],
+
+	column2: [
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'bucket',
+		fieldLabel: gettext('Bucket'),
+		allowBlank: false,
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'region',
+		fieldLabel: gettext('Region'),
+		emptyText: gettext("default"),
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'access-key',
+		fieldLabel: gettext('Access Key'),
+		cbind: {
+		    emptyText: '{passwordEmptyText}',
+		    allowBlank: '{!isCreate}',
+		},
+	    },
+	    {
+		xtype: 'textfield',
+		name: 'secret-key',
+		inputType: 'password',
+		fieldLabel: gettext('Secret Key'),
+		cbind: {
+		    emptyText: '{passwordEmptyText}',
+		    allowBlank: '{!isCreate}',
+		},
+	    },
+	],
+
+	columnB: [
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'fingerprint',
+		fieldLabel: gettext('Fingerprint'),
+		emptyText: gettext("Server certificate's SHA-256 fingerprint, required for self-signed certificates"),
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
+	    },
+	],
+    },
+
+    getValues: function() {
+	let me = this;
+	let values = me.callParent(arguments);
+
+	if (me.isCreate) {
+	    /// Secrets are stored into separate config, but set the same id for both configs
+	    values['secrets-id'] = values.id;
+	}
+	if (values['access-key'] === '') {
+	    delete values['access-key']
+	}
+	if (values['secret-key'] === '') {
+	    delete values['secret-key']
+	}
+
+	return values;
+    },
+});
-- 
2.39.5





More information about the pbs-devel mailing list