[pbs-devel] [PATCH offline-mirror/proxmox/backup-server 0/6] improve pom multi-key handling and pbs key check

Stefan Sterz s.sterz at proxmox.com
Thu Nov 9 16:33:57 CET 2023


this patch series intends to improve the usability of the
`proxmox-offline-mirror-helper`. it also refactors the handling of the
`ProductType` type. by moving it into the `proxmox-subscription` crate, it is
possible to check the product type consistently accross products. this enables
us to also add a check for the product type to the `subscription
set-offline-key` command in pbs.

the first and third patches move the `ProductType` trait from pom into the
`proxmox-subscription`. the second patch also exposes a `get_next_due_date()`
function for the `SubscriptionInfo` type. these patches need to be applied for
the other patches to work.

the third patch adapts pom's handling of multi-key key-media. previously there
was a bug where pom did not check if the subscription's server id matche the
current system's. this commit fixes that and also adds some more convenience
for systems that need keys for multiple products (e. g. a pve+pbs host). it
also filters the keys by server id that are shown to cli users when using the
interactive `setup` command.

the fifth commit is just a rustfmt clean up for pom. the sixth commit adds a
check to pbs that makes sure an offline subscription that is applied throuh the
manager's `subscription set-offline-key` command is actually a pbs
subscription.

Stefan Sterz (2) @ proxmox:
  type: move `ProductType` type to `proxmox-subscription` from pom
  subscription: expose the `next_due_date` as an `i64`

 proxmox-subscription/src/lib.rs               |  4 +-
 proxmox-subscription/src/subscription_info.rs | 58 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

Stefan Sterz (3) @ proxmox-offline-mirror:
  type: move `ProductType` enum to `proxmox-subscription`
  helper: improve handling of multiple keys when activating them
  offline mirror binary: rustfmt clean up

 src/bin/proxmox-offline-mirror-helper.rs      | 101 +++++++++++-------
 src/bin/proxmox-offline-mirror.rs             |  15 ++-
 src/bin/proxmox_offline_mirror_cmds/medium.rs |   4 +-
 .../subscription.rs                           |   4 +-
 src/config.rs                                 |   4 +-
 src/subscription.rs                           |   4 +-
 src/types.rs                                  |  44 +-------
 7 files changed, 77 insertions(+), 99 deletions(-)

Stefan Sterz (1) @ proxmox-backup:
  manager: check if offline subscription is for the correct product

 src/bin/proxmox_backup_manager/subscription.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--
2.39.2






More information about the pbs-devel mailing list