Skip to content
This repository was archived by the owner on Aug 15, 2025. It is now read-only.

Commit eee6825

Browse files
authored
Added plugin installations into the app manifest (#217)
* Added plugin installations into the app manifest * merge_with_overrides * Fixes * Updated dependencies
1 parent 6d8c53f commit eee6825

File tree

14 files changed

+1683
-382
lines changed

14 files changed

+1683
-382
lines changed

Cargo.lock

Lines changed: 198 additions & 351 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@ exclude = [
1414
[workspace.dependencies]
1515

1616
# Golem dep
17-
golem-client = "1.2.2-dev.12"
18-
golem-common = "1.2.2-dev.12"
19-
golem-rib = "1.2.2-dev.12"
20-
golem-rib-repl = "1.2.2-dev.12"
21-
golem-service-base = "1.2.2-dev.12"
22-
golem-wasm-ast = { version = "1.2.2-dev.12", default-features = false, features = ["analysis", "wave"] }
23-
golem-wasm-rpc = { version = "1.2.2-dev.12", default-features = false, features = ["host"] }
17+
golem-client = "1.2.2-dev.13"
18+
golem-common = "1.2.2-dev.13"
19+
golem-rib = "1.2.2-dev.13"
20+
golem-rib-repl = "1.2.2-dev.13"
21+
golem-service-base = "1.2.2-dev.13"
22+
golem-wasm-ast = { version = "1.2.2-dev.13", default-features = false, features = ["analysis", "wave"] }
23+
golem-wasm-rpc = { version = "1.2.2-dev.13", default-features = false, features = ["host"] }
2424
golem-wit = "=1.2.2-dev.9"
2525

2626
# Golem cloud deps
27-
golem-cloud-client = "1.2.2-dev.13"
27+
golem-cloud-client = "1.2.2-dev.14"
2828

2929
# External deps
3030
anyhow = "1.0.97"
3131
assert2 = "0.3.15"
3232
async-trait = "0.1.87"
3333
async_zip = { version = "0.0.17", features = ["tokio", "tokio-fs", "deflate"] }
34+
axum = { version = "0.7.9", features = ["multipart"] }
3435
base64 = "0.22.1"
3536
blake3 = "1.5.5"
3637
bytes = "1.10.1"
@@ -118,13 +119,13 @@ wit-encoder = "=0.227.1"
118119
wit-parser = "=0.227.1"
119120

120121
[patch.crates-io]
121-
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
122-
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
123-
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
124-
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
125-
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
126-
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
127-
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.12" }
122+
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
123+
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
124+
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
125+
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
126+
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
127+
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
128+
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.13" }
128129

129130
redis-protocol = { git = "https://github.com/golemcloud/redis-protocol.rs.git", branch = "unpin-cookie-factory" }
130131
wasmtime = { git = "https://github.com/golemcloud/wasmtime.git", branch = "golem-wasmtime-v27.0.0" }

golem-cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ wit-parser = { workspace = true }
115115
[dev-dependencies]
116116

117117
# External deps
118+
axum = { workspace = true }
118119
log = { workspace = true }
119120
reqwest = { workspace = true }
120121
serde_json_path = { workspace = true }

golem-cli/src/command_handler/component/mod.rs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ use tokio::fs::File;
5959

6060
pub mod ifs;
6161
pub mod plugin;
62+
pub mod plugin_installation;
6263

6364
pub struct ComponentCommandHandler {
6465
ctx: Arc<Context>,
@@ -596,6 +597,8 @@ impl ComponentCommandHandler {
596597
};
597598
let build_profile = self.ctx.build_profile().cloned();
598599

600+
let plugin_installation_handler = self.ctx.plugin_installation_handler();
601+
599602
let components = {
600603
log_action("Deploying", "components");
601604
let _indent = LogIndent::new();
@@ -610,10 +613,18 @@ impl ComponentCommandHandler {
610613
.is_deployable()
611614
{
612615
drop(app_ctx);
613-
components.push(
614-
self.deploy_component(build_profile.as_ref(), project, component_name)
615-
.await?,
616-
);
616+
617+
let component = self
618+
.deploy_component(build_profile.as_ref(), project, component_name)
619+
.await?;
620+
let component = plugin_installation_handler
621+
.apply_plugin_installation_changes(
622+
component_name,
623+
build_profile.as_ref(),
624+
component,
625+
)
626+
.await?;
627+
components.push(component);
617628
}
618629
}
619630

0 commit comments

Comments
 (0)