Merge pull request #3167 from spinframework/outbound-networking-config

Move outbound networking config to new crate

Author: rylev

Cargo.lock

@@ -13,7 +13,8 @@ use http::{
 };
 use intercept::OutboundHttpInterceptor;
 use spin_factor_outbound_networking::{
-    BlockedNetworks, ComponentTlsClientConfigs, OutboundAllowedHosts, OutboundNetworkingFactor,
+    config::{allowed_hosts::OutboundAllowedHosts, blocked_networks::BlockedNetworks},
+    ComponentTlsClientConfigs, OutboundNetworkingFactor,
 };
 use spin_factors::{
     anyhow, ConfigureAppContext, Factor, PrepareContext, RuntimeFactors, SelfInstanceBuilder,

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

@@ -4,7 +4,8 @@ use anyhow::Context;
 use http::{header::HOST, Request};
 use http_body_util::BodyExt;
 use spin_factor_outbound_networking::{
-    BlockedNetworks, ComponentTlsClientConfigs, OutboundAllowedHosts, TlsClientConfig,
+    config::{allowed_hosts::OutboundAllowedHosts, blocked_networks::BlockedNetworks},
+    ComponentTlsClientConfigs, TlsClientConfig,
 };
 use spin_factors::{wasmtime::component::ResourceTable, RuntimeFactorsInstanceState};
 use tokio::{net::TcpStream, time::timeout};

crates/factor-outbound-http/src/wasi.rs

@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use anyhow::Result;
 use spin_core::{async_trait, wasmtime::component::Resource};
-use spin_factor_outbound_networking::OutboundAllowedHosts;
+use spin_factor_outbound_networking::config::allowed_hosts::OutboundAllowedHosts;
 use spin_world::v2::mqtt::{self as v2, Connection, Error, Qos};
 use tracing::{instrument, Level};
 

crates/factor-outbound-mqtt/src/host.rs

@@ -3,7 +3,9 @@ mod host;
 
 use client::Client;
 use mysql_async::Conn as MysqlClient;
-use spin_factor_outbound_networking::{OutboundAllowedHosts, OutboundNetworkingFactor};
+use spin_factor_outbound_networking::{
+    config::allowed_hosts::OutboundAllowedHosts, OutboundNetworkingFactor,
+};
 use spin_factors::{Factor, InitContext, RuntimeFactors, SelfInstanceBuilder};
 use spin_world::v1::mysql as v1;
 use spin_world::v2::mysql::{self as v2};

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

@@ -9,20 +9,18 @@ anyhow = { workspace = true }
 futures-util = { workspace = true }
 http = { workspace = true }
 ip_network = "0.4.1"
-ip_network_table = "0.2.0"
 rustls = { workspace = true }
 rustls-pki-types = { workspace = true }
 serde = { workspace = true }
-spin-expressions = { path = "../expressions" }
 spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-locked-app = { path = "../locked-app" }
 spin-manifest = { path = "../manifest" }
+spin-outbound-networking-config = { path = "../outbound-networking-config" }
 spin-serde = { path = "../serde" }
 tracing = { workspace = true }
 url = { workspace = true }
-urlencoding = "2"
 webpki-roots = "0.26"
 
 [dev-dependencies]