tape: implemenmt show key

Moved API types Kdf and KeyInfo to src/api2/types/mod.rs.

src/bin/proxmox_backup_client/key.rs

@@ -22,13 +22,13 @@ use proxmox::tools::fs::{file_get_contents, replace_file, CreateOptions};
 use proxmox_backup::{
     api2::types::{
         PASSWORD_HINT_SCHEMA,
+        KeyInfo,
+        Kdf,
     },
     backup::{
         rsa_decrypt_key_config,
         CryptConfig,
-        Kdf,
         KeyConfig,
-        KeyDerivationConfig,
     },
     tools,
 };
@@ -318,31 +318,6 @@ fn change_passphrase(
     Ok(())
 }
 
-#[api(
-    properties: {
-        kdf: {
-            type: Kdf,
-        },
-    },
-)]
-#[derive(Deserialize, Serialize)]
-/// Encryption Key Information
-struct KeyInfo {
-    /// Path to key
-    path: String,
-    kdf: Kdf,
-    /// Key creation time
-    pub created: i64,
-    /// Key modification time
-    pub modified: i64,
-    /// Key fingerprint
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub fingerprint: Option<String>,
-    /// Password hint
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub hint: Option<String>,
-}
-
 #[api(
     input: {
         properties: {
@@ -378,21 +353,8 @@ fn show_key(
 
     let output_format = get_output_format(&param);
 
-    let info = KeyInfo {
-        path: format!("{:?}", path),
-        kdf: match config.kdf {
-            Some(KeyDerivationConfig::PBKDF2 { .. }) => Kdf::PBKDF2,
-            Some(KeyDerivationConfig::Scrypt { .. }) => Kdf::Scrypt,
-            None => Kdf::None,
-        },
-        created: config.created,
-        modified: config.modified,
-        fingerprint:  match config.fingerprint {
-            Some(ref fp) => Some(format!("{}", fp)),
-            None => None,
-        },
-        hint: config.hint,
-    };
+    let mut info: KeyInfo = (&config).into();
+    info.path = Some(format!("{:?}", path));
 
     let options = proxmox::api::cli::default_table_format_options()
         .column(ColumnConfig::new("path"))

src/bin/proxmox_tape/encryption_key.rs

@@ -12,6 +12,7 @@ use proxmox::{
 };
 
 use proxmox_backup::{
+    tools,
     config,
     api2::{
         self,
@@ -19,9 +20,9 @@ use proxmox_backup::{
             DRIVE_NAME_SCHEMA,
             TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA,
             PASSWORD_HINT_SCHEMA,
+            Kdf,
         },
     },
-    backup::Kdf,
     config::tape_encryption_keys::complete_key_fingerprint,
 };
 
@@ -39,6 +40,12 @@ pub fn encryption_key_commands() -> CommandLineInterface {
                 .arg_param(&["fingerprint"])
                 .completion_cb("fingerprint", complete_key_fingerprint)
         )
+        .insert(
+            "show",
+            CliCommand::new(&API_METHOD_SHOW_KEY)
+                .arg_param(&["fingerprint"])
+                .completion_cb("fingerprint", complete_key_fingerprint)
+        )
         .insert(
             "restore",
             CliCommand::new(&API_METHOD_RESTORE_KEY)
@@ -54,6 +61,45 @@ pub fn encryption_key_commands() -> CommandLineInterface {
     cmd_def.into()
 }
 
+#[api(
+    input: {
+        properties: {
+            fingerprint: {
+                schema: TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA,
+            },
+            "output-format": {
+                schema: OUTPUT_FORMAT,
+                optional: true,
+            },
+        },
+    },
+)]
+/// Print tthe encryption key's metadata.
+fn show_key(
+    param: Value,
+    rpcenv: &mut dyn RpcEnvironment,
+) -> Result<(), Error> {
+
+    let output_format = get_output_format(&param);
+
+    let info = &api2::config::tape_encryption_keys::API_METHOD_READ_KEY;
+    let mut data = match info.handler {
+        ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
+        _ => unreachable!(),
+    };
+
+    let options = proxmox::api::cli::default_table_format_options()
+        .column(ColumnConfig::new("kdf"))
+        .column(ColumnConfig::new("created").renderer(tools::format::render_epoch))
+        .column(ColumnConfig::new("modified").renderer(tools::format::render_epoch))
+        .column(ColumnConfig::new("fingerprint"))
+        .column(ColumnConfig::new("hint"));
+
+    format_and_print_result_full(&mut data, &info.returns, &output_format, &options);
+
+    Ok(())
+}
+
 #[api(
     input: {
         properties: {