Merge pull request #2193 from fermyon/docker-service

Docker Service for runtime tests

Makefile

@@ -95,6 +95,7 @@ test-crate:
 
 .PHONY: test-integration
 test-integration:
+	cargo test -F e2e-tests -- runtime_tests --nocapture; \
 	$(LOG_LEVEL_VAR) cargo test --test integration --no-fail-fast -- --skip spinup_tests --skip cloud_tests --nocapture
 
 .PHONY: test-spin-up

crates/outbound-mysql/Cargo.toml

@@ -11,11 +11,11 @@ doctest = false
 anyhow = "1.0"
 flate2 = "1.0.17"
 # Removing default features for mysql_async to remove flate2/zlib feature
-mysql_async = { version = "0.32.2", default-features = false, features = [
+mysql_async = { version = "0.33.0", default-features = false, features = [
     "native-tls-tls",
 ] }
 # Removing default features for mysql_common to remove flate2/zlib feature
-mysql_common = { version = "0.30.6", default-features = false }
+mysql_common = { version = "0.31.0", default-features = false }
 spin-app = { path = "../app" }
 spin-core = { path = "../core" }
 spin-outbound-networking = { path = "../outbound-networking" }

crates/outbound-pg/src/lib.rs

@@ -42,14 +42,20 @@ impl OutboundPg {
         let Ok(config) = address.parse::<tokio_postgres::Config>() else {
             return false;
         };
-        for host in config.get_hosts() {
+        for (i, host) in config.get_hosts().iter().enumerate() {
             match host {
                 tokio_postgres::config::Host::Tcp(address) => {
-                    if !spin_outbound_networking::check_url(
-                        address,
-                        "postgres",
-                        &self.allowed_hosts,
-                    ) {
+                    let ports = config.get_ports();
+                    // The port we use is either:
+                    // * The port at the same index as the host
+                    // * The first port if there is only one port
+                    let port =
+                        ports
+                            .get(i)
+                            .or_else(|| if ports.len() == 1 { ports.get(1) } else { None });
+                    let port_str = port.map(|p| format!(":{}", p)).unwrap_or_default();
+                    let url = format!("{address}{port_str}");
+                    if !spin_outbound_networking::check_url(&url, "postgres", &self.allowed_hosts) {
                         return false;
                     }
                 }

e2e-tests.Dockerfile

@@ -76,8 +76,6 @@ RUN printf '#!/bin/bash
     cargo build --release                                                       \n      \
     fi                                                                          \n\n    \
     cargo test spinup_tests --features e2e-tests --no-fail-fast -- --nocapture  \n      \
-    # Run the runtime tests which will supersede many e2e tests in the future   \n      \
-    cargo test -F e2e-tests -- runtime_tests --nocapture                        \n      \
     ' > /usr/local/bin/entrypoint.sh
 
 RUN chmod +x /usr/local/bin/entrypoint.sh