Skip to content

Commit cf3275c

Browse files
authored
Merge pull request #3327 from spinframework/rename-resolver
Rename the DNS resolver types
2 parents d9271f6 + 498569c commit cf3275c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl spin_http::Host for crate::InstanceState {
9494
// in a single component execution
9595
let client = self.spin_http_client.get_or_insert_with(|| {
9696
let mut builder = reqwest::Client::builder()
97-
.dns_resolver(Arc::new(SpinResolver(self.blocked_networks.clone())));
97+
.dns_resolver(Arc::new(SpinDnsResolver(self.blocked_networks.clone())));
9898
if !self.connection_pooling_enabled {
9999
builder = builder.pool_max_idle_per_host(0);
100100
}
@@ -117,9 +117,10 @@ impl spin_http::Host for crate::InstanceState {
117117
}
118118
}
119119

120-
struct SpinResolver(BlockedNetworks);
120+
/// Resolves DNS using Tokio's resolver, filtering out blocked IPs.
121+
struct SpinDnsResolver(BlockedNetworks);
121122

122-
impl reqwest::dns::Resolve for SpinResolver {
123+
impl reqwest::dns::Resolve for SpinDnsResolver {
123124
fn resolve(&self, name: reqwest::dns::Name) -> reqwest::dns::Resolving {
124125
let blocked_networks = self.0.clone();
125126
Box::pin(async move {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl InstanceState {
3030
address: String,
3131
) -> Result<Resource<RedisConnection>, Error> {
3232
let config = AsyncConnectionConfig::new()
33-
.set_dns_resolver(SpinResolver(self.blocked_networks.clone()));
33+
.set_dns_resolver(SpinDnsResolver(self.blocked_networks.clone()));
3434
let conn = redis::Client::open(address.as_str())
3535
.map_err(|_| Error::InvalidAddress)?
3636
.get_multiplexed_async_connection_with_config(&config)
@@ -374,9 +374,10 @@ impl FromRedisValue for RedisResults {
374374
}
375375
}
376376

377-
struct SpinResolver(BlockedNetworks);
377+
/// Resolves DNS using Tokio's resolver, filtering out blocked IPs.
378+
struct SpinDnsResolver(BlockedNetworks);
378379

379-
impl AsyncDNSResolver for SpinResolver {
380+
impl AsyncDNSResolver for SpinDnsResolver {
380381
fn resolve<'a, 'b: 'a>(
381382
&'a self,
382383
host: &'b str,

0 commit comments

Comments
 (0)