Merge pull request #1962 from vdice/chore/examples-v2-manifest

chore(examples): migrate to v2 manifest

Author: itowlson

examples/http-cpp/spin.toml

@@ -1,15 +1,17 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that returns hello."
 name = "spin-hello-world"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "hello"
+[[trigger.http]]
+route = "/hello"
+component = "hello"
+
+[component.hello]
 source = "lib.wasm"
 description = "A simple component that returns hello."
-[component.trigger]
-route = "/hello"
-[component.build]
+[component.hello.build]
 command = "make"

examples/http-rust-outbound-http/spin.toml

@@ -1,47 +1,52 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "Demonstrates outbound HTTP calls"
 name = "spin-outbound-http"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "outbound-http"
+[[trigger.http]]
+route = "/outbound"
+component = "outbound-http"
+
+[[trigger.http]]
+route = "/wildcard"
+component = "outbound-http-wildcard"
+
+[[trigger.http]]
+route = "/outbound-to-hello-component"
+component = "outbound-http-to-same-app"
+
+[[trigger.http]]
+route = "/hello"
+component = "hello-component"
+
+[component.outbound-http]
 source = "outbound-http/target/wasm32-wasi/release/http_rust_outbound_http.wasm"
 allowed_http_hosts = ["https://random-data-api.fermyon.app"]
-[component.trigger]
-route = "/outbound"
-[component.build]
+[component.outbound-http.build]
 workdir = "outbound-http"
 command = "cargo build --target wasm32-wasi --release"
 
-[[component]]
-id = "outbound-http-wildcard"
+[component.outbound-http-wildcard]
 source = "outbound-http/target/wasm32-wasi/release/http_rust_outbound_http.wasm"
 allowed_http_hosts = ["insecure:allow-all"]
-[component.trigger]
-route = "/wildcard"
-[component.build]
+[component.outbound-http-wildcard.build]
 workdir = "outbound-http"
 command = "cargo build --target wasm32-wasi --release"
 
-[[component]]
-id = "outbound-http-to-same-app"
+[component.outbound-http-to-same-app]
 source = "outbound-http-to-same-app/target/wasm32-wasi/release/outbound_http_to_same_app.wasm"
 # To make outbound calls to components in the same Spin app, use the special value self.
 allowed_http_hosts = ["self"]
-[component.trigger]
-route = "/outbound-to-hello-component"
-[component.build]
+[component.outbound-http-to-same-app.build]
 workdir = "outbound-http-to-same-app"
 command = "cargo build --target wasm32-wasi --release"
 
-[[component]]
-id = "hello-component"
+[component.hello-component]
 source = "http-hello/target/wasm32-wasi/release/http_hello.wasm"
 description = "A simple component that returns hello."
-[component.trigger]
-route = "/hello"
-[component.build]
+[component.hello-component.build]
 workdir = "http-hello"
 command = "cargo build --target wasm32-wasi --release"

examples/http-rust-router-macro/spin.toml

@@ -1,16 +1,18 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "An application that demonstrates HTTP routing."
 name = "spin-rust-router"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "route"
+[[trigger.http]]
+route = "/..."
+component = "route"
+
+[component.route]
 source = "target/wasm32-wasi/release/http_rust_router_macro.wasm"
 description = "A component that internally routes HTTP requests."
-[component.trigger]
-route = "/..."
-[component.build]
+[component.route.build]
 command = "cargo build --target wasm32-wasi --release"
 watch = ["src/**/*.rs", "Cargo.toml", "spin.toml"]

examples/http-rust-router/spin.toml

@@ -1,16 +1,18 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "An application that demonstrates HTTP routing."
 name = "spin-rust-router"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "route"
+[[trigger.http]]
+route = "/..."
+component = "route"
+
+[component.route]
 source = "target/wasm32-wasi/release/http_rust_router.wasm"
 description = "A component that internally routes HTTP requests."
-[component.trigger]
-route = "/..."
-[component.build]
+[component.route.build]
 command = "cargo build --target wasm32-wasi --release"
 watch = ["src/**/*.rs", "Cargo.toml", "spin.toml"]

examples/http-rust/spin.toml

@@ -1,16 +1,18 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that returns hello."
 name = "spin-hello-world"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "hello"
+[[trigger.http]]
+route = "/hello"
+component = "hello"
+
+[component.hello]
 source = "target/wasm32-wasi/release/http_rust.wasm"
 description = "A simple component that returns hello."
-[component.trigger]
-route = "/hello"
-[component.build]
+[component.hello.build]
 command = "cargo build --target wasm32-wasi --release"
 watch = ["src/**/*.rs", "Cargo.toml"]

examples/http-tinygo-outbound-http/README.md

@@ -10,24 +10,17 @@ components to send HTTP requests to certain hosts. This is configured in
 > [the Wasm examples](https://github.com/tinygo-org/tinygo/tree/release/src/examples/wasm).
 
 Creating and sending HTTP requests from Spin components closely follows the Go
-`net/http` API:
-
-```go
- r1, err := spin_http.Get("https://random-data-api.fermyon.app/animals/json")
- r2, err := spin_http.Post("https://postman-echo.com/post", "text/plain", bytes.NewBufferString("Hello there!"))
-
-req, err := http.NewRequest("PUT", "https://postman-echo.com/put", bytes NewBufferString("General Kenobi!"))
-req.Header.Add("foo", "bar")
-r3, err := spin_http.Send(req)
-```
+`net/http` API.  See [tinygo-hello/main.go](./tinygo-hello/main.go).
 
 Building this as a WebAssembly module can be done using the `tinygo` compiler:
 
 ```shell
-$ go mod tidy
 $ spin build
-Executing the build command for component tinygo-hello: tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go
-Successfully ran the build command for the Spin components.
+Building component outbound-http-to-same-app with `tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go`
+Working directory: "./outbound-http-to-same-app"
+Building component tinygo-hello with `tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go`
+Working directory: "./tinygo-hello"
+Finished building all Spin components
 ```
 
 The component configuration must contain a list of all hosts allowed to send
@@ -37,15 +30,26 @@ HTTP requests to, otherwise sending the request results in an error:
 Cannot send HTTP request: Destination not allowed: <URL>
 ```
 
+The `tinygo-hello` component has the following allowed hosts set:
+
+```toml
+[component.tinygo-hello]
+source = "tinygo-hello/main.wasm"
+allowed_http_hosts = [
+    "https://random-data-api.fermyon.app",
+    "https://postman-echo.com",
+]
+```
+
+And the `outbound-http-to-same-app` uses the dedicated `self` keyword to enable making
+a request to another component in this same app, via a relative path (in this case, the component
+is `tinygo-hello` at `/hello`):
+
 ```toml
-[[component]]
-id = "tinygo-hello"
-source = "main.wasm"
-allowed_http_hosts = [ "https://random-data-api.fermyon.app", "https://postman-echo.com" ]
-[component.trigger]
-route = "/hello"
-[component.build]
-command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
+[component.outbound-http-to-same-app]
+source = "outbound-http-to-same-app/main.wasm"
+# Use self to make outbound requests to components in the same Spin application.
+allowed_http_hosts = ["self"]
 ```
 
 At this point, we can execute the application with the `spin` CLI:
@@ -58,11 +62,23 @@ The application can now receive requests on `http://localhost:3000/hello`:
 
 ```shell
 $ curl -i localhost:3000/hello -X POST -d "hello there"
+HTTP/1.1 200 OK
+content-length: 976
+date: Thu, 26 Oct 2023 18:26:17 GMT
+
+{{"timestamp":1698344776965,"fact":"Reindeer grow new antlers every year"}}
+...
+```
 
+As well as via the `/outbound-http-to-same-app` path to verify outbound http to the `tinygo-hello` component:
+
+```shell
+$ curl -i localhost:3000/outbound-http-to-same-app
 HTTP/1.1 200 OK
-content-type: text/plain; charset=utf-8
-content-length: 789
-date: Wed, 09 Mar 2022 17:23:08 GMT
+content-length: 946
+date: Thu, 26 Oct 2023 18:26:53 GMT
+
+{{{"timestamp":1698344813408,"fact":"Some hummingbirds weigh less than a penny"}}
 ...
 ```
 

examples/http-tinygo-outbound-http/spin.toml

@@ -1,30 +1,33 @@
-spin_manifest_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go that performs outbound HTTP requests."
 name = "spin-tinygo-outbound-http"
-trigger = { type = "http" }
 version = "1.0.0"
 
-[[component]]
-id = "tinygo-hello"
+[[trigger.http]]
+route = "/hello"
+component = "tinygo-hello"
+
+[[trigger.http]]
+route = "/outbound-http-to-same-app"
+component = "outbound-http-to-same-app"
+
+[component.tinygo-hello]
 source = "tinygo-hello/main.wasm"
 allowed_http_hosts = [
     "https://random-data-api.fermyon.app",
     "https://postman-echo.com",
 ]
-[component.trigger]
-route = "/hello"
-[component.build]
+[component.tinygo-hello.build]
 workdir = "tinygo-hello"
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"
 
-[[component]]
-id = "outbound-http-to-same-app"
+[component.outbound-http-to-same-app]
 source = "outbound-http-to-same-app/main.wasm"
 # Use self to make outbound requests to components in the same Spin application.
 allowed_http_hosts = ["self"]
-[component.trigger]
-route = "/outbound-http-to-same-app"
-[component.build]
+[component.outbound-http-to-same-app.build]
 workdir = "outbound-http-to-same-app"
 command = "tinygo build -target=wasi -gc=leaking -no-debug -o main.wasm main.go"