Re: [pdm-devel] [PATCH proxmox 2/3] access-control: move `ApiTokenSecret` to types module

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On September 24, 2025 4:51 pm, Shannon Sterz wrote:
> this is technically a breaking change, but so far this type has no
> users
> 
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>  proxmox-access-control/src/token_shadow.rs |  9 ---------
>  proxmox-access-control/src/types.rs        | 12 +++++++++++-
>  2 files changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/proxmox-access-control/src/token_shadow.rs b/proxmox-access-control/src/token_shadow.rs
> index 60b71ac9..46397edb 100644
> --- a/proxmox-access-control/src/token_shadow.rs
> +++ b/proxmox-access-control/src/token_shadow.rs
> @@ -1,7 +1,6 @@
>  use std::collections::HashMap;
>  
>  use anyhow::{bail, format_err, Error};
> -use serde::{Deserialize, Serialize};
>  use serde_json::{from_value, Value};
>  
>  use proxmox_auth_api::types::Authid;
> @@ -9,14 +8,6 @@ use proxmox_product_config::{open_api_lockfile, replace_config, ApiLockGuard};
>  
>  use crate::init::{token_shadow, token_shadow_lock};
>  
> -#[derive(Serialize, Deserialize)]
> -#[serde(rename_all = "kebab-case")]
> -/// ApiToken id / secret pair
> -pub struct ApiTokenSecret {
> -    pub tokenid: Authid,
> -    pub secret: String,
> -}
> -
>  // Get exclusive lock
>  fn lock_config() -> Result<ApiLockGuard, Error> {
>      open_api_lockfile(token_shadow_lock(), None, true)
> diff --git a/proxmox-access-control/src/types.rs b/proxmox-access-control/src/types.rs
> index ea64d333..a146700d 100644
> --- a/proxmox-access-control/src/types.rs
> +++ b/proxmox-access-control/src/types.rs
> @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
>  
>  use const_format::concatcp;
>  
> -use proxmox_auth_api::types::{Authid, Userid, PROXMOX_TOKEN_ID_SCHEMA};
> +use proxmox_auth_api::types::{Authid, Tokenname, Userid, PROXMOX_TOKEN_ID_SCHEMA};
>  use proxmox_schema::{
>      api,
>      api_types::{COMMENT_SCHEMA, SAFE_ID_REGEX_STR, SINGLE_LINE_COMMENT_FORMAT},
> @@ -147,6 +147,16 @@ impl ApiToken {
>      }
>  }
>  
> +#[api]
> +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
> +#[serde(rename_all = "kebab-case")]
> +/// ApiToken id / secret pair
> +pub struct ApiTokenSecret {
> +    pub tokenid: Authid,
> +    /// The secret associated with the token.
> +    pub secret: String,
> +}
> +

almost missed the hunk that makes the serialization consistent with
PBS and old PDM, since it comes in a later patch ;)

>  #[api(
>      properties: {
>          userid: {
> -- 
> 2.47.3
> 
> 
> 
> _______________________________________________
> pdm-devel mailing list
> pdm-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
> 
> 
> 


_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel