ComputerSurge/komodo
3
0
Fork 0
forked from github-starred/komodo
Code Pull Requests Packages Releases Activity

0.1.17 support building with ec2 instances

Browse Source
This commit is contained in:
mbecker20
2023-02-22 21:05:03 +00:00
parent f2166c8435
commit 8b1d4793a7
12 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.vscode/tasks.json vendored
View File

@@ -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",

36
Cargo.lock generated
View File

@@ -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",

2
cli/Cargo.toml
View File

@@ -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"

2
core/Cargo.toml
View File

@@ -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

2
lib/db_client/Cargo.toml
View File

@@ -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

2
lib/helpers/Cargo.toml
View File

@@ -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"

4
lib/monitor_client/Cargo.toml
View File

@@ -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"] }

12
lib/monitor_client/src/build.rs
View File

@@ -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<AwsBuilderConfig> {
// 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<AwsBuilderConfig> {
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<Update> {
// self.post::<(), _>(&format!("/api/build/{id}/reclone"), None)

2
lib/periphery_client/Cargo.toml
View File

@@ -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

2
lib/types/Cargo.toml
View File

@@ -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"

4
periphery/Cargo.toml
View File

@@ -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"] }

13
tests/src/tests.rs
View File

@@ -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?;