update wasm path in test apps and push to local registry

rajatjindal · rajatjindal · commit 2414b9705338 · 2024-04-29T12:53:04.000+05:30
Signed-off-by: Rajat Jindal &lt;rajatjindal83@gmail.com&gt;
diff --git a/images/spin-inbound-redis/Cargo.lock b/images/spin-inbound-redis/Cargo.lock
diff --git a/images/spin-inbound-redis/Dockerfile b/images/spin-inbound-redis/Dockerfile
@@ -4,5 +4,5 @@ COPY . .
 RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
 
 FROM scratch
-COPY --from=build /opt/build/target/wasm32-wasi/release/spin_inbound_redis.wasm .
+COPY --from=build /opt/build/target/wasm32-wasi/release/spin_inbound_redis.wasm ./target/wasm32-wasi/release/spin_inbound_redis.wasm
 COPY --from=build /opt/build/spin.toml .
diff --git a/images/spin-inbound-redis/spin.toml b/images/spin-inbound-redis/spin.toml
@@ -14,9 +14,12 @@ address = "{{ redis_address }}"
 component = "hello"
 
 [component.hello]
-source = "spin_inbound_redis.wasm"
+source = "target/wasm32-wasi/release/spin_inbound_redis.wasm"
 allowed_outbound_hosts = ["redis://*:*"]
 
+[component.hello.build]
+command = "cargo build --target wasm32-wasi --release"
+
 [component.hello.variables]
 redis_address = "{{ redis_address }}"
 redis_channel = "{{ redis_channel }}"
diff --git a/images/spin-multi-trigger-app/Dockerfile b/images/spin-multi-trigger-app/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /opt/build/spin-redis-trigger
 RUN cargo build --target wasm32-wasi --release
 
 FROM scratch
-COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm .
-COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm .
+COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm
+COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm
 COPY --from=build /opt/build/spin.toml .
diff --git a/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock b/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock
diff --git a/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock b/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock
diff --git a/images/spin-multi-trigger-app/spin.toml b/images/spin-multi-trigger-app/spin.toml
@@ -11,10 +11,10 @@ route = "/..."
 component = "spin-http-trigger"
 
 [component.spin-http-trigger]
-source = "spin_http_trigger.wasm"
+source = "spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm"
 allowed_outbound_hosts = []
 [component.spin-http-trigger.build]
-command = "cargo build --target wasm32-wasi --release"
+command = "cd spin-http-trigger && cargo build --target wasm32-wasi --release && cd -"
 watch = ["src/**/*.rs", "Cargo.toml"]
 
 [application.trigger.redis]
@@ -25,7 +25,7 @@ channel = "testchannel"
 component = "spin-redis-trigger"
 
 [component.spin-redis-trigger]
-source = "spin_redis_trigger.wasm"
+source = "spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm"
 allowed_outbound_hosts = ["redis://redis-service.default.svc.cluster.local:6379"]
 [component.spin-redis-trigger.build]
-command = "cargo build --target wasm32-wasi --release"
+command = "cd spin-redis-trigger && cargo build --target wasm32-wasi --release && cd -"
diff --git a/images/spin-outbound-redis/Cargo.lock b/images/spin-outbound-redis/Cargo.lock
diff --git a/images/spin-outbound-redis/Dockerfile b/images/spin-outbound-redis/Dockerfile
@@ -4,5 +4,5 @@ COPY . .
 RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
 
 FROM scratch
-COPY --from=build /opt/build/target/wasm32-wasi/release/spin_outbound_redis.wasm .
+COPY --from=build /opt/build/target/wasm32-wasi/release/spin_outbound_redis.wasm ./target/wasm32-wasi/release/spin_outbound_redis.wasm
 COPY --from=build /opt/build/spin.toml .
diff --git a/images/spin-outbound-redis/spin.toml b/images/spin-outbound-redis/spin.toml
@@ -14,7 +14,7 @@ route = "hello"
 component = "hello"
 
 [component.hello]
-source = "spin_outbound_redis.wasm"
+source = "target/wasm32-wasi/release/spin_outbound_redis.wasm"
 allowed_outbound_hosts = ["redis://*:*"]
 
 [component.hello.variables]
diff --git a/images/spin-outbound-redis/spin_outbound_redis.wasm b/images/spin-outbound-redis/spin_outbound_redis.wasm
diff --git a/images/spin/Dockerfile b/images/spin/Dockerfile
@@ -10,6 +10,6 @@ RUN curl -LO https://github.com/tinygo-org/tinygo/releases/download/v0.30.0/tiny
 RUN cd go-hello && tinygo build -target=wasi -o spin_go_hello.wasm main.go
 
 FROM scratch
-COPY --from=build /opt/build/target/wasm32-wasi/release/spin_rust_hello.wasm .
+COPY --from=build /opt/build/target/wasm32-wasi/release/spin_rust_hello.wasm ./target/wasm32-wasi/release/spin_rust_hello.wasm
 COPY --from=build /opt/build/spin.toml .
-COPY --from=build-go /opt/build/go-hello/spin_go_hello.wasm .
+COPY --from=build-go /opt/build/go-hello/spin_go_hello.wasm ./go-hello/spin_go_hello.wasm
diff --git a/images/spin/spin.toml b/images/spin/spin.toml
@@ -16,7 +16,14 @@ route = "/go-hello"
 component = "go-hello"
 
 [component.hello]
-source = "spin_rust_hello.wasm"
+source = "target/wasm32-wasi/release/spin_rust_hello.wasm"
+
+[component.hello.build]
+command = "cargo build --target wasm32-wasi --release"
+watch = ["src/**/*.rs", "Cargo.toml"]
 
 [component.go-hello]
-source = "spin_go_hello.wasm"
+source = "go-hello/spin_go_hello.wasm"
+
+[component.go-hello.build]
+command = "cd go-hello && tinygo build -target=wasi -o spin_go_hello.wasm main.go && cd -"
diff --git a/scripts/down.sh b/scripts/down.sh
@@ -14,7 +14,7 @@ teardown_test() {
   docker rmi k3d-shim-test
 
   # remote test folder
-  rm -r ./test
+  rm -r ./test || echo "test folder already deleted"
 
   # delete binaries
   rm -r "$bin_path"
diff --git a/scripts/up.sh b/scripts/up.sh
@@ -12,7 +12,8 @@ IMAGES=("spin-hello-world" "spin-keyvalue" "spin-outbound-redis" "spin-multi-tri
 # build the Docker image for the k3d cluster
 docker build -t k3d-shim-test "$dockerfile_path"
 
-k3d cluster create "$cluster_name" --image k3d-shim-test --api-port 6551 -p '8082:80@loadbalancer' --agents 2
+k3d cluster create "$cluster_name" \
+  --image k3d-shim-test --api-port 6551 -p '8082:80@loadbalancer' --agents 2
 
 kubectl wait --for=condition=ready node --all --timeout=120s
 
