fix remaining rename

backend/src/action.rs

@@ -11,10 +11,10 @@ use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use self::docker::DockerAction;
 use crate::config::{Config, ConfigSpec};
 use crate::context::RpcContext;
 use crate::id::{Id, ImageId, InvalidId};
+use crate::procedure::PackageProcedure;
 use crate::s9pk::manifest::PackageId;
 use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
 use crate::util::Version;

backend/src/dependencies.rs

@@ -14,12 +14,12 @@ use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::action::{NoOutput, PackageProcedure};
 use crate::config::action::{ConfigActions, ConfigRes};
 use crate::config::spec::PackagePointerSpec;
 use crate::config::{not_found, Config, ConfigReceipts, ConfigSpec};
 use crate::context::RpcContext;
 use crate::db::model::{CurrentDependencyInfo, InstalledPackageDataEntry};
+use crate::procedure::{NoOutput, PackageProcedure};
 use crate::s9pk::manifest::{Manifest, PackageId};
 use crate::status::health_check::{HealthCheckId, HealthCheckResult};
 use crate::status::{MainStatus, Status};

backend/src/logs.rs

@@ -12,8 +12,8 @@ use tokio::process::Command;
 use tokio_stream::wrappers::LinesStream;
 use tracing::instrument;
 
-use crate::action::docker::DockerAction;
 use crate::error::ResultExt;
+use crate::procedure::docker::DockerProcedure;
 use crate::s9pk::manifest::PackageId;
 use crate::util::serde::Reversible;
 use crate::Error;
@@ -158,7 +158,7 @@ pub async fn fetch_logs(
         LogSource::Container(id) => {
             cmd.arg(format!(
                 "CONTAINER_NAME={}",
-                DockerAction::container_name(&id, None)
+                DockerProcedure::container_name(&id, None)
             ));
         }
     };

backend/src/procedure/mod.rs

@@ -1,25 +1,17 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeSet;
-use std::path::Path;
-use std::str::FromStr;
 use std::time::Duration;
 
-use clap::ArgMatches;
-use color_eyre::eyre::eyre;
-use indexmap::IndexSet;
 use patch_db::HasModel;
-use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
 use self::docker::DockerProcedure;
-use crate::config::{Config, ConfigSpec};
 use crate::context::RpcContext;
-use crate::id::{Id, ImageId, InvalidId};
+use crate::id::ImageId;
 use crate::s9pk::manifest::PackageId;
-use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
 use crate::util::Version;
 use crate::volume::Volumes;
-use crate::{Error, ResultExt};
+use crate::Error;
 
 pub mod docker;
 

backend/src/s9pk/manifest.rs

@@ -7,13 +7,14 @@ use patch_db::HasModel;
 use serde::{Deserialize, Serialize, Serializer};
 use url::Url;
 
-use crate::action::{Actions, PackageProcedure};
+use crate::action::Actions;
 use crate::backup::BackupActions;
 use crate::config::action::ConfigActions;
 use crate::dependencies::Dependencies;
 use crate::id::{Id, InvalidId, SYSTEM_ID};
 use crate::migration::Migrations;
 use crate::net::interface::Interfaces;
+use crate::procedure::PackageProcedure;
 use crate::status::health_check::HealthChecks;
 use crate::util::Version;
 use crate::version::{Current, VersionT};

backend/src/status/health_check.rs

@@ -5,9 +5,9 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Deserializer, Serialize};
 use tracing::instrument;
 
-use crate::action::{NoOutput, PackageProcedure};
 use crate::context::RpcContext;
 use crate::id::{Id, ImageId};
+use crate::procedure::{NoOutput, PackageProcedure};
 use crate::s9pk::manifest::PackageId;
 use crate::util::serde::Duration;
 use crate::util::Version;