Merge pull request #2795 from calebschoepp/merge-networking-impls

Merge host component outbound networking implementation into new factor crate

crates/factor-outbound-mysql/Cargo.toml

@@ -21,7 +21,6 @@ spin-core = { path = "../core" }
 spin-expressions = { path = "../expressions" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
-spin-outbound-networking = { path = "../outbound-networking" }
 spin-world = { path = "../world" }
 table = { path = "../table" }
 tokio = { version = "1", features = ["rt-multi-thread"] }

crates/factor-outbound-networking/Cargo.toml

@@ -13,13 +13,16 @@ rustls = { version = "0.23", default-features = false, features = ["ring", "std"
 rustls-pemfile = { version = "2.1.2", optional = true }
 rustls-pki-types = "1.7.0"
 serde = { version = "1", features = ["derive"] }
+spin-expressions = { path = "../expressions" }
 spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
-# TODO: merge with this crate
-spin-outbound-networking = { path = "../outbound-networking" }
+spin-locked-app = { path = "../locked-app" }
 spin-serde = { path = "../serde" }
+terminal = { path = "../terminal" }
 tracing = { workspace = true }
+url = "2.4.1"
+urlencoding = "2.1"
 webpki-roots = "0.26"
 
 [dev-dependencies]

crates/factor-outbound-networking/src/lib.rs

@@ -1,7 +1,9 @@
+mod config;
 pub mod runtime_config;
 
 use std::{collections::HashMap, sync::Arc};
 
+use config::ALLOWED_HOSTS_KEY;
 use futures_util::{
     future::{BoxFuture, Shared},
     FutureExt,
@@ -14,9 +16,11 @@ use spin_factors::{
     ConfigureAppContext, Error, Factor, FactorInstanceBuilder, InstanceBuilders, PrepareContext,
     RuntimeFactors,
 };
-use spin_outbound_networking::{AllowedHostsConfig, ALLOWED_HOSTS_KEY};
 
-pub use spin_outbound_networking::OutboundUrl;
+pub use config::{
+    is_service_chaining_host, parse_service_chaining_target, AllowedHostConfig, AllowedHostsConfig,
+    HostConfig, OutboundUrl, SERVICE_CHAINING_DOMAIN_SUFFIX,
+};
 
 pub use runtime_config::ComponentTlsConfigs;
 

crates/loader/Cargo.toml

@@ -26,7 +26,7 @@ shellexpand = "3.1"
 spin-common = { path = "../common" }
 spin-locked-app = { path = "../locked-app" }
 spin-manifest = { path = "../manifest" }
-spin-outbound-networking = { path = "../outbound-networking" }
+spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-serde = { path = "../serde" }
 tempfile = "3.8.0"
 terminal = { path = "../terminal" }

crates/loader/src/local.rs

@@ -4,6 +4,7 @@ use anyhow::{anyhow, bail, ensure, Context, Result};
 use futures::{future::try_join_all, StreamExt};
 use reqwest::Url;
 use spin_common::{paths::parent_dir, sloth, ui::quoted_path};
+use spin_factor_outbound_networking::SERVICE_CHAINING_DOMAIN_SUFFIX;
 use spin_locked_app::{
     locked::{
         self, ContentPath, ContentRef, LockedApp, LockedComponent, LockedComponentDependency,
@@ -12,7 +13,6 @@ use spin_locked_app::{
     values::{ValuesMap, ValuesMapBuilder},
 };
 use spin_manifest::schema::v2::{self, AppManifest, KebabId, WasiFilesMount};
-use spin_outbound_networking::SERVICE_CHAINING_DOMAIN_SUFFIX;
 use spin_serde::DependencyName;
 use std::collections::BTreeMap;
 use tokio::{io::AsyncWriteExt, sync::Semaphore};
@@ -147,7 +147,7 @@ impl LocalLoader {
         let allowed_outbound_hosts = component
             .normalized_allowed_outbound_hosts()
             .context("`allowed_http_hosts` is malformed")?;
-        spin_outbound_networking::AllowedHostsConfig::validate(&allowed_outbound_hosts)
+        spin_factor_outbound_networking::AllowedHostsConfig::validate(&allowed_outbound_hosts)
             .context("`allowed_outbound_hosts` is malformed")?;
 
         let metadata = ValuesMapBuilder::new()
@@ -784,7 +784,7 @@ fn requires_service_chaining(component: &spin_manifest::schema::v2::Component) -
 }
 
 fn is_chaining_host(pattern: &str) -> bool {
-    use spin_outbound_networking::{AllowedHostConfig, HostConfig};
+    use spin_factor_outbound_networking::{AllowedHostConfig, HostConfig};
 
     let Ok(allowed) = AllowedHostConfig::parse(pattern) else {
         return false;

crates/trigger-http/Cargo.toml

@@ -34,7 +34,7 @@ spin-core = { path = "../core" }
 spin-factor-outbound-http = { path = "../factor-outbound-http" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-http = { path = "../http" }
-spin-outbound-networking = { path = "../outbound-networking" }
+spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-telemetry = { path = "../telemetry" }
 spin-trigger = { path = "../trigger" }
 spin-world = { path = "../world" }

crates/trigger-http/src/headers.rs

@@ -3,8 +3,8 @@ use std::{net::SocketAddr, str, str::FromStr};
 use anyhow::Result;
 use http::Uri;
 use hyper::Request;
+use spin_factor_outbound_networking::is_service_chaining_host;
 use spin_http::routes::RouteMatch;
-use spin_outbound_networking::is_service_chaining_host;
 
 use crate::Body;
 

crates/trigger-http/src/outbound_http.rs

@@ -7,8 +7,8 @@ use http::uri::Scheme;
 use spin_factor_outbound_http::{
     HostFutureIncomingResponse, InterceptOutcome, OutgoingRequestConfig, Request,
 };
+use spin_factor_outbound_networking::parse_service_chaining_target;
 use spin_http::routes::RouteMatch;
-use spin_outbound_networking::parse_service_chaining_target;
 use wasmtime_wasi_http::types::IncomingResponse;
 
 use crate::HttpServer;