Compare commits
4 Commits
798b113ebb
...
e0bb98e855
Author | SHA1 | Date | |
---|---|---|---|
e0bb98e855 | |||
03e23c7d9d | |||
83294306a4 | |||
ceaad75057 |
19
Cargo.lock
generated
19
Cargo.lock
generated
@ -135,9 +135,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.83"
|
||||
version = "0.1.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
|
||||
checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -428,6 +428,7 @@ dependencies = [
|
||||
"futures",
|
||||
"nodrift",
|
||||
"notmad",
|
||||
"petname",
|
||||
"prost",
|
||||
"prost-types",
|
||||
"reqwest",
|
||||
@ -1833,6 +1834,20 @@ version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||
|
||||
[[package]]
|
||||
name = "petname"
|
||||
version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9cd31dcfdbbd7431a807ef4df6edd6473228e94d5c805e8cf671227a21bad068"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"itertools",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
version = "1.1.7"
|
||||
|
@ -37,3 +37,4 @@ reqwest = { version = "0.12.9", default-features = false, features = [
|
||||
serde_json = "1.0.133"
|
||||
wasmtime = "28.0.0"
|
||||
wasmtime-wasi = "28.0.0"
|
||||
petname = "2.0.2"
|
||||
|
@ -44,7 +44,7 @@ impl State {
|
||||
let config = AgentConfig::new().await?;
|
||||
let discovery = DiscoveryClient::new(&config.discovery).discover().await?;
|
||||
let grpc = GrpcClient::new(&discovery.process_host);
|
||||
let plugin_store = PluginStore::new()?;
|
||||
let plugin_store = PluginStore::new(config.clone())?;
|
||||
let scheduled_tasks = ScheduledTasks::new(plugin_store.clone());
|
||||
let scheduler = Scheduler::new(scheduled_tasks);
|
||||
let queue = AgentQueue::new(scheduler);
|
||||
|
@ -8,6 +8,8 @@ use uuid::Uuid;
|
||||
pub struct AgentConfig {
|
||||
pub agent_id: String,
|
||||
pub discovery: String,
|
||||
|
||||
pub labels: BTreeMap<String, String>,
|
||||
}
|
||||
|
||||
impl AgentConfig {
|
||||
@ -17,6 +19,7 @@ impl AgentConfig {
|
||||
Ok(Self {
|
||||
agent_id: config.agent_id,
|
||||
discovery: config.discovery,
|
||||
labels: config.labels.unwrap_or_default(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -8,6 +8,9 @@ use wasmtime::component::*;
|
||||
use wasmtime::{Config, Engine, Store};
|
||||
use wasmtime_wasi::{DirPerms, FilePerms, WasiCtx, WasiCtxBuilder, WasiView};
|
||||
|
||||
use super::agent_state::State;
|
||||
use super::config::AgentConfig;
|
||||
|
||||
wasmtime::component::bindgen!({
|
||||
path: "wit/world.wit",
|
||||
//world: "churn",
|
||||
@ -17,9 +20,14 @@ wasmtime::component::bindgen!({
|
||||
}
|
||||
});
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct CustomProcess {}
|
||||
pub struct CustomProcess {
|
||||
agent_config: AgentConfig,
|
||||
}
|
||||
impl CustomProcess {
|
||||
pub fn new(agent_config: AgentConfig) -> Self {
|
||||
Self { agent_config }
|
||||
}
|
||||
|
||||
pub fn run(&self, args: Vec<String>) -> String {
|
||||
tracing::info!("calling function");
|
||||
|
||||
@ -42,6 +50,10 @@ impl CustomProcess {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_label(&self, label_key: &str) -> Option<String> {
|
||||
self.agent_config.labels.get(label_key).cloned()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
@ -50,9 +62,9 @@ pub struct PluginStore {
|
||||
}
|
||||
|
||||
impl PluginStore {
|
||||
pub fn new() -> anyhow::Result<Self> {
|
||||
pub fn new(config: AgentConfig) -> anyhow::Result<Self> {
|
||||
Ok(Self {
|
||||
inner: Arc::new(Mutex::new(InnerPluginStore::new()?)),
|
||||
inner: Arc::new(Mutex::new(InnerPluginStore::new(config)?)),
|
||||
})
|
||||
}
|
||||
|
||||
@ -74,7 +86,7 @@ pub struct InnerPluginStore {
|
||||
}
|
||||
|
||||
impl InnerPluginStore {
|
||||
pub fn new() -> anyhow::Result<Self> {
|
||||
pub fn new(agent_config: AgentConfig) -> anyhow::Result<Self> {
|
||||
let mut config = Config::default();
|
||||
config.wasm_component_model(true);
|
||||
config.async_support(true);
|
||||
@ -89,7 +101,7 @@ impl InnerPluginStore {
|
||||
|state: &mut ServerWasiView| state,
|
||||
)?;
|
||||
|
||||
let wasi_view = ServerWasiView::new();
|
||||
let wasi_view = ServerWasiView::new(agent_config);
|
||||
let store = Store::new(&engine, wasi_view);
|
||||
|
||||
Ok(Self {
|
||||
@ -112,11 +124,21 @@ impl InnerPluginStore {
|
||||
pub async fn execute(&mut self, plugin: &str) -> anyhow::Result<()> {
|
||||
let plugin = self.ensure_plugin(plugin).await?;
|
||||
|
||||
plugin
|
||||
if plugin
|
||||
.interface0
|
||||
.call_execute(&mut self.store)
|
||||
.call_should_run(&mut self.store)
|
||||
.await
|
||||
.context("Failed to call add function")
|
||||
.context("Failed to call should run")?
|
||||
{
|
||||
tracing::info!("job was marked as required to run");
|
||||
return plugin
|
||||
.interface0
|
||||
.call_execute(&mut self.store)
|
||||
.await
|
||||
.context("Failed to call add function");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn ensure_plugin(&mut self, plugin: &str) -> anyhow::Result<Churn> {
|
||||
@ -148,6 +170,12 @@ impl InnerPluginStore {
|
||||
|
||||
let req = reqwest::get(format!("https://api-minio.front.kjuulh.io/churn-registry/{plugin_name}/{plugin_version}/{plugin_name}.wasm")).await.context("failed to get plugin from registry")?;
|
||||
let mut stream = req.bytes_stream();
|
||||
|
||||
tracing::info!(
|
||||
plugin_name = plugin_name,
|
||||
plugin_path = plugin_path.display().to_string(),
|
||||
"writing plugin to file"
|
||||
);
|
||||
let mut file = tokio::fs::File::create(&plugin_path).await?;
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk?;
|
||||
@ -177,14 +205,17 @@ struct ServerWasiView {
|
||||
table: ResourceTable,
|
||||
ctx: WasiCtx,
|
||||
processes: ResourceTable,
|
||||
agent_config: AgentConfig,
|
||||
}
|
||||
|
||||
impl ServerWasiView {
|
||||
fn new() -> Self {
|
||||
fn new(agent_config: AgentConfig) -> Self {
|
||||
let table = ResourceTable::new();
|
||||
|
||||
let ctx = WasiCtxBuilder::new()
|
||||
.inherit_stdio()
|
||||
.inherit_stdout()
|
||||
.inherit_stderr()
|
||||
.inherit_env()
|
||||
.inherit_network()
|
||||
.preopened_dir("/", "/", DirPerms::all(), FilePerms::all())
|
||||
@ -195,6 +226,7 @@ impl ServerWasiView {
|
||||
table,
|
||||
ctx,
|
||||
processes: ResourceTable::default(),
|
||||
agent_config,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -216,7 +248,9 @@ impl HostProcess for ServerWasiView {
|
||||
async fn new(
|
||||
&mut self,
|
||||
) -> wasmtime::component::Resource<component::churn_tasks::process::Process> {
|
||||
self.processes.push(CustomProcess::default()).unwrap()
|
||||
self.processes
|
||||
.push(CustomProcess::new(self.agent_config.clone()))
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
async fn run_process(
|
||||
@ -228,6 +262,15 @@ impl HostProcess for ServerWasiView {
|
||||
process.run(inputs)
|
||||
}
|
||||
|
||||
async fn get_variable(
|
||||
&mut self,
|
||||
self_: wasmtime::component::Resource<component::churn_tasks::process::Process>,
|
||||
key: wasmtime::component::__internal::String,
|
||||
) -> String {
|
||||
let process = self.processes.get(&self_).unwrap();
|
||||
process.get_label(&key).unwrap()
|
||||
}
|
||||
|
||||
async fn drop(
|
||||
&mut self,
|
||||
rep: wasmtime::component::Resource<component::churn_tasks::process::Process>,
|
||||
|
@ -31,6 +31,13 @@ pub async fn execute() -> anyhow::Result<()> {
|
||||
setup_labels.insert(k, v);
|
||||
}
|
||||
|
||||
if !setup_labels.contains_key("node_name") {
|
||||
setup_labels.insert(
|
||||
"node_name".into(),
|
||||
petname::petname(2, "-").expect("to be able to generate a valid petname"),
|
||||
);
|
||||
}
|
||||
|
||||
agent::setup_config(discovery, force, setup_labels).await?;
|
||||
tracing::info!("wrote default agent config");
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ interface process {
|
||||
resource process {
|
||||
constructor();
|
||||
run-process: func(inputs: list<string>) -> string;
|
||||
get-variable: func(key: string) -> string;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user