Merge pull request #173 from technosophos/fix/test-failing-brigade

Fixed test that is failing because of an expired SSL cert

Author: technosophos

src/lib.rs

@@ -71,7 +71,7 @@ mod test {
     }
 
     const DYNAMIC_ROUTES_SA_ID: &str = "dynamic-routes/0.1.0";
-    const HTTP_TEST_ID: &str = "http-test/0.1.0";
+    const HTTP_TEST_ID: &str = "http-test/0.2.0";
     const PRINT_ENV_SA_ID: &str = "print-env/0.1.0";
     const TOAST_ON_DEMAND_SA_ID: &str = "itowlson/toast-on-demand/0.1.0-ivan-20210924170616069";
     const TEST1_MODULE_MAP_FILE: &str = "test1.toml";
@@ -696,7 +696,7 @@ mod test {
         let (status, response_text) = futures::executor::block_on(jh).unwrap();
 
         assert_eq!(hyper::StatusCode::OK, status);
-        assert!(response_text.contains("api.brigade.sh is HEALTHY") ||
-            response_text.contains("api.brigade.sh is UNHEALTHY"));
+        assert!(response_text.contains("is HEALTHY") ||
+            response_text.contains("is UNHEALTHY"));
     }
 }

testdata/sources/http-test/modules.toml

@@ -0,0 +1,9 @@
+# This is for us during test development.
+# Fixtures use their own module config.
+
+[[module]]
+route = "/"
+# THIS MAKES IT NOT A REAL MODULES.TOML! The test infra replaces the ${...}
+# with the right string.
+module ="target/wasm32-wasi/release/http-test.wasm"
+allowed_hosts = ["https://www.fermyon.com"]

testdata/sources/http-test/src/main.rs

@@ -1,16 +1,17 @@
 fn main() {
-  let url = "https://api.brigade.sh/healthz";
+  let url = "https://www.fermyon.com/healthz";
 
   match get_body(url) {
     Ok((status_code, _)) => {
       println!("Content-Type: text/plain\n");
       if status_code == 200 {
-          println!("api.brigade.sh is HEALTHY");
+          println!("{} is HEALTHY", url);
       } else {
-          println!("api.brigade.sh is UNHEALTHY");
+          println!("{} is UNHEALTHY", url);
       }
     },
     Err(e) => {
+      eprintln!("Error in http-test: {}", e);
       println!("Status: 500");
       println!("Content-Type: text/plain\n");
       println!("Failed to make request: {}", e);

testdata/standalone-bindles/3cb6fb9875a528c0b030b6366a76991250a8571ab7beffe5b9f37b342aea372e/invoice.toml

@@ -0,0 +1,23 @@
+bindleVersion = '1.0.0'
+
+[bindle]
+name = 'http-test'
+version = '0.2.0'
+authors = ['itowlson']
+
+[[parcel]]
+[parcel.label]
+sha256 = '6eeea5e303121ead2f31dcaa3182b5fd5d194d62a6bf1d58e26b98d318c67af0'
+mediaType = 'application/wasm'
+name = 'http-test.wasm'
+size = 1997174
+[parcel.label.feature.wagi]
+file = 'false'
+route = '/'
+allowed_hosts = "https://www.fermyon.com"
+
+[parcel.conditions]
+requires = ['target/wasm32-wasi/release/http-test.wasm-files']
+
+[[group]]
+name = 'target/wasm32-wasi/release/http-test.wasm-files'