From c0397b2c60b6fcbce6a94bf36bb0f3f26575d4b3 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Tue, 4 Nov 2025 22:39:09 -0500 Subject: [PATCH] Bump wasi:config to 0.2.0-rc.1 This is equivalent to 0.2.0-draft, but is properly tagged and no longer requires a manual override. Signed-off-by: Scott Andrews --- .../package.wit | 2 +- wit/overrides/wasi-config/store.wit | 30 ------------------- wit/overrides/wasi-config/world.wit | 6 ---- wit/worlds.wit | 2 +- wkg.lock | 9 ++++++ wkg.toml | 1 - 6 files changed, 11 insertions(+), 39 deletions(-) rename wit/deps/{wasi-config-0.2.0-draft => wasi-config-0.2.0-rc.1}/package.wit (97%) delete mode 100644 wit/overrides/wasi-config/store.wit delete mode 100644 wit/overrides/wasi-config/world.wit diff --git a/wit/deps/wasi-config-0.2.0-draft/package.wit b/wit/deps/wasi-config-0.2.0-rc.1/package.wit similarity index 97% rename from wit/deps/wasi-config-0.2.0-draft/package.wit rename to wit/deps/wasi-config-0.2.0-rc.1/package.wit index a4cdf94..d8950ee 100644 --- a/wit/deps/wasi-config-0.2.0-draft/package.wit +++ b/wit/deps/wasi-config-0.2.0-rc.1/package.wit @@ -1,4 +1,4 @@ -package wasi:config@0.2.0-draft; +package wasi:config@0.2.0-rc.1; interface store { /// An error type that encapsulates the different errors that can occur fetching configuration values. diff --git a/wit/overrides/wasi-config/store.wit b/wit/overrides/wasi-config/store.wit deleted file mode 100644 index 794379a..0000000 --- a/wit/overrides/wasi-config/store.wit +++ /dev/null @@ -1,30 +0,0 @@ -interface store { - /// An error type that encapsulates the different errors that can occur fetching configuration values. - variant error { - /// This indicates an error from an "upstream" config source. - /// As this could be almost _anything_ (such as Vault, Kubernetes ConfigMaps, KeyValue buckets, etc), - /// the error message is a string. - upstream(string), - /// This indicates an error from an I/O operation. - /// As this could be almost _anything_ (such as a file read, network connection, etc), - /// the error message is a string. - /// Depending on how this ends up being consumed, - /// we may consider moving this to use the `wasi:io/error` type instead. - /// For simplicity right now in supporting multiple implementations, it is being left as a string. - io(string), - } - - /// Gets a configuration value of type `string` associated with the `key`. - /// - /// The value is returned as an `option`. If the key is not found, - /// `Ok(none)` is returned. If an error occurs, an `Err(error)` is returned. - get: func( - /// A string key to fetch - key: string - ) -> result, error>; - - /// Gets a list of configuration key-value pairs of type `string`. - /// - /// If an error occurs, an `Err(error)` is returned. - get-all: func() -> result>, error>; -} diff --git a/wit/overrides/wasi-config/world.wit b/wit/overrides/wasi-config/world.wit deleted file mode 100644 index f92f080..0000000 --- a/wit/overrides/wasi-config/world.wit +++ /dev/null @@ -1,6 +0,0 @@ -package wasi:config@0.2.0-draft; - -world imports { - /// The interface for wasi:config/store - import store; -} \ No newline at end of file diff --git a/wit/worlds.wit b/wit/worlds.wit index 1fd7662..c8c50ec 100644 --- a/wit/worlds.wit +++ b/wit/worlds.wit @@ -2,7 +2,7 @@ package componentized:logging; world levels { import wasi:logging/logging@0.1.0-draft; - import wasi:config/store@0.2.0-draft; + import wasi:config/store@0.2.0-rc.1; export wasi:logging/logging@0.1.0-draft; } diff --git a/wkg.lock b/wkg.lock index 67fd4eb..9e89169 100644 --- a/wkg.lock +++ b/wkg.lock @@ -20,6 +20,15 @@ requirement = "=0.2.3" version = "0.2.3" digest = "sha256:3bbed4e582d6209cf281cfe94e51d64fd0c9507635c5e1c68795f493b6cdada9" +[[packages]] +name = "wasi:config" +registry = "wasi.dev" + +[[packages.versions]] +requirement = "=0.2.0-rc.1" +version = "0.2.0-rc.1" +digest = "sha256:1b7f1b0fd07bb4cede16c6a6ec8852815dfb924639a78735fc7bdffdc164485d" + [[packages]] name = "wasi:logging" registry = "wasi.dev" diff --git a/wkg.toml b/wkg.toml index 0ee0e72..300aded 100644 --- a/wkg.toml +++ b/wkg.toml @@ -1,2 +1 @@ [overrides] -"wasi:config" = { path = "./wit/overrides/wasi-config" }