deploy 1.19.0-dev-9

This commit is contained in:
mbecker20
2025-08-10 20:13:51 -07:00
parent 84368411ca
commit 38a4c4a470
6 changed files with 31 additions and 24 deletions

1
.kminclude Normal file
View File

@@ -0,0 +1 @@
.dev

32
Cargo.lock generated
View File

@@ -904,7 +904,7 @@ dependencies = [
[[package]]
name = "cache"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"tokio",
@@ -1071,7 +1071,7 @@ dependencies = [
[[package]]
name = "command"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"komodo_client",
"run_command",
@@ -1080,7 +1080,7 @@ dependencies = [
[[package]]
name = "config"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"colored",
"indexmap 2.10.0",
@@ -1320,7 +1320,7 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
[[package]]
name = "database"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"async-compression",
@@ -1619,7 +1619,7 @@ dependencies = [
[[package]]
name = "environment"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"formatting",
@@ -1629,7 +1629,7 @@ dependencies = [
[[package]]
name = "environment_file"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"thiserror 2.0.12",
]
@@ -1719,7 +1719,7 @@ dependencies = [
[[package]]
name = "formatting"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"serror",
]
@@ -1881,7 +1881,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "git"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"cache",
@@ -2487,7 +2487,7 @@ dependencies = [
[[package]]
name = "interpolate"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"komodo_client",
@@ -2618,7 +2618,7 @@ dependencies = [
[[package]]
name = "komodo_cli"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"chrono",
@@ -2643,7 +2643,7 @@ dependencies = [
[[package]]
name = "komodo_client"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"async_timing_util",
@@ -2677,7 +2677,7 @@ dependencies = [
[[package]]
name = "komodo_core"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"arc-swap",
@@ -2747,7 +2747,7 @@ dependencies = [
[[package]]
name = "komodo_periphery"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"arc-swap",
@@ -2868,7 +2868,7 @@ dependencies = [
[[package]]
name = "logger"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"komodo_client",
@@ -3610,7 +3610,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "periphery_client"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"komodo_client",
@@ -4141,7 +4141,7 @@ dependencies = [
[[package]]
name = "response"
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
dependencies = [
"anyhow",
"axum",

View File

@@ -8,7 +8,7 @@ members = [
]
[workspace.package]
version = "1.19.0-dev-8"
version = "1.19.0-dev-9"
edition = "2024"
authors = ["mbecker20 <becker.maxh@gmail.com>"]
license = "GPL-3.0-or-later"

View File

@@ -105,8 +105,13 @@ impl Resolve<ExecuteArgs> for RunAction {
)
.context("Failed to parse default Action arguments")?;
let args = merge_objects(default_args, self.args, true, true)
.context("Failed to merge request args with default args")?;
let args = merge_objects(
default_args,
self.args.unwrap_or_default(),
true,
true,
)
.context("Failed to merge request args with default args")?;
let args = serde_json::to_string(&args)
.context("Failed to serialize action run arguments")?;

View File

@@ -506,7 +506,7 @@ pub async fn handle_action_webhook<B: super::ExtractBranch>(
let req = ExecuteRequest::RunAction(RunAction {
action: action.id,
args,
args: args.into(),
});
let update = init_execution_update(&req, &user).await?;
let ExecuteRequest::RunAction(req) = req else {

View File

@@ -28,11 +28,12 @@ pub struct RunAction {
/// Id or name
pub action: String,
/// Custom arguments which can override the defaults.
/// Custom arguments which are merged on top of the default arguments.
/// CLI Format: `"VAR1=val1&VAR2=val2"`
///
/// Webhook-triggered actions use this to pass WEBHOOK_BRANCH and WEBHOOK_BODY.
#[serde(default)]
#[arg(long, short = 'a', value_parser = args_parser)]
pub args: JsonObject,
#[clap(value_parser = args_parser)]
pub args: Option<JsonObject>,
}
fn args_parser(args: &str) -> anyhow::Result<JsonObject> {