From 184e0a6dc077401fc64818b6a75be883e5d3acaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Olveck=C3=BD?= Date: Wed, 14 Oct 2026 06:39:12 +0000 Subject: [PATCH] Migrate to Obelisk 0.43.0-rc.1 --- Justfile | 4 +- dev-deps.txt | 8 ++-- flake.lock | 18 ++++----- .../tutorial_activity-obelisk-ext.wit | 8 ++-- .../tutorial_activity-obelisk-schedule.wit | 10 +++-- .../obelisk_types@6.1.0.wit} | 13 ++++++- .../obelisk_webhook@7.1.0.wit} | 22 +++++------ .../obelisk_types@6.1.0.wit} | 13 ++++++- .../obelisk_workflow@7.1.0.wit} | 38 +++++++++---------- rust/workflow-tutorial/wit/impl.wit | 4 +- 10 files changed, 81 insertions(+), 57 deletions(-) rename rust/webhook-tutorial/wit/deps/{obelisk_types@6.0.0/obelisk_types@6.0.0.wit => obelisk_types@6.1.0/obelisk_types@6.1.0.wit} (93%) rename rust/webhook-tutorial/wit/deps/{obelisk_webhook@7.0.0/obelisk_webhook@7.0.0.wit => obelisk_webhook@7.1.0/obelisk_webhook@7.1.0.wit} (90%) rename rust/workflow-tutorial/wit/deps/{obelisk_types@6.0.0/obelisk_types@6.0.0.wit => obelisk_types@6.1.0/obelisk_types@6.1.0.wit} (93%) rename rust/workflow-tutorial/wit/deps/{obelisk_workflow@7.0.0/obelisk_workflow@7.0.0.wit => obelisk_workflow@7.1.0/obelisk_workflow@7.1.0.wit} (92%) diff --git a/Justfile b/Justfile index 51042ac..95108c8 100644 --- a/Justfile +++ b/Justfile @@ -2,7 +2,7 @@ serve: obelisk server run --server-config server.toml --app-config app.toml --deployment deployment.toml verify: - obelisk server verify --server-config server.toml --app-config app.toml --deployment deployment.toml + obelisk server verify --skip-db --server-config server.toml --app-config app.toml --deployment deployment.toml e2e: ./scripts/e2e.sh @@ -17,4 +17,4 @@ serve-rust: obelisk server run --server-config rust/server.toml --app-config rust/app.toml --deployment rust/deployment.toml verify-rust: - obelisk server verify --server-config rust/server.toml --app-config rust/app.toml --deployment rust/deployment.toml + obelisk server verify --skip-db --server-config rust/server.toml --app-config rust/app.toml --deployment rust/deployment.toml diff --git a/dev-deps.txt b/dev-deps.txt index 5e80445..17e822b 100644 --- a/dev-deps.txt +++ b/dev-deps.txt @@ -1,9 +1,9 @@ cargo-edit-upgrade 0.13.13 cargo-expand 1.0.126 -cargo generate 0.23.9 +cargo generate 0.25.0 just 1.58.0 -obelisk 0.42.0-rc.12 +obelisk 0.43.0-rc.1 pkg-config 0.29.2 rustc 1.98.1 (48a229cea 2026-09-01) -wasm-tools 1.258.0 -ldd (GNU libc) 2.42 +wasm-tools 1.260.0 +ldd (GNU libc) 2.44 diff --git a/flake.lock b/flake.lock index d0d010a..3e71d63 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790463110, - "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=", + "lastModified": 1791594108, + "narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", + "rev": "6510408d147d8c5e6d76043e899e9251756f6a75", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1791026970, - "narHash": "sha256-jlcuv1ddLg6HeYWRzeXRysE+en1nm1vUj+s51AuL1pU=", + "lastModified": 1791920364, + "narHash": "sha256-KprRo32LoASYIWkPXCpk2K1NyV0JFRcsmQ0XfXpBSxQ=", "owner": "obeli-sk", "repo": "obelisk", - "rev": "b6900a1c4546d8eaddbb4c4c3dd9d14d6d9c7ea5", + "rev": "d9a830fc5c1082cf6ef4d0cf4b0acb5e0d90163f", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1790407471, - "narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=", + "lastModified": 1791620365, + "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2", + "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a", "type": "github" }, "original": { diff --git a/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-ext/tutorial_activity-obelisk-ext.wit b/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-ext/tutorial_activity-obelisk-ext.wit index 54ce751..7bac270 100644 --- a/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-ext/tutorial_activity-obelisk-ext.wit +++ b/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-ext/tutorial_activity-obelisk-ext.wit @@ -1,10 +1,10 @@ -// Generated by Obelisk 0.42.0-rc.2 +// Generated by Obelisk 0.43.0-rc.1 package tutorial:activity-obelisk-ext; interface activity-sleepy { - use obelisk:types/execution@6.0.0.{execution-id}; - use obelisk:types/join-set@6.0.0.{join-set}; - use obelisk:types/execution@6.0.0.{await-next-extension-error, get-extension-error, child-execution-request-error}; + use obelisk:types/execution@6.1.0.{execution-id}; + use obelisk:types/join-set@6.1.0.{join-set}; + use obelisk:types/execution@6.1.0.{await-next-extension-error, get-extension-error, child-execution-request-error}; step-submit: func(join-set: borrow, idx: u64, sleep-millis: u64) -> result; diff --git a/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-schedule/tutorial_activity-obelisk-schedule.wit b/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-schedule/tutorial_activity-obelisk-schedule.wit index 103c398..dbbb933 100644 --- a/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-schedule/tutorial_activity-obelisk-schedule.wit +++ b/rust/activity-sleepy/wit/gen/tutorial_activity-obelisk-schedule/tutorial_activity-obelisk-schedule.wit @@ -1,11 +1,13 @@ -// Generated by Obelisk 0.42.0-rc.2 +// Generated by Obelisk 0.43.0-rc.1 package tutorial:activity-obelisk-schedule; interface activity-sleepy { - use obelisk:types/execution@6.0.0.{execution-id}; - use obelisk:types/time@6.0.0.{schedule-at}; - use obelisk:types/execution@6.0.0.{schedule-json-error}; + use obelisk:types/execution@6.1.0.{execution-id}; + use obelisk:types/time@6.1.0.{schedule-at}; + use obelisk:types/execution@6.1.0.{schedule-json-error, schedule-with-id-error}; step-schedule: func(schedule-at: schedule-at, idx: u64, sleep-millis: u64) -> result; + + step-schedule-with-id: func(execution-id: execution-id, schedule-at: schedule-at, idx: u64, sleep-millis: u64) -> result; } diff --git a/rust/webhook-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit b/rust/webhook-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit similarity index 93% rename from rust/webhook-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit rename to rust/webhook-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit index 5415a3f..5bb10ff 100644 --- a/rust/webhook-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit +++ b/rust/webhook-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit @@ -1,4 +1,4 @@ -package obelisk:types@6.0.0; +package obelisk:types@6.1.0; @since(version = 3.0.0) interface time { @@ -122,6 +122,17 @@ interface execution { value-too-large(u64), } + /// Errors from typed scheduling with a caller-supplied top-level execution ID. + @since(version = 6.1.0) + variant schedule-with-id-error { + execution-id-parsing-error(string), + execution-id-must-be-top-level, + conflict, + function-not-found, + type-check-error(string), + value-too-large(u64), + } + variant child-execution-request-error { function-not-found, type-check-error(string), diff --git a/rust/webhook-tutorial/wit/deps/obelisk_webhook@7.0.0/obelisk_webhook@7.0.0.wit b/rust/webhook-tutorial/wit/deps/obelisk_webhook@7.1.0/obelisk_webhook@7.1.0.wit similarity index 90% rename from rust/webhook-tutorial/wit/deps/obelisk_webhook@7.0.0/obelisk_webhook@7.0.0.wit rename to rust/webhook-tutorial/wit/deps/obelisk_webhook@7.1.0/obelisk_webhook@7.1.0.wit index f2d9b87..c4d9db6 100644 --- a/rust/webhook-tutorial/wit/deps/obelisk_webhook@7.0.0/obelisk_webhook@7.0.0.wit +++ b/rust/webhook-tutorial/wit/deps/obelisk_webhook@7.1.0/obelisk_webhook@7.1.0.wit @@ -1,10 +1,10 @@ -package obelisk:webhook@7.0.0; +package obelisk:webhook@7.1.0; @since(version = 5.0.0) interface webhook-support { - use obelisk:types/time@6.0.0.{schedule-at, datetime}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{execution-id, schedule-json-error, execution-failure-kind}; + use obelisk:types/time@6.1.0.{schedule-at, datetime}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{execution-id, schedule-json-error, execution-failure-kind}; /// Error variants that may occur when calling `get-status`. @since(version = 5.0.0) @@ -113,9 +113,9 @@ interface webhook-support { /// Dynamically dispatch functions selected at runtime. @since(version = 7.0.0) interface webhook-dynamic-support { - use obelisk:types/time@6.0.0.{schedule-at}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{execution-id, schedule-json-error}; + use obelisk:types/time@6.1.0.{schedule-at}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{execution-id, schedule-json-error}; /// Call a function and wait for the result. /// Creates a child execution, waits for it to complete, and returns the result. @@ -130,10 +130,10 @@ interface webhook-dynamic-support { /// Backtrace-carrying variants of `webhook-dynamic-support`. @since(version = 7.0.0) interface webhook-dynamic-support-backtrace { - use obelisk:types/time@6.0.0.{schedule-at}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{execution-id, schedule-json-error}; - use obelisk:types/backtrace@6.0.0.{wasm-backtrace}; + use obelisk:types/time@6.1.0.{schedule-at}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{execution-id, schedule-json-error}; + use obelisk:types/backtrace@6.1.0.{wasm-backtrace}; /// See `webhook-dynamic-support.call-json`. call-json: func(function: function, params: string, backtrace: option) -> result, option>, schedule-json-error>; diff --git a/rust/workflow-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit b/rust/workflow-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit similarity index 93% rename from rust/workflow-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit rename to rust/workflow-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit index 5415a3f..5bb10ff 100644 --- a/rust/workflow-tutorial/wit/deps/obelisk_types@6.0.0/obelisk_types@6.0.0.wit +++ b/rust/workflow-tutorial/wit/deps/obelisk_types@6.1.0/obelisk_types@6.1.0.wit @@ -1,4 +1,4 @@ -package obelisk:types@6.0.0; +package obelisk:types@6.1.0; @since(version = 3.0.0) interface time { @@ -122,6 +122,17 @@ interface execution { value-too-large(u64), } + /// Errors from typed scheduling with a caller-supplied top-level execution ID. + @since(version = 6.1.0) + variant schedule-with-id-error { + execution-id-parsing-error(string), + execution-id-must-be-top-level, + conflict, + function-not-found, + type-check-error(string), + value-too-large(u64), + } + variant child-execution-request-error { function-not-found, type-check-error(string), diff --git a/rust/workflow-tutorial/wit/deps/obelisk_workflow@7.0.0/obelisk_workflow@7.0.0.wit b/rust/workflow-tutorial/wit/deps/obelisk_workflow@7.1.0/obelisk_workflow@7.1.0.wit similarity index 92% rename from rust/workflow-tutorial/wit/deps/obelisk_workflow@7.0.0/obelisk_workflow@7.0.0.wit rename to rust/workflow-tutorial/wit/deps/obelisk_workflow@7.1.0/obelisk_workflow@7.1.0.wit index 8712278..893982c 100644 --- a/rust/workflow-tutorial/wit/deps/obelisk_workflow@7.0.0/obelisk_workflow@7.0.0.wit +++ b/rust/workflow-tutorial/wit/deps/obelisk_workflow@7.1.0/obelisk_workflow@7.1.0.wit @@ -1,11 +1,11 @@ -package obelisk:workflow@7.0.0; +package obelisk:workflow@7.1.0; @since(version = 4.0.0) interface workflow-support { - use obelisk:types/time@6.0.0.{schedule-at, datetime}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{delay-id, execution-id, response-id, function-mismatch, schedule-json-error, execution-failure-kind}; - use obelisk:types/join-set@6.0.0.{join-set}; + use obelisk:types/time@6.1.0.{schedule-at, datetime}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{delay-id, execution-id, response-id, function-mismatch, schedule-json-error, execution-failure-kind}; + use obelisk:types/join-set@6.1.0.{join-set}; /// Error variants that may occur on named join set creation. /// The name may only contain alphanumeric characters and the following extra characters: @@ -169,10 +169,10 @@ interface workflow-support { /// Dynamically dispatch functions selected at runtime. @since(version = 7.0.0) interface workflow-dynamic-support { - use obelisk:types/time@6.0.0.{schedule-at}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{execution-id, schedule-json-error}; - use obelisk:types/join-set@6.0.0.{join-set}; + use obelisk:types/time@6.1.0.{schedule-at}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{execution-id, schedule-json-error}; + use obelisk:types/join-set@6.1.0.{join-set}; variant submit-json-error { /// See `Function` definition @@ -203,11 +203,11 @@ interface workflow-dynamic-support { /// native components import the plain `workflow-support` interface instead. @since(version = 6.0.0) interface workflow-support-backtrace { - use obelisk:types/time@6.0.0.{schedule-at, datetime}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{delay-id, execution-id, schedule-json-error}; - use obelisk:types/backtrace@6.0.0.{wasm-backtrace}; - use obelisk:types/join-set@6.0.0.{join-set}; + use obelisk:types/time@6.1.0.{schedule-at, datetime}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{delay-id, execution-id, schedule-json-error}; + use obelisk:types/backtrace@6.1.0.{wasm-backtrace}; + use obelisk:types/join-set@6.1.0.{join-set}; use workflow-support.{join-set-create-error, join-next-error, join-next-for-error, join-next-try-error, stub-json-error}; /// See `workflow-support.random-u64`. @@ -254,11 +254,11 @@ interface workflow-support-backtrace { /// Backtrace-carrying variants of `workflow-dynamic-support`. @since(version = 7.0.0) interface workflow-dynamic-support-backtrace { - use obelisk:types/time@6.0.0.{schedule-at}; - use obelisk:types/function@6.0.0.{function}; - use obelisk:types/execution@6.0.0.{execution-id, schedule-json-error}; - use obelisk:types/backtrace@6.0.0.{wasm-backtrace}; - use obelisk:types/join-set@6.0.0.{join-set}; + use obelisk:types/time@6.1.0.{schedule-at}; + use obelisk:types/function@6.1.0.{function}; + use obelisk:types/execution@6.1.0.{execution-id, schedule-json-error}; + use obelisk:types/backtrace@6.1.0.{wasm-backtrace}; + use obelisk:types/join-set@6.1.0.{join-set}; use workflow-dynamic-support.{submit-json-error}; /// See `workflow-dynamic-support.submit-json`. diff --git a/rust/workflow-tutorial/wit/impl.wit b/rust/workflow-tutorial/wit/impl.wit index 3abb765..87d6cae 100644 --- a/rust/workflow-tutorial/wit/impl.wit +++ b/rust/workflow-tutorial/wit/impl.wit @@ -7,7 +7,7 @@ world any { // Generated extensions for `parallel` workflow. import tutorial:activity-obelisk-ext/activity-sleepy; // Obelisk SDK - import obelisk:types/execution@6.0.0; - import obelisk:workflow/workflow-support@7.0.0; + import obelisk:types/execution@6.1.0; + import obelisk:workflow/workflow-support@7.1.0; import obelisk:log/log@1.0.0; }