Skip to content

Commit 9d64134

Browse files
csssufcsssuf
committed
chore: format
Apply rustfmt output after recent error handling updates.
1 parent e146c08 commit 9d64134

9 files changed

Lines changed: 38 additions & 35 deletions

File tree

‎src/acme/account.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use instant_acme::{Account, NewAccount};
2-
use tokio::time::{sleep, Duration};
2+
use tokio::time::{Duration, sleep};
33
use tracing::{info, warn};
44

55
use crate::error::Result;

‎src/acme/order.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ impl CertificateOrder {
2828
info!(cert_name, ?domains, "Starting certificate order");
2929

3030
// Create order
31-
let identifiers: Vec<Identifier> = domains
32-
.iter()
33-
.map(|d| Identifier::Dns(d.clone()))
34-
.collect();
31+
let identifiers: Vec<Identifier> =
32+
domains.iter().map(|d| Identifier::Dns(d.clone())).collect();
3533

3634
let mut order = account
3735
.new_order(&NewOrder {
@@ -171,9 +169,7 @@ impl CertificateOrder {
171169
}
172170
OrderStatus::Invalid => {
173171
Self::log_order_problem(cert_name, domains, error.as_ref());
174-
if let Err(err) =
175-
Self::log_authorization_problems(order, cert_name).await
176-
{
172+
if let Err(err) = Self::log_authorization_problems(order, cert_name).await {
177173
warn!(
178174
cert_name,
179175
error = ?err,

‎src/acme/renewal.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::xds::XdsState;
1212

1313
use super::challenge::ChallengeState;
1414
use super::order::CertificateOrder;
15-
use super::storage::{parse_certificate_expiry, CertificateStorage, StoredCert};
15+
use super::storage::{CertificateStorage, StoredCert, parse_certificate_expiry};
1616

1717
/// Manages background certificate renewal
1818
pub struct RenewalManager {
@@ -113,7 +113,9 @@ impl RenewalManager {
113113

114114
debug!(
115115
name,
116-
days_until_expiry, threshold = self.renewal_threshold_days, "Certificate expiry check"
116+
days_until_expiry,
117+
threshold = self.renewal_threshold_days,
118+
"Certificate expiry check"
117119
);
118120

119121
Ok(days_until_expiry < self.renewal_threshold_days)
@@ -179,11 +181,7 @@ impl RenewalManager {
179181

180182
// Load into xDS state
181183
self.xds_state
182-
.update_secret(
183-
&cert_config.name,
184-
cert.cert_chain_pem,
185-
cert.private_key_pem,
186-
)
184+
.update_secret(&cert_config.name, cert.cert_chain_pem, cert.private_key_pem)
187185
.await;
188186
continue;
189187
}

‎src/acme/storage.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ impl CertificateStorage {
168168

169169
/// Parse expiry date from PEM certificate
170170
pub fn parse_certificate_expiry(pem: &str) -> Result<DateTime<Utc>> {
171-
use x509_parser::prelude::*;
172171
use x509_parser::error::{PEMError, X509Error};
172+
use x509_parser::prelude::*;
173173

174174
let (_, pem_block) = parse_x509_pem(pem.as_bytes()).map_err(|e| {
175175
let pem_error = match e {
@@ -179,8 +179,10 @@ pub fn parse_certificate_expiry(pem: &str) -> Result<DateTime<Utc>> {
179179
Error::X509Pem { source: pem_error }
180180
})?;
181181

182-
let (_, cert) = X509Certificate::from_der(&pem_block.contents)
183-
.map_err(|e| Error::X509Parse { source: X509Error::from(e) })?;
182+
let (_, cert) =
183+
X509Certificate::from_der(&pem_block.contents).map_err(|e| Error::X509Parse {
184+
source: X509Error::from(e),
185+
})?;
184186

185187
let not_after = cert.validity().not_after;
186188
let timestamp = not_after.timestamp();

‎src/config/loader.rs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ fn validate_config(config: &Config) -> Result<()> {
2323

2424
for cert in &config.certificates {
2525
if cert.name.is_empty() {
26-
return Err(Error::Config("Certificate name cannot be empty".to_string()));
26+
return Err(Error::Config(
27+
"Certificate name cannot be empty".to_string(),
28+
));
2729
}
2830
if cert.domains.is_empty() {
2931
return Err(Error::Config(format!(
@@ -42,7 +44,11 @@ fn validate_config(config: &Config) -> Result<()> {
4244
}
4345

4446
// Check for duplicate certificate names
45-
let mut names: Vec<&str> = config.certificates.iter().map(|c| c.name.as_str()).collect();
47+
let mut names: Vec<&str> = config
48+
.certificates
49+
.iter()
50+
.map(|c| c.name.as_str())
51+
.collect();
4652
names.sort();
4753
for window in names.windows(2) {
4854
if window[0] == window[1] {
@@ -59,7 +65,9 @@ fn validate_config(config: &Config) -> Result<()> {
5965
}
6066

6167
if config.meta.storage_dir.as_os_str().is_empty() {
62-
return Err(Error::Config("Storage directory cannot be empty".to_string()));
68+
return Err(Error::Config(
69+
"Storage directory cannot be empty".to_string(),
70+
));
6371
}
6472

6573
Ok(())

‎src/envoy/route.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use xds_api::pb::envoy::config::core::v3::data_source::Specifier;
21
use xds_api::pb::envoy::config::core::v3::DataSource;
2+
use xds_api::pb::envoy::config::core::v3::data_source::Specifier;
33
use xds_api::pb::envoy::config::route::v3::{
4-
route::Action, route_match::PathSpecifier, DirectResponseAction, Route, RouteMatch, VirtualHost,
4+
DirectResponseAction, Route, RouteMatch, VirtualHost, route::Action, route_match::PathSpecifier,
55
};
66

77
use crate::acme::ChallengeState;

‎src/envoy/secret.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use xds_api::pb::envoy::config::core::v3::data_source::Specifier;
21
use xds_api::pb::envoy::config::core::v3::DataSource;
2+
use xds_api::pb::envoy::config::core::v3::data_source::Specifier;
33
use xds_api::pb::envoy::extensions::transport_sockets::tls::v3::{
4-
secret::Type as SecretType, Secret, TlsCertificate,
4+
Secret, TlsCertificate, secret::Type as SecretType,
55
};
66

77
/// Build a TLS secret for SDS

‎src/xds/merge.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@ use prost::Message;
22
use tracing::debug;
33
use xds_api::pb::envoy::config::cluster::v3::Cluster;
44
use xds_api::pb::envoy::config::core::v3::{Address, SocketAddress};
5-
use xds_api::pb::envoy::config::listener::v3::{filter::ConfigType, Filter, FilterChain, Listener};
5+
use xds_api::pb::envoy::config::listener::v3::{Filter, FilterChain, Listener, filter::ConfigType};
66
use xds_api::pb::envoy::config::route::v3::{Route, RouteConfiguration, VirtualHost};
77
use xds_api::pb::envoy::extensions::filters::http::router::v3::Router;
88
use xds_api::pb::envoy::extensions::filters::network::http_connection_manager::v3::{
9-
http_connection_manager::RouteSpecifier, http_filter, HttpConnectionManager, HttpFilter,
9+
HttpConnectionManager, HttpFilter, http_connection_manager::RouteSpecifier, http_filter,
1010
};
1111
use xds_api::pb::google::protobuf::Any;
1212

1313
use crate::acme::ChallengeState;
14-
use crate::config::{deserialize_clusters, deserialize_listener, EnvoyWorkloadConfig};
14+
use crate::config::{EnvoyWorkloadConfig, deserialize_clusters, deserialize_listener};
1515
use crate::envoy::{build_acme_challenge_route, listener_port};
1616
use crate::error::Result;
1717

18-
const HTTP_CONNECTION_MANAGER_TYPE_URL: &str =
19-
"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager";
20-
const ROUTER_TYPE_URL: &str =
21-
"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router";
18+
const HTTP_CONNECTION_MANAGER_TYPE_URL: &str = "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager";
19+
const ROUTER_TYPE_URL: &str = "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router";
2220

2321
/// Handles merging of workload config with ACME challenge routes
2422
pub struct ConfigMerger;
@@ -89,7 +87,8 @@ impl ConfigMerger {
8987
for filter_chain in &mut listener.filter_chains {
9088
for filter in &mut filter_chain.filters {
9189
if filter.name == "envoy.filters.network.http_connection_manager" {
92-
if let Some(ConfigType::TypedConfig(ref mut typed_config)) = filter.config_type {
90+
if let Some(ConfigType::TypedConfig(ref mut typed_config)) = filter.config_type
91+
{
9392
if typed_config.type_url == HTTP_CONNECTION_MANAGER_TYPE_URL {
9493
// Decode HCM
9594
if let Ok(mut hcm) =

‎src/xds/state.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::collections::HashMap;
2-
use std::sync::atomic::{AtomicBool, Ordering};
32
use std::sync::Arc;
3+
use std::sync::atomic::{AtomicBool, Ordering};
44

5-
use tokio::sync::{broadcast, Notify, RwLock};
5+
use tokio::sync::{Notify, RwLock, broadcast};
66
use tracing::debug;
77
use xds_api::pb::envoy::config::cluster::v3::Cluster;
88
use xds_api::pb::envoy::config::listener::v3::Listener;

0 commit comments

Comments
 (0)