more api type cleanups: avoid re-exports

src/bin/pmtx.rs

@@ -26,17 +26,12 @@ use proxmox::{
 };
 
 use pbs_config::drive::complete_changer_name;
+use pbs_api_types::{
+    SCSI_CHANGER_PATH_SCHEMA, CHANGER_NAME_SCHEMA, ScsiTapeChanger, LtoTapeDrive,
+};
 
 use proxmox_backup::{
-    tools::sgutils2::{
-        scsi_inquiry,
-    },
-    api2::types::{
-        SCSI_CHANGER_PATH_SCHEMA,
-        CHANGER_NAME_SCHEMA,
-        ScsiTapeChanger,
-        LtoTapeDrive,
-    },
+    tools::sgutils2::scsi_inquiry,
     tape::{
         linux_tape_changer_list,
         complete_changer_path,

src/bin/proxmox-backup-manager.rs

@@ -9,9 +9,13 @@ use proxmox::api::{api, cli::*, RpcEnvironment};
 use pbs_client::{connect_to_localhost, display_task_log, view_task_result};
 use pbs_tools::percent_encoding::percent_encode_component;
 use pbs_tools::json::required_string_param;
+use pbs_api_types::{
+    DATASTORE_SCHEMA, UPID_SCHEMA, REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA,
+    IGNORE_VERIFIED_BACKUPS_SCHEMA, VERIFICATION_OUTDATED_AFTER_SCHEMA,
+};
 
 use proxmox_backup::config;
-use proxmox_backup::api2::{self, types::* };
+use proxmox_backup::api2;
 use proxmox_backup::server::wait_for_local_worker;
 
 mod proxmox_backup_manager;

src/bin/proxmox-daily-update.rs

@@ -7,7 +7,7 @@ use proxmox_backup::api2;
 use proxmox_backup::tools::subscription;
 
 async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> {
-    let upid: proxmox_backup::server::UPID = upid_str.parse()?;
+    let upid: pbs_api_types::UPID = upid_str.parse()?;
     let sleep_duration = core::time::Duration::new(0, 100_000_000);
 
     loop {

src/bin/proxmox-tape.rs

@@ -25,20 +25,14 @@ use pbs_config::drive::complete_drive_name;
 use pbs_config::media_pool::complete_pool_name;
 use pbs_config::datastore::complete_datastore_name;
 
+use pbs_api_types::{
+    Userid, Authid, DATASTORE_SCHEMA, DATASTORE_MAP_LIST_SCHEMA,
+    DRIVE_NAME_SCHEMA, MEDIA_LABEL_SCHEMA, MEDIA_POOL_NAME_SCHEMA,
+    TAPE_RESTORE_SNAPSHOT_SCHEMA,
+};
+
 use proxmox_backup::{
-    api2::{
-        self,
-        types::{
-            Authid,
-            DATASTORE_SCHEMA,
-            DATASTORE_MAP_LIST_SCHEMA,
-            DRIVE_NAME_SCHEMA,
-            MEDIA_LABEL_SCHEMA,
-            MEDIA_POOL_NAME_SCHEMA,
-            Userid,
-            TAPE_RESTORE_SNAPSHOT_SCHEMA,
-        },
-    },
+    api2,
     tape::{
         BlockReadError,
         drive::{

src/bin/proxmox_tape/changer.rs

@@ -16,13 +16,10 @@ use pbs_config::drive::{
     complete_changer_name,
 };
 
+use pbs_api_types::CHANGER_NAME_SCHEMA;
+
 use proxmox_backup::{
-    api2::{
-        self,
-        types::{
-            CHANGER_NAME_SCHEMA,
-        },
-    },
+    api2,
     tape::{
         complete_changer_path,
         drive::media_changer,