Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 78 additions & 20 deletions workflows-cli/src/submit_workflow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,18 @@ pub fn submit(args: SubmitArgs) {
ManifestType::Helm => submit_helm(&args.file_path, &args.session, &args.parameters),
};

if let Ok(workflow_name) = result {
println!(
"Submitted Workflow {} to https://workflows.diamond.ac.uk/workflows/{}/{}",
workflow_name, args.session, workflow_name
);
if let Ok((workflow_name, workflow_uid)) = result {
match workflow_uid {
Some(uid) => println!(
"Submitted Workflow {} to https://workflows.diamond.ac.uk/workflows/{}/{}:{}:{}",
workflow_name, args.session, args.session, workflow_name, uid
),
None => eprintln!(
"Workflow {} was submitted successfully, but we couldn't generate a link \
to it. You can find it in the dashboard at https://workflows.diamond.ac.uk",
workflow_name
),
}
std::process::exit(0);
} else if let Err(e) = result {
if e.contains("authentication error") {
Expand All @@ -33,7 +40,11 @@ pub fn submit(args: SubmitArgs) {
}
}

fn submit_helm(target: &Path, session: &str, parameters: &[String]) -> Result<String, String> {
fn submit_helm(
target: &Path,
session: &str,
parameters: &[String],
) -> Result<(String, Option<String>), String> {
let manifest = helm_to_manifest(target, false)?;

if manifest.len() > 1 {
Expand All @@ -48,7 +59,11 @@ fn submit_helm(target: &Path, session: &str, parameters: &[String]) -> Result<St
submit_from_str(raw_manifest, session, parameters)
}

fn submit_manifest(target: &Path, session: &str, parameters: &[String]) -> Result<String, String> {
fn submit_manifest(
target: &Path,
session: &str,
parameters: &[String],
) -> Result<(String, Option<String>), String> {
let raw_manifest = read_manifest(target)?;
submit_from_str(&raw_manifest, session, parameters)
}
Expand All @@ -57,7 +72,7 @@ fn submit_from_str(
raw_manifest: &str,
session: &str,
parameters: &[String],
) -> Result<String, String> {
) -> Result<(String, Option<String>), String> {
let mut parsed: Value = serde_yaml::from_str(raw_manifest)
.map_err(|e| format!("Could not parse the manifest {e}"))?;

Expand All @@ -84,7 +99,13 @@ fn submit_from_str(
let yaml = serde_json::to_string(&parsed).unwrap();
let mut command = get_command_factory().new_command("argo");

command.arg("submit").arg("-").arg("-n").arg(session);
command
.arg("submit")
.arg("-")
.arg("-n")
.arg(session)
.arg("-o")
.arg("json");

for parameter in parameters {
command.arg("-p").arg(parameter);
Expand All @@ -99,16 +120,24 @@ fn submit_from_str(
return Err(error.to_string());
}

let response = String::from_utf8(response.stdout)
.map_err(|e| format!("Could not parse error response: {e}"))?;
let name = response
.lines()
.next()
.and_then(|line| line.split(":").nth(1))
.map(|name| name.trim())
let stdout = String::from_utf8(response.stdout)
.map_err(|e| format!("Could not parse argo submit response: {e}"))?;
let json: serde_json::Value =
serde_json::from_str(&stdout).map_err(|e| format!("Could not parse workflow JSON: {e}"))?;

let name = json
.get("metadata")
.and_then(|metadata| metadata.get("name"))
.and_then(|name| name.as_str())
.ok_or("Could not extract submitted workflow name")?;

Ok(name.to_string())
let uid = json
.get("metadata")
.and_then(|metadata| metadata.get("uid"))
.and_then(|uid| uid.as_str())
.map(|uid| uid.trim().to_string());

Ok((name.to_string(), uid))
}

fn read_manifest(target: &Path) -> Result<String, String> {
Expand Down Expand Up @@ -151,7 +180,13 @@ mod tests {
}
let path = Path::new("./tests/manifests/workflow1.yaml");
let result = submit_manifest(path, "SESSION", &[]).unwrap();
assert_eq!(result, "conditional-steps-40");
assert_eq!(
result,
(
"conditional-steps-40".to_string(),
Some("test-uid-12345".to_string())
)
);
}

#[test]
Expand All @@ -162,7 +197,13 @@ mod tests {
}
let path = Path::new("./tests/charts/templates/workflow1.yaml");
let result = submit_helm(path, "SESSION", &[]).unwrap();
assert_eq!(result, "conditional-steps-40");
assert_eq!(
result,
(
"conditional-steps-40".to_string(),
Some("test-uid-12345".to_string())
)
);
}

#[test]
Expand All @@ -176,7 +217,24 @@ mod tests {

let result = submit_manifest(path, "SESSION", &["message=hello".to_string()]).unwrap();

assert_eq!(result, "conditional-steps-40");
assert_eq!(
result,
(
"conditional-steps-40".to_string(),
Some("test-uid-12345".to_string())
)
);
}

#[test]
#[serial]
fn test_submit_manifest_no_uid() {
unsafe {
env::set_var("WORKFLOW_CLI_TEST_ACTIVE_MAPPING", "submit_workflow_no_uid");
}
let path = Path::new("./tests/manifests/workflow1.yaml");
let result = submit_manifest(path, "SESSION", &[]).unwrap();
assert_eq!(result, ("conditional-steps-40".to_string(), None::<String>));
}

#[test]
Expand Down
20 changes: 11 additions & 9 deletions workflows-cli/tests/mock_commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,14 @@ lint_one_helm_chart:
data:
key: value
submit_workflow:
- command: argo submit - -n SESSION
- command: argo submit - -n SESSION -o json
response: |
Name: conditional-steps-40
Namespace: SESSION
ServiceAccount: unset (will run with the default ServiceAccount)
Status: Pending
Created: Thu Jul 10 16:05:20 +0100 (now)
Progress:
{"apiVersion":"argoproj.io/v1alpha1","kind":"Workflow","metadata":{"name":"conditional-steps-40","namespace":"SESSION","uid":"test-uid-12345"}}
code: 0

- command: argo submit - -n SESSION -p message=hello
- command: argo submit - -n SESSION -o json -p message=hello
response: |
Name: conditional-steps-40
{"apiVersion":"argoproj.io/v1alpha1","kind":"Workflow","metadata":{"name":"conditional-steps-40","namespace":"SESSION","uid":"test-uid-12345"}}
code: 0

- command: helm template ././tests/charts -s templates/workflow1.yaml
Expand All @@ -146,6 +141,13 @@ submit_workflow:
data:
key: value
code: 0

submit_workflow_no_uid:
- command: argo submit - -n SESSION -o json
response: |
{"apiVersion":"argoproj.io/v1alpha1","kind":"Workflow","metadata":{"name":"conditional-steps-40","namespace":"SESSION"}}
code: 0

submit_workflow_failing:
- command: helm template ././tests/charts -s templates/workflow1.yaml
response: |
Expand Down
Loading