diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c819100d4..81288c12c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -92,15 +92,6 @@ "cwd": "${workspaceFolder}/lib/types" } }, - { - "type": "cargo", - "command": "publish", - "args": ["--allow-dirty"], - "label": "publish monitor helpers", - "options": { - "cwd": "${workspaceFolder}/lib/helpers" - } - }, { "type": "cargo", "command": "publish", @@ -109,14 +100,6 @@ "cwd": "${workspaceFolder}/lib/monitor_client" } }, - { - "type": "cargo", - "command": "publish", - "label": "publish monitor periphery", - "options": { - "cwd": "${workspaceFolder}/periphery" - } - }, { "type": "cargo", "command": "publish", diff --git a/Cargo.lock b/Cargo.lock index 34b4d93df..b98dc0a36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -743,7 +743,7 @@ dependencies = [ [[package]] name = "core" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "async_timing_util", @@ -760,7 +760,7 @@ dependencies = [ "hmac", "jwt", "monitor_helpers", - "monitor_types 0.1.16", + "monitor_types 0.1.17", "mungos", "periphery_client", "serde", @@ -995,10 +995,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "db_client" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", - "monitor_types 0.1.16", + "monitor_types 0.1.17", "mungos", ] @@ -1838,7 +1838,7 @@ dependencies = [ [[package]] name = "monitor_cli" -version = "0.1.22" +version = "0.1.23" dependencies = [ "async_timing_util", "clap", @@ -1854,12 +1854,12 @@ dependencies = [ [[package]] name = "monitor_client" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "envy", "futures-util", - "monitor_types 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest", "serde", "serde_derive", @@ -1871,7 +1871,7 @@ dependencies = [ [[package]] name = "monitor_helpers" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "async_timing_util", @@ -1881,7 +1881,7 @@ dependencies = [ "bollard", "futures", "futures-util", - "monitor_types 0.1.16", + "monitor_types 0.1.17", "periphery_client", "rand", "run_command", @@ -1894,7 +1894,7 @@ dependencies = [ [[package]] name = "monitor_periphery" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "async_timing_util", @@ -1906,7 +1906,7 @@ dependencies = [ "envy", "futures-util", "monitor_helpers", - "monitor_types 0.1.16", + "monitor_types 0.1.17", "run_command", "serde", "serde_derive", @@ -1920,7 +1920,7 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "bollard", @@ -1937,9 +1937,9 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d1444216d1585f466d0591cedbdf84d1c810a4f45586362108219e7c943267" +checksum = "8cadc2581c18f79aa663ecdedceac23f8118a9c724c50458f593d3b1f40d182f" dependencies = [ "anyhow", "bollard", @@ -2204,11 +2204,11 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "periphery_client" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anyhow", "futures-util", - "monitor_types 0.1.16", + "monitor_types 0.1.17", "reqwest", "serde", "serde_json", @@ -2893,9 +2893,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] name = "sysinfo" -version = "0.27.7" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e" +checksum = "727220a596b4ca0af040a07091e49f5c105ec8f2592674339a5bf35be592f76e" dependencies = [ "cfg-if", "core-foundation-sys", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 9fc5639d0..f1664e0c0 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_cli" -version = "0.1.22" +version = "0.1.23" edition = "2021" authors = ["MoghTech"] description = "monitor cli | tools to setup monitor system" diff --git a/core/Cargo.toml b/core/Cargo.toml index 92228471d..a57821eea 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "core" -version = "0.1.16" +version = "0.1.17" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/db_client/Cargo.toml b/lib/db_client/Cargo.toml index bbeb3da56..615dd2d92 100644 --- a/lib/db_client/Cargo.toml +++ b/lib/db_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "db_client" -version = "0.1.16" +version = "0.1.17" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/helpers/Cargo.toml b/lib/helpers/Cargo.toml index 4a89c7499..3eed20315 100644 --- a/lib/helpers/Cargo.toml +++ b/lib/helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_helpers" -version = "0.1.16" +version = "0.1.17" edition = "2021" authors = ["MoghTech"] description = "helpers used as dependency for mogh tech monitor" diff --git a/lib/monitor_client/Cargo.toml b/lib/monitor_client/Cargo.toml index 7d7fc373f..f1c71482a 100644 --- a/lib/monitor_client/Cargo.toml +++ b/lib/monitor_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_client" -version = "0.1.16" +version = "0.1.17" edition = "2021" authors = ["MoghTech"] description = "a client to interact with the monitor system" @@ -9,7 +9,7 @@ license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -monitor_types = "0.1.16" +monitor_types = "0.1.17" # monitor_types = { path = "../types" } reqwest = { version = "0.11", features = ["json"] } tokio-tungstenite = { version = "0.18", features=["native-tls"] } diff --git a/lib/monitor_client/src/build.rs b/lib/monitor_client/src/build.rs index a4137504d..7dad7093b 100644 --- a/lib/monitor_client/src/build.rs +++ b/lib/monitor_client/src/build.rs @@ -1,5 +1,5 @@ use anyhow::Context; -use monitor_types::{Build, BuildActionState, BuildVersionsReponse, Update}; +use monitor_types::{AwsBuilderConfig, Build, BuildActionState, BuildVersionsReponse, Update}; use serde_json::{json, Value}; use crate::MonitorClient; @@ -91,11 +91,11 @@ impl MonitorClient { .context(format!("failed at building build {build_id}")) } - // pub async fn get_aws_builder_defaults(&self) -> anyhow::Result { - // self.get("/api/build/aws_builder_defaults", Option::<()>::None) - // .await - // .context("failed at getting aws builder defaults") - // } + pub async fn get_aws_builder_defaults(&self) -> anyhow::Result { + self.get("/api/build/aws_builder_defaults", Option::<()>::None) + .await + .context("failed at getting aws builder defaults") + } // pub async fn reclone_build(&self, id: &str) -> anyhow::Result { // self.post::<(), _>(&format!("/api/build/{id}/reclone"), None) diff --git a/lib/periphery_client/Cargo.toml b/lib/periphery_client/Cargo.toml index c2c80eb3d..48edf2142 100644 --- a/lib/periphery_client/Cargo.toml +++ b/lib/periphery_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "periphery_client" -version = "0.1.16" +version = "0.1.17" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index 5679b56c0..2f80e412c 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_types" -version = "0.1.16" +version = "0.1.17" edition = "2021" authors = ["MoghTech"] description = "types for the mogh tech monitor" diff --git a/periphery/Cargo.toml b/periphery/Cargo.toml index 5be6fcb13..93512ad06 100644 --- a/periphery/Cargo.toml +++ b/periphery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_periphery" -version = "0.1.16" +version = "0.1.17" edition = "2021" authors = ["MoghTech"] description = "monitor periphery binary | run monitor periphery as system daemon" @@ -27,7 +27,7 @@ serde_json = "1.0" bollard = "0.13" anyhow = "1.0" envy = "0.4" -sysinfo = "0.27.7" +sysinfo = "0.28" toml = "0.7" daemonize = "0.4" clap = { version = "4.0", features = ["derive"] } diff --git a/tests/src/tests.rs b/tests/src/tests.rs index c0eb53b33..b0eb39ead 100644 --- a/tests/src/tests.rs +++ b/tests/src/tests.rs @@ -3,9 +3,9 @@ use monitor_client::{ futures_util::StreamExt, tokio_tungstenite::tungstenite::Message, types::{ - AwsBuilderConfigBuilder, Build, BuildBuilder, Command, Conversion, Deployment, - DeploymentWithContainerState, DockerBuildArgs, DockerBuildArgsBuilder, Server, SystemStats, - Update, + AwsBuilderBuildConfig, AwsBuilderConfig, Build, BuildBuilder, Command, Conversion, + Deployment, DeploymentWithContainerState, DockerBuildArgs, DockerBuildArgsBuilder, Server, + SystemStats, Update, }, MonitorClient, }; @@ -141,12 +141,7 @@ pub async fn test_aws_build(monitor: &MonitorClient) -> anyhow::Result<()> { .context("failed to construct DockerBuildArgs struct")? .into(), ) - .aws_config( - AwsBuilderConfigBuilder::default() - .build() - .context("failed to construct AwsBuilderConfig struct")? - .into(), - ) + .aws_config(AwsBuilderBuildConfig::default().into()) .build() .context("failed to construct Build struct")?; let build = monitor.create_full_build(&build).await?;