test(spin): add more integration tests

README.md

@@ -41,8 +41,6 @@ To build the shims in this project, run `make build`.
 
 To run the integration tests, run `make integration-tests`.
 
-### Cleaning up
-
 To clean up, run `make tests/clean`.
 
 ## Example Kubernetes Cluster Deployments

containerd-shim-spin/src/engine.rs

@@ -223,7 +223,7 @@ impl SpinEngine {
         let mut runtime_config = RuntimeConfig::new(PathBuf::from("/").into());
         // Load in runtime config if one exists at expected location
         if Path::new(RUNTIME_CONFIG_PATH).exists() {
-            runtime_config.merge_config_file(RUNTIME_CONFIG_PATH);
+            runtime_config.merge_config_file(RUNTIME_CONFIG_PATH)?;
         }
         let mut builder = TriggerExecutorBuilder::new(loader);
         builder

images/spin-inbound-redis/spin.toml

@@ -1,13 +1,23 @@
-spin_version = "1"
+spin_manifest_version = 2
+
+[application]
 authors = ["Suneet Nangia <[email protected]>"]
-name = "spin-hello"
-trigger = { type = "redis", address = "redis:/localhost:6379" }
+name = "spin-inbound-redis"
 version = "1.0.0"
 
-[[component]]
-environment = { REDIS_ADDRESS = "redis://localhost:6379", REDIS_CHANNEL = "messages-out" }
-id = "hello"
+[variables]
+redis_address = { required = true }
+redis_channel = { required = true }
+
+[[trigger.redis]]
+address = "redis://redis-service.default.svc.cluster.local:6379"
+component = "hello"
+
+[component.hello]
 source = "spin_inbound_redis.wasm"
-allowed_http_hosts = []
-[component.trigger]
-channel = "messages-in"
+allowed_outbound_hosts = ["redis://*:*"]
+
+[component.hello.variables]
+redis_address = "{{ redis_address }}"
+redis_channel = "{{ redis_channel }}"
+

images/spin-inbound-redis/src/lib.rs

@@ -2,18 +2,14 @@ use anyhow::Result;
 use bytes::Bytes;
 use spin_sdk::redis_component;
 use std::str::from_utf8;
-use spin_sdk::redis;
-
-const REDIS_ADDRESS_ENV: &str = "REDIS_ADDRESS";
-const REDIS_CHANNEL_ENV: &str = "REDIS_CHANNEL";
+use spin_sdk::{redis, variables};
 
 /// A simple Spin Redis component.
 #[redis_component]
 fn on_message(message: Bytes) -> Result<()> {
 
-    let address = std::env::var(REDIS_ADDRESS_ENV)?;
-    let channel = std::env::var(REDIS_CHANNEL_ENV)?;
-
+    let address = variables::get("redis_address").expect("could not get variable");
+    let channel = variables::get("redis_channel").expect("could not get variable");
     let conn = redis::Connection::open(&address)?;
 
     println!("{}", from_utf8(&message)?);