Updates to Capabilities (#44)

* changed uri to type in capability configs
* renamed wasmtime capabilities to wasi
* added more wasi capabilities (cli, clocks, sockets)
* moved inherit/allow booleans to properties
* error on unknown capability

Signed-off-by: markfisher <mark@modulewise.com>

Author: markfisher

examples/7cs/README.md

@@ -124,7 +124,7 @@ $ ./run.sh 3
 </td>
 <td>
 
-Host capabilities provide the interfaces a component needs to interact with the external world. For example, the `wasmtime:http` capability enables outgoing requests, and the `wasmtime:io` capability enables the underlying streams and polling (the "io" capability is configured in a separate `infra.toml` file that is shared across examples 4-7 and shown in the final section below).
+Host capabilities provide the interfaces a component needs to interact with the external world. For example, the `wasmtime:http` capability enables a component to make outgoing HTTP requests.
 
 The translator is now replaced with one that calls an external HTTP API. The `translate-api.js` implementation is slightly less simplistic as it also knows how to translate "World" into the same handful of languages.
 
@@ -139,7 +139,7 @@ config.locale = "fr-FR"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 
 [capability.http-client]
 uri = "wasmtime:http"
@@ -177,7 +177,7 @@ config.locale = "de-DE"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]
 
 [component.logger]
@@ -232,7 +232,7 @@ subscription = "names"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]
 
 [component.logger]
@@ -288,7 +288,7 @@ subscription = "names"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]
 ```
 
@@ -319,16 +319,14 @@ And finally, the shared `infra.toml` used for examples 4-7:
 ```toml
 [component.logging-stdout]
 uri = "./lib/wasi-logging-to-stdout.wasm"
-imports = ["stdio", "wasip2"]
+imports = ["stdout", "wasip2"]
 
-[capability.io]
-uri = "wasmtime:io"
-
-[capability.stdio]
-uri = "wasmtime:inherit-stdio"
+[capability.stdout]
+type = "wasi:cli"
+inherit-stdout = true
 
 [capability.wasip2]
-uri = "wasmtime:wasip2"
+type = "wasi:p2"
 ```
 
 ```

examples/7cs/configs/4-capability.toml

@@ -5,7 +5,7 @@ config.locale = "fr-FR"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 
 [capability.http-client]
-uri = "wasmtime:http"
+type = "wasi:http"

examples/7cs/configs/5-cross-cutting-concerns.toml

@@ -5,12 +5,12 @@ config.locale = "de-DE"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]
 
 [component.logger]
 uri = "./lib/logging-advice.wasm"
 imports = ["logging-stdout"]
 
 [capability.http-client]
-uri = "wasmtime:http"
+type = "wasi:http"

examples/7cs/configs/6-channel.toml

@@ -14,12 +14,12 @@ subscription = "names"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]
 
 [component.logger]
 uri = "./lib/logging-advice.wasm"
 imports = ["logging-stdout"]
 
 [capability.http-client]
-uri = "wasmtime:http"
+type = "wasi:http"

examples/7cs/configs/7-collaboration-domain.toml

@@ -6,5 +6,5 @@ subscription = "names"
 
 [component.translator]
 uri = "./lib/capable-translator.wasm"
-imports = ["http-client", "io"]
+imports = ["http-client"]
 interceptors = ["logger"]

examples/7cs/configs/7-collaboration-env.toml

@@ -7,4 +7,4 @@ path = "/hello"
 channel = "names"
 
 [capability.http-client]
-uri = "wasmtime:http"
+type = "wasi:http"

examples/7cs/configs/infra.toml

@@ -2,13 +2,11 @@
 uri = "./lib/wasi-logging-to-stdout.wasm"
 # could provide this here instead of the wkg pull in build.sh:
 # uri = "oci://ghcr.io/componentized/logging/to-stdout:v0.2.1"
-imports = ["stdio", "wasip2"]
+imports = ["stdout", "wasip2"]
 
-[capability.io]
-uri = "wasmtime:io"
-
-[capability.stdio]
-uri = "wasmtime:inherit-stdio"
+[capability.stdout]
+type = "wasi:cli"
+inherit-stdout = true
 
 [capability.wasip2]
-uri = "wasmtime:wasip2"
+type = "wasi:p2"

examples/host-capability/config.toml

@@ -1,5 +1,5 @@
 [capability.greeting]
-uri = "host:greeting"
+type = "greeting"
 
 [component.greeter]
 uri = "./target/wasm32-unknown-unknown/release/greeter.wasm"

examples/interceptor/config.toml

@@ -13,7 +13,8 @@ uri = "./wasi-logging-to-stdout.wasm"
 imports = ["stdio", "wasip2"]
 
 [capability.stdio]
-uri = "wasmtime:inherit-stdio"
+type = "wasi:cli"
+inherit-stdio = true
 
 [capability.wasip2]
-uri = "wasmtime:wasip2"
+type = "wasi:p2"

examples/otel/config-with-components.toml

@@ -14,10 +14,10 @@ config.paths.logs = "/opentelemetry.proto.collector.logs.v1.LogsService/Export"
 config.paths.traces = "/opentelemetry.proto.collector.trace.v1.TraceService/Export"
 
 [capability.http]
-uri = "wasmtime:http"
+type = "wasi:http"
 
 [capability.io]
-uri = "wasmtime:io"
+type = "wasi:io"
 
 [capability.wasip2]
-uri = "wasmtime:wasip2"
+type = "wasi:p2"