Merge branch 'main' into fix-golem-cli-new-target-path

.github/workflows/ci.yaml

@@ -273,6 +273,8 @@ jobs:
         uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prepare WIT dependencies
+        run: cargo make wit
       - name: Build wasm-rpc in stub mode
         run: cargo component build -p golem-wasm-rpc --no-default-features --features stub
 

.gitignore

@@ -23,3 +23,6 @@ golem-client/*
 logs
 data
 .DS_Store
+wit/deps
+wasm-rpc/wit/deps
+durable-wasi/wit/deps

Makefile.toml

@@ -1,6 +1,7 @@
 # List of top-level tasks intended for use:
 #
 # - `cargo make dev-flow` or just `cargo make`: runs a full development flow, including fixing format and clippy, building and running tests and generating OpenAPI specs
+# - `cargo make wit`: fetches the WIT dependencies based on wit/deps.toml
 # - `cargo make build`: builds everything in debug mode
 # - `cargo make build-release`: builds everything in release mode. customizable with PLATFORM_OVERRIDE env variable for docker builds
 # - `cargo make check`: runs rustfmt and clippy checks without applying any fix
@@ -46,13 +47,35 @@ alias = "dev-flow"
 [tasks.dev-flow]
 description = "Runs a full development flow, including fixing format and clippy, building and running tests"
 dependencies = [
+    "wit",
     "fix",
     "check",
     "build",
     # "test"
 ]
 
+# WIT DEPENDENCIES
+[tasks.wit]
+description = "Fetches the WIT dependencies based on wit/deps.toml"
+dependencies = ["wit-host", "wit-wasm-rpc"]
+
+[tasks.wit-wasm-rpc]
+dependencies = ["wit-host"]
+script_runner = "@duckscript"
+script = """
+rm -r wasm-rpc/wit/deps
+mkdir wasm-rpc/wit/deps
+cp wit/deps/io wasm-rpc/wit/deps
+cp wit/deps/wasm-rpc wasm-rpc/wit/deps
+"""
+
+[tasks.wit-host]
+install_crate = { crate_name = "wit-deps-cli", binary = "wit-deps", test_arg = "--help" }
+command = "wit-deps"
+args = ["update"]
+
 [tasks.build]
+dependencies = ["wit"]
 description = "Builds everything in debug mode"
 command = "cargo"
 args = ["build", "--workspace", "--all-targets"]
@@ -64,16 +87,19 @@ condition = { env_not_set = [
 run_task = "build-bins"
 
 [tasks.build-bins]
+dependencies = ["wit"]
 description = "Builds all executables in debug mode"
 command = "cargo"
 args = ["build", "--workspace", "--bins"]
 
 [tasks.build-worker-service]
+dependencies = ["wit"]
 description = "Builds the worker-service"
 command = "cargo"
 args = ["build", "-p", "golem-worker-service"]
 
 [tasks.build-component-service]
+dependencies = ["wit"]
 description = "Builds the component-service"
 command = "cargo"
 args = ["build", "-p", "golem-component-service"]
@@ -83,6 +109,7 @@ description = """This is the top-level task that builds everything in release mo
 to build for other target than the current one, can be linux/amd64 or linux/arm64. This is used for cross-compiling
 for docker images."""
 dependencies = [
+    "wit",
     "set-version",
     "build-release-default",
     "build-release-override-linux-amd64",
@@ -115,7 +142,7 @@ args = ["build", "--release", "--target", "aarch64-unknown-linux-gnu"]
 
 [tasks.check]
 description = "Runs rustfmt and clippy checks without applying any fix"
-dependencies = ["check-clippy", "check-rustfmt"]
+dependencies = ["wit", "check-clippy", "check-rustfmt"]
 
 [tasks.check-rustfmt]
 description = "Runs rustfmt checks without applying any fix"
@@ -133,7 +160,7 @@ args = ["clippy", "--all-targets", "--", "--no-deps", "-Dwarnings"]
 
 [tasks.fix]
 description = "Runs rustfmt and clippy checks and applies fixes"
-dependencies = ["fix-clippy", "fix-rustfmt"]
+dependencies = ["wit", "fix-clippy", "fix-rustfmt"]
 
 [tasks.fix-rustfmt]
 description = "Runs rustfmt checks and applies fixes"
@@ -154,7 +181,6 @@ args = [
     "--no-deps",
     "-Dwarnings",
 ]
-
 ## ** TEST **
 
 [tasks.test]
@@ -168,13 +194,15 @@ dependencies = [
 ]
 
 [tasks.unit-tests]
+dependencies = ["wit"]
 description = "Runs unit tests only"
 script = '''
 cargo test --workspace --lib --all-features --exclude wasm-rpc-stubgen-tests-integration -- --nocapture --report-time $JUNIT_OPTS
 cargo test -p golem-wasm-ast --tests --all-features -- --nocapture --report-time $JUNIT_OPTS
 '''
 
 [tasks.worker-executor-tests]
+dependencies = ["wit"]
 description = "Runs worker executor tests only"
 env = { "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_BACKTRACE" = "1", "RUST_LOG" = "info" }
 command = "cargo"
@@ -189,6 +217,7 @@ args = [
 ]
 
 [tasks.worker-executor-tests-group1]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 1/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
@@ -197,48 +226,55 @@ cargo test --package golem-worker-executor-base --test integration :tag:group1 -
 '''
 
 [tasks.worker-executor-tests-group2]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 2/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group2 -- --report-time
 '''
 
 [tasks.worker-executor-tests-group3]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 3/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group3 -- --report-time
 '''
 
 [tasks.worker-executor-tests-group4]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 4/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group4 -- --report-time $JUNIT_OPTS
 '''
 
 [tasks.worker-executor-tests-group5]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 5/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group5 -- --report-time
 '''
 
 [tasks.worker-executor-tests-group6]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 6/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group6 -- --report-time
 '''
 
 [tasks.worker-executor-tests-group7]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 7/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''
 cargo test --package golem-worker-executor-base --test integration :tag:group7 -- --report-time
 '''
 
 [tasks.worker-executor-tests-group8]
+dependencies = ["wit"]
 description = "Runs worker executor tests only (group 8/8)"
 env = { "RUST_BACKTRACE" = "1", "WASMTIME_BACKTRACE_DETAILS" = "1", "RUST_LOG" = "info", "RUST_TEST_TIME_INTEGRATION" = "5000,30000" }
 script = '''

golem-client/Cargo.toml

@@ -13,7 +13,7 @@ include = ["src/**/*", "Cargo.toml", "build.rs", "openapi/**/*"]
 harness = false
 
 [dependencies]
-golem-common = { path = "../golem-common", version = "=0.0.0", default-features = false }
+golem-common = { path = "../golem-common", version = "=0.0.0", default-features = false, features = ["model"] }
 golem-wasm-ast = { path = "../wasm-ast", version = "=0.0.0", default-features = false, features = ["analysis"] }
 golem-wasm-rpc = { path = "../wasm-rpc", version = "=0.0.0", default-features = false }
 

golem-common/Cargo.toml

@@ -8,13 +8,16 @@ repository = "https://github.com/golemcloud/golem"
 description = "Shared code between Golem services"
 
 [features]
-default = ["config", "observability", "poem", "protobuf", "redis", "sql", "tokio"]
+default = ["base-model", "config", "model", "observability", "poem", "protobuf", "redis", "serialization", "sql", "tokio"]
 
+base-model = []
 config = ["dep:figment"]
+model = ["base-model", "dep:golem-wasm-rpc", "dep:golem-wasm-ast", "dep:golem-rib"]
 observability = ["dep:console-subscriber", "dep:prometheus", "dep:tracing", "dep:tracing-subscriber", "dep:tracing-serde"]
 poem = ["dep:poem", "dep:poem-openapi", "golem-wasm-ast/poem_openapi", "golem-wasm-ast/poem_openapi", "golem-rib/poem"]
 protobuf = ["dep:prost", "dep:prost-types", "dep:tonic", "dep:golem-api-grpc", "golem-rib/protobuf", "golem-wasm-ast/protobuf", "golem-wasm-rpc/protobuf"]
 redis = ["dep:fred"]
+serialization = []
 sql = ["dep:sqlx"]
 tokio = ["dep:tokio"]
 
@@ -23,9 +26,9 @@ harness = false
 
 [dependencies]
 golem-api-grpc = { path = "../golem-api-grpc", version = "=0.0.0", optional = true }
-golem-rib = { path = "../golem-rib", version = "=0.0.0", default-features = false, features = ["protobuf", "poem", "json_in_errors"] } # TODO: make these optionals
-golem-wasm-ast = { path = "../wasm-ast", version = "=0.0.0", default-features = false, features = ["metadata"] }
-golem-wasm-rpc = { path = "../wasm-rpc", version = "=0.0.0", default-features = false, features = ["host"] }
+golem-rib = { path = "../golem-rib", version = "=0.0.0", default-features = false, features = ["protobuf", "poem", "json_in_errors"], optional = true } # TODO: make these optionals
+golem-wasm-ast = { path = "../wasm-ast", version = "=0.0.0", default-features = false, features = ["metadata"], optional = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "=0.0.0", default-features = false, features = ["host"], optional = true }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }