update to new firecrest spec

Author: Panaetius

coman/src/cli/app.rs

@@ -4,8 +4,9 @@ use chrono::{DateTime, Local, TimeDelta};
 use clap::{Args, Command, Parser, Subcommand, ValueHint, builder::TypedValueParser};
 use clap_complete::{ArgValueCompleter, CompletionCandidate, Generator, Shell, generate};
 use color_eyre::{Report, Result};
+use eyre::Context;
 use itertools::Itertools;
-use self_update::cargo_crate_version;
+use self_update::{cargo_crate_version, errors::Error as UpdateError};
 use strum::VariantNames;
 use tokio::sync::mpsc;
 
@@ -565,21 +566,27 @@ pub fn print_completions<G: Generator>(generator: G, cmd: &mut Command) {
 }
 
 pub fn update() -> Result<()> {
-    let status = self_update::backends::github::Update::configure()
+    let result = self_update::backends::github::Update::configure()
         .repo_owner("SwissDataScienceCenter")
         .repo_name("coman")
         .bin_name("coman")
         .bin_path_in_archive("coman")
         .show_download_progress(true)
         .current_version(cargo_crate_version!())
         .build()?
-        .update()?;
-    if status.updated() {
-        println!("Successfully updated to version: `{}`", status.version());
-    } else {
-        println!("Already up to date at version: `{}`", status.version());
+        .update();
+    match result {
+        Ok(status) => {
+            if status.updated() {
+                println!("Successfully updated to version: `{}`", status.version());
+            } else {
+                println!("Already up to date at version: `{}`", status.version());
+            }
+            Ok(())
+        }
+        Err(UpdateError::Update(msg)) if msg == "Update aborted" => Ok(()),
+        Err(e) => Err(e).wrap_err("couldn't perform update"),
     }
-    Ok(())
 }
 
 pub async fn check_update() -> Result<()> {

coman/src/config.rs

@@ -40,8 +40,11 @@ pub struct SystemDescription {
 #[allow(clippy::upper_case_acronyms)]
 pub enum ComputePlatform {
     #[default]
+    #[serde(alias = "hpc", alias = "HPC")]
     HPC,
+    #[serde(alias = "ml", alias = "ML")]
     ML,
+    #[serde(alias = "cw", alias = "CW")]
     CW,
 }
 

coman/src/cscs/api_client/client.rs

@@ -293,7 +293,9 @@ mod tests {
                 Result<PostJobSubmissionResponse>
             ))
             .will_return_async(injectorpp::async_return!(
-                Ok(PostJobSubmissionResponse { job_id: Some(1) }),
+                Ok(PostJobSubmissionResponse {
+                    job_id: Some("1".to_owned())
+                }),
                 Result<PostJobSubmissionResponse>
             ));
         let result = client
@@ -473,7 +475,7 @@ mod tests {
             .will_return_async(injectorpp::async_return!(
                 Ok(UploadFileResponse {
                     transfer_job: TransferJob {
-                        job_id: 1,
+                        job_id: "1".to_owned(),
                         ..Default::default()
                     },
                     transfer_directives: DownloadFileResponseTransferDirectives::S3(S3TransferResponse {
@@ -507,7 +509,7 @@ mod tests {
             .will_return_async(injectorpp::async_return!(
                 Ok(DownloadFileResponse {
                     transfer_job: TransferJob {
-                        job_id: 1,
+                        job_id: "1".to_owned(),
                         ..Default::default()
                     },
                     transfer_directives: DownloadFileResponseTransferDirectives::S3(S3TransferResponse {

firecrest_client/src/types.rs

@@ -88,7 +88,8 @@ pub type AttachComputeSystemNameJobsJobIdAttachPutRequestBody = PostJobAttachReq
 #[derive(Debug, Clone, PartialEq, Serialize, validator::Validate, oas3_gen_support::Default)]
 pub struct BodyPostUploadFilesystemSystemNameOpsUploadPost {
     ///File to be uploaded as `multipart/form-data`
-    pub file: Vec<u8>,
+    #[validate(length(min = 1u64))]
+    pub file: String,
 }
 ///Configuration for automatic object lifecycle in storage buckets.
 #[derive(Debug, Clone, PartialEq, Deserialize, oas3_gen_support::Default)]
@@ -2382,7 +2383,7 @@ pub struct PostJobAttachRequest {
 #[derive(Debug, Clone, PartialEq, Deserialize, oas3_gen_support::Default)]
 pub struct PostJobSubmissionResponse {
     #[serde(rename = "jobId")]
-    pub job_id: Option<i64>,
+    pub job_id: Option<String>,
 }
 ///Submit a new job
 #[derive(Debug, Clone, validator::Validate, oas3_gen_support::Default)]
@@ -3063,7 +3064,7 @@ pub struct StreamerTransferResponse {
 #[derive(Debug, Clone, PartialEq, Deserialize, oas3_gen_support::Default)]
 pub struct TransferJob {
     #[serde(rename = "jobId")]
-    pub job_id: i64,
+    pub job_id: String,
     pub logs: TransferJobLogs,
     pub system: String,
     #[serde(rename = "workingDirectory")]

openapi_spec/firecrest_3.1.yaml

@@ -34,8 +34,8 @@ components:
     Body_post_upload_filesystem__system_name__ops_upload_post:
       properties:
         file:
+          contentMediaType: application/octet-stream
           description: File to be uploaded as `multipart/form-data`
-          format: binary
           title: File
           type: string
       required:
@@ -1395,7 +1395,7 @@ components:
       properties:
         jobId:
           anyOf:
-            - type: integer
+            - type: string
             - type: "null"
           nullable: true
           title: Jobid
@@ -2074,7 +2074,7 @@ components:
       properties:
         jobId:
           title: Jobid
-          type: integer
+          type: string
         logs:
           $ref: "#/components/schemas/TransferJobLogs"
         system: