update componentize-go and make use of new features

Per bytecodealliance/componentize-go#35, Spin
applications can now refer to WIT files by way of the
`github.com/spinframework/spin-go-sdk/v3` source package; no need for the
application to supply them itself.

That PR also allows us to pass multiple `--world` flags to `componentize-go`,
allowing us to target e.g. the `fermyon:spin/redis-trigger` _and_
`spin:up/platform` worlds at the same time (which is what Spin actually
implements for Redis triggers).

Signed-off-by: Joel Dice <joel.dice@akamai.com>

Author: dicej

.github/workflows/build.yml

@@ -22,8 +22,8 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Install componentize-go
-        # TODO: Switch to pre-built release once new one is available (i.e. post-v0.2.0):
-        run: cargo install --locked --git https://github.com/bytecodealliance/componentize-go --rev 94413331
+        # TODO: Switch to an upstream (pre-built) release once new one is available and includes https://github.com/bytecodealliance/componentize-go/pull/35
+        run: cargo install --locked --git https://github.com/dicej/componentize-go --rev aa2645d2
 
       - name: Install Spin
         uses: fermyon/actions/spin/setup@v1

Makefile

@@ -13,13 +13,7 @@ regenerate-bindings:
 		-maxdepth 1 \
 		-type d \
 		! -name 'db' \
-		! -name 'export_wasi_http_0_2_0_incoming_handler' \
-		-exec rm -rf {} +
-	componentize-go -w http-trigger -d ./wit bindings --format -o internal --pkg-name github.com/spinframework/spin-go-sdk/v3/internal
-	find $$(pwd)/inbound_redis/internal/ \
-		-mindepth 1 \
-		-maxdepth 1 \
-		-type d \
 		! -name 'export_fermyon_spin_inbound_redis' \
+		! -name 'export_wasi_http_0_2_0_incoming_handler' \
 		-exec rm -rf {} +
-	componentize-go -w fermyon:spin/redis-trigger -d ./wit bindings --format -o inbound_redis/internal --pkg-name github.com/spinframework/spin-go-sdk/v3/inbound_redis/internal
+	componentize-go -w http-trigger -w fermyon:spin/redis-trigger -d ./wit bindings --format -o internal --pkg-name github.com/spinframework/spin-go-sdk/v3/internal

examples/http-outbound/README.md

@@ -10,9 +10,9 @@ Building this as a WebAssembly module can be done using `spin build`:
 
 ```shell
 $ spin build
-Building component http-to-same-app with `componentize-go --world http-trigger --wit-path ../../../wit build`
+Building component http-to-same-app with `componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build`
 Working directory: "./http-to-same-app"
-Building component hello with `componentize-go --world http-trigger --wit-path ../../../wit build`
+Building component hello with `componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build`
 Working directory: "./hello"
 Finished building all Spin components
 ```

examples/http-outbound/spin.toml

@@ -22,13 +22,13 @@ allowed_outbound_hosts = [
 ]
 [component.hello.build]
 workdir = "hello"
-command = "componentize-go --world http-trigger --wit-path ../../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"
 
 [component.http-to-same-app]
 source = "http-to-same-app/main.wasm"
 # Use self to make outbound requests to components in the same Spin application.
 allowed_outbound_hosts = ["http://self"]
 [component.http-to-same-app.build]
 workdir = "http-to-same-app"
-command = "componentize-go --world http-trigger --wit-path ../../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"
 

examples/http-router/spin.toml

@@ -13,4 +13,4 @@ component = "hello"
 [component.hello]
 source = "main.wasm"
 [component.hello.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"

examples/http/spin.toml

@@ -13,4 +13,4 @@ component = "hello"
 [component.hello]
 source = "main.wasm"
 [component.hello.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"

examples/key-value/spin.toml

@@ -14,4 +14,4 @@ component = "hello"
 source = "main.wasm"
 key_value_stores = ["default"]
 [component.hello.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"

examples/llm/spin.toml

@@ -15,5 +15,5 @@ source = "main.wasm"
 allowed_outbound_hosts = []
 ai_models = ["llama2-chat", "all-minilm-l6-v2"]
 [component.llm.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"
 watch = ["**/*.go", "go.mod"]

examples/mqtt-outbound/spin.toml

@@ -16,5 +16,5 @@ source = "main.wasm"
 environment = { MQTT_ADDRESS = "mqtt://127.0.0.1:1883?client_id=client001", MQTT_USERNAME = "user", MQTT_PASSWORD = "password", MQTT_KEEP_ALIVE_INTERVAL = "30", MQTT_TOPIC = "telemetry" }
 allowed_outbound_hosts = ["mqtt://127.0.0.1:1883"]
 [component.mqtt-outbound.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"
 watch = ["**/*.go", "go.mod"]

examples/mysql-outbound/spin.toml

@@ -15,5 +15,5 @@ environment = { DB_URL = "mysql://spin:spin@127.0.0.1/spin_data" }
 source = "main.wasm"
 allowed_outbound_hosts = ["mysql://127.0.0.1"]
 [component.mysql.build]
-command = "componentize-go --world http-trigger --wit-path ../../wit build"
+command = "componentize-go --world http-trigger --wit-module github.com/spinframework/spin-go-sdk/v3 build"
 watch = ["**/*.go", "go.mod"]