Skip to content

Commit 6674085

Browse files
authored
Merge pull request #747 from lann/rename-outbound-http-crate
Rename wasi-outbound-http crate to outbound-http
2 parents 16455ab + 6209a02 commit 6674085

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

Cargo.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ hippo-openapi = "0.10"
2121
hippo = { git = "https://github.com/deislabs/hippo-cli", tag = "v0.16.1" }
2222
lazy_static = "1.4.0"
2323
nix = { version = "0.24", features = ["signal"] }
24+
outbound-http = { path = "crates/outbound-http" }
2425
outbound-redis = { path = "crates/outbound-redis" }
2526
path-absolutize = "3.0.11"
2627
regex = "1.5.5"
@@ -47,7 +48,6 @@ tracing-futures = "0.2"
4748
tracing-subscriber = { version = "0.3.7", features = [ "env-filter" ] }
4849
url = "2.2.2"
4950
uuid = "^1.0"
50-
wasi-outbound-http = { path = "crates/outbound-http" }
5151
wasmtime = "0.39.1"
5252

5353
[target.'cfg(target_os = "linux")'.dependencies]

crates/loader/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ futures = "0.3.17"
1515
glob = "0.3.0"
1616
itertools = "0.10.3"
1717
lazy_static = "1.4.0"
18+
outbound-http = { path = "../outbound-http" }
1819
path-absolutize = "3.0.11"
1920
regex = "1.5.4"
2021
reqwest = "0.11.9"
@@ -30,4 +31,3 @@ tracing = { version = "0.1", features = [ "log" ] }
3031
tracing-futures = "0.2"
3132
tracing-subscriber = { version = "0.3.7", features = [ "env-filter" ] }
3233
walkdir = "2.3.2"
33-
wasi-outbound-http = { path = "../outbound-http" }

crates/loader/src/validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn parse_allowed_http_hosts(raw: &Option<Vec<String>>) -> Result<AllowedHttp
1616
Some(list) => {
1717
if list
1818
.iter()
19-
.any(|domain| domain == wasi_outbound_http::ALLOW_ALL_HOSTS)
19+
.any(|domain| domain == outbound_http::ALLOW_ALL_HOSTS)
2020
{
2121
Ok(AllowedHttpHosts::AllowAll)
2222
} else {

crates/outbound-http/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "wasi-outbound-http"
2+
name = "outbound-http"
33
version = "0.2.0"
44
edition = "2021"
55
authors = ["Fermyon Engineering <engineering@fermyon.com>"]

crates/trigger/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ctrlc = { version = "3.2", features = ["termination"] }
1212
dotenvy = "0.15.1"
1313
futures = "0.3"
1414
http = "0.2"
15+
outbound-http = { path = "../outbound-http" }
1516
outbound-redis = { path = "../outbound-redis" }
1617
outbound-pg = { path = "../outbound-pg" }
1718
serde = "1.0"
@@ -20,5 +21,4 @@ spin-engine = { path = "../engine" }
2021
spin-loader = { path = "../loader" }
2122
spin-manifest = { path = "../manifest" }
2223
tracing = { version = "0.1", features = [ "log" ] }
23-
wasi-outbound-http = { path = "../outbound-http" }
2424
wasmtime = "0.39.1"

crates/trigger/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
124124

125125
/// Add the default set of host components to the given builder.
126126
pub fn add_default_host_components<T: Default + 'static>(builder: &mut Builder<T>) -> Result<()> {
127-
builder.add_host_component(wasi_outbound_http::OutboundHttpComponent)?;
127+
builder.add_host_component(outbound_http::OutboundHttpComponent)?;
128128
builder.add_host_component(outbound_redis::OutboundRedis {
129129
connections: Arc::new(RwLock::new(HashMap::new())),
130130
})?;

0 commit comments

Comments
 (0)