diff --git a/src/main.rs b/src/main.rs index b0520cd..5824d54 100644 --- a/src/main.rs +++ b/src/main.rs @@ -158,7 +158,7 @@ struct ConfigPath { struct DaftConfig { setup: DaftSetup, #[serde(default)] - run: DaftRun, + run: Vec, #[serde(rename = "job", deserialize_with = "parse_jobs")] jobs: HashMap, } @@ -199,7 +199,6 @@ struct DaftSetup { name: StrRef, #[serde(deserialize_with = "parse_version_req")] version: VersionReq, - provider: DaftProvider, region: StrRef, #[serde(default = "default_number_of_workers")] number_of_workers: usize, @@ -280,21 +279,6 @@ where } } -#[derive(Debug, Deserialize, Clone, PartialEq, Eq)] -#[serde(rename_all = "kebab-case", deny_unknown_fields)] -enum DaftProvider { - Aws, -} - -#[derive(Default, Debug, Deserialize, Clone, PartialEq, Eq)] -#[serde(rename_all = "kebab-case", deny_unknown_fields)] -struct DaftRun { - #[serde(default)] - pre_setup_commands: Vec, - #[serde(default)] - post_setup_commands: Vec, -} - #[derive(Debug, Clone, PartialEq, Eq)] struct DaftJob { command: StrRef, @@ -444,6 +428,7 @@ async fn read_and_convert( let deps = format!("uv pip install {deps}").into(); commands.push(deps); } + commands.extend(daft_config.run.iter().map(Clone::clone)); commands }, }) diff --git a/src/template.toml b/src/template.toml index 5829d43..6dc5804 100644 --- a/src/template.toml +++ b/src/template.toml @@ -8,7 +8,6 @@ [setup] name = "daft-launcher-example" version = "" -provider = "aws" region = "us-west-2" number-of-workers = 4