From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E72B09E549 for ; Mon, 27 Nov 2023 14:31:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D04D17FF9 for ; Mon, 27 Nov 2023 14:31:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 27 Nov 2023 14:31:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AC9F244B58 for ; Mon, 27 Nov 2023 14:31:16 +0100 (CET) Date: Mon, 27 Nov 2023 14:12:37 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20231109153403.529870-1-s.sterz@proxmox.com> <20231109153403.529870-2-s.sterz@proxmox.com> In-Reply-To: <20231109153403.529870-2-s.sterz@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1701090647.yeshb6zgys.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, lib.rs] Subject: [pbs-devel] applied: [PATCH proxmox 1/6] type: move `ProductType` type to `proxmox-subscription` from pom X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2023 13:31:48 -0000 + a follow-up to add `Hash` as well, see my reply to the POM patch On November 9, 2023 4:33 pm, Stefan Sterz wrote: > previously this type lived inside of pom. this made it harder to > access the product type from a `SubscriptionInfo` trait in other > products. move the type here so we can check product types more > consistently across products (e. g. in pom and pbs) >=20 > Signed-off-by: Stefan Sterz > --- > proxmox-subscription/src/lib.rs | 4 +- > proxmox-subscription/src/subscription_info.rs | 51 ++++++++++++++++++- > 2 files changed, 53 insertions(+), 2 deletions(-) >=20 > diff --git a/proxmox-subscription/src/lib.rs b/proxmox-subscription/src/l= ib.rs > index 6c30a91..8a298f2 100644 > --- a/proxmox-subscription/src/lib.rs > +++ b/proxmox-subscription/src/lib.rs > @@ -1,5 +1,7 @@ > mod subscription_info; > -pub use subscription_info::{get_hardware_address, SubscriptionInfo, Subs= criptionStatus}; > +pub use subscription_info::{ > + get_hardware_address, ProductType, SubscriptionInfo, SubscriptionSta= tus, > +}; >=20 > pub mod check; > pub mod files; > diff --git a/proxmox-subscription/src/subscription_info.rs b/proxmox-subs= cription/src/subscription_info.rs > index f455392..dc10a2a 100644 > --- a/proxmox-subscription/src/subscription_info.rs > +++ b/proxmox-subscription/src/subscription_info.rs > @@ -1,4 +1,4 @@ > -use std::path::Path; > +use std::{fmt::Display, path::Path, str::FromStr}; >=20 > use anyhow::{bail, format_err, Error}; > use openssl::hash::{hash, DigestBytes, MessageDigest}; > @@ -59,6 +59,48 @@ impl std::fmt::Display for SubscriptionStatus { > } > } >=20 > +#[cfg_attr(feature =3D "api-types", api())] > +#[cfg_attr(feature =3D "api-types", derive(Updater))] > +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd= , Ord)] > +#[serde(rename_all =3D "lowercase")] > +/// Product type > +pub enum ProductType { > + /// Proxmox Virtual Environment > + Pve, > + /// Proxmox Backup Server > + Pbs, > + /// Proxmox Mail Gateway > + Pmg, > + /// Proxmox Offline Mirror > + Pom, > +} > + > +impl Display for ProductType { > + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { > + let txt =3D match self { > + ProductType::Pve =3D> "pve", > + ProductType::Pbs =3D> "pbs", > + ProductType::Pmg =3D> "pmg", > + ProductType::Pom =3D> "pom", > + }; > + f.write_str(txt) > + } > +} > + > +impl FromStr for ProductType { > + type Err =3D Error; > + > + fn from_str(s: &str) -> Result { > + match s { > + "pve" =3D> Ok(ProductType::Pve), > + "pmg" =3D> Ok(ProductType::Pmg), > + "pbs" =3D> Ok(ProductType::Pbs), > + "pom" =3D> Ok(ProductType::Pom), > + _ =3D> bail!("unknown product type '{s}'"), > + } > + } > +} > + > #[cfg_attr(feature =3D "api-types", api( > properties: { > status: { > @@ -237,6 +279,13 @@ impl SubscriptionInfo { > } > } > } > + > + pub fn get_product_type(&self) -> Result { > + self.key > + .as_ref() > + .ok_or_else(|| format_err!("no product key set")) > + .map(|key| key[..3].parse::())? > + } > } >=20 > /// Shortcut for md5 sums. > -- > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20