rename stop to cancel

Author: Panaetius

coman/src/cli.rs

@@ -45,8 +45,8 @@ pub enum CscsJobCommands {
         #[clap(short, long, trailing_var_arg = true)]
         command: Option<Vec<String>>,
     },
-    #[clap(alias("st"))]
-    Stop { job_id: i64 },
+    #[clap(alias("c"))]
+    Cancel { job_id: i64 },
 }
 #[derive(Subcommand, Debug)]
 pub enum CscsSystemCommands {

coman/src/cscs/api_client.rs

@@ -3,8 +3,8 @@ use color_eyre::eyre::{Context, Result};
 use firecrest_client::{
     client::FirecrestClient,
     compute_api::{
-        get_compute_system_job, get_compute_system_job_metadata, get_compute_system_jobs,
-        post_compute_system_job, stop_compute_system_job,
+        cancel_compute_system_job, get_compute_system_job, get_compute_system_job_metadata,
+        get_compute_system_jobs, post_compute_system_job,
     },
     filesystem_api::{
         post_filesystem_ops_mkdir, post_filesystem_ops_upload, put_filesystem_ops_chmod,
@@ -322,8 +322,8 @@ impl CscsApi {
         Ok(Some((job, job_metadata).into()))
     }
 
-    pub async fn delete_stop(&self, system_name: &str, job_id: i64) -> Result<()> {
-        stop_compute_system_job(&self.client, system_name, job_id)
+    pub async fn cancel_job(&self, system_name: &str, job_id: i64) -> Result<()> {
+        cancel_compute_system_job(&self.client, system_name, job_id)
             .await
             .wrap_err("couldn't delete job")?;
         Ok(())

coman/src/cscs/cli.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use crate::{
     cscs::{
         handlers::{
-            cscs_job_stop, cscs_job_details, cscs_job_list, cscs_start_job, cscs_system_list,
+            cscs_job_cancel, cscs_job_details, cscs_job_list, cscs_start_job, cscs_system_list,
         },
         oauth2::{CLIENT_ID_SECRET_NAME, CLIENT_SECRET_SECRET_NAME, client_credentials_login},
     },
@@ -97,8 +97,8 @@ pub(crate) async fn cli_cscs_job_start(
     cscs_start_job(script_file, image, command).await
 }
 
-pub(crate) async fn cli_cscs_job_stop(job_id: i64) -> Result<()> {
-    cscs_job_stop(job_id).await
+pub(crate) async fn cli_cscs_job_cancel(job_id: i64) -> Result<()> {
+    cscs_job_cancel(job_id).await
 }
 
 pub(crate) async fn cli_cscs_system_list() -> Result<()> {

coman/src/cscs/handlers.rs

@@ -82,13 +82,13 @@ pub async fn cscs_job_details(job_id: i64) -> Result<Option<JobDetail>> {
     }
 }
 
-pub async fn cscs_job_stop(job_id: i64) -> Result<()> {
+pub async fn cscs_job_cancel(job_id: i64) -> Result<()> {
     match get_access_token().await {
         Ok(access_token) => {
             let api_client = CscsApi::new(access_token.0).unwrap();
             let config = Config::new().unwrap();
             api_client
-                .delete_stop(&config.cscs.current_system, job_id)
+                .cancel_job(&config.cscs.current_system, job_id)
                 .await
         }
         Err(e) => Err(e),

coman/src/main.rs

@@ -22,7 +22,7 @@ use crate::{
     components::{global_listener::GlobalListener, toolbar::Toolbar, workload_list::WorkloadList},
     cscs::{
         cli::{
-            cli_cscs_job_stop, cli_cscs_job_detail, cli_cscs_job_list, cli_cscs_job_start,
+            cli_cscs_job_cancel, cli_cscs_job_detail, cli_cscs_job_list, cli_cscs_job_start,
             cli_cscs_login, cli_cscs_system_list,
         },
         ports::{AsyncDeviceFlowPort, AsyncFetchWorkloadsPort},
@@ -62,7 +62,7 @@ async fn main() -> Result<()> {
                         image,
                         command,
                     } => cli_cscs_job_start(script_file, image, command).await?,
-                    cli::CscsJobCommands::Stop { job_id } => cli_cscs_job_stop(job_id).await?,
+                    cli::CscsJobCommands::Cancel { job_id } => cli_cscs_job_cancel(job_id).await?,
                 },
                 cli::CscsCommands::System { command } => match command {
                     cli::CscsSystemCommands::List => cli_cscs_system_list().await?,

firecrest_client/src/compute_api.rs

@@ -103,7 +103,7 @@ pub async fn get_compute_system_job_metadata(
     Ok(model)
 }
 
-pub async fn stop_compute_system_job(
+pub async fn cancel_compute_system_job(
     client: &FirecrestClient,
     system_name: &str,
     job_id: i64,