diff --git a/src/image.rs b/src/image.rs index e24abfd..26850d9 100644 --- a/src/image.rs +++ b/src/image.rs @@ -1,6 +1,6 @@ +use bollard::Docker; use bollard::models::CreateImageInfo; use bollard::query_parameters::CreateImageOptions; -use bollard::Docker; use futures_util::StreamExt; use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; use miette::{IntoDiagnostic, Result, WrapErr}; diff --git a/src/network.rs b/src/network.rs index 386e13c..1ea2050 100644 --- a/src/network.rs +++ b/src/network.rs @@ -1,6 +1,6 @@ use crate::cloud::Cloud; -use bollard::config::NetworkCreateRequest; use bollard::Docker; +use bollard::config::NetworkCreateRequest; use miette::{IntoDiagnostic, Result, WrapErr}; pub async fn clear_networks(docker: &Docker, instances: &[Cloud]) -> Result<()> { @@ -12,9 +12,10 @@ pub async fn clear_networks(docker: &Docker, instances: &[Cloud]) -> Result<()> for network in networks { if let Some(name) = network.name.as_deref() && let Some(id) = name.strip_prefix("haze-") - && !instances.iter().any(|cloud| cloud.id == id) { - docker.remove_network(name).await.ok(); - } + && !instances.iter().any(|cloud| cloud.id == id) + { + docker.remove_network(name).await.ok(); + } } Ok(()) } diff --git a/src/php.rs b/src/php.rs index f0878a5..e56267a 100644 --- a/src/php.rs +++ b/src/php.rs @@ -1,13 +1,13 @@ use crate::config::ProxyConfig; use crate::database::Database; -use crate::image::{image_version, pull_image, ImageVersion}; +use crate::image::{ImageVersion, image_version, pull_image}; use crate::network::ensure_network_exists; use crate::service::Service; use crate::service::ServiceTrait; +use bollard::Docker; use bollard::config::{ContainerCreateBody, NetworkConnectRequest, NetworkingConfig}; use bollard::models::{EndpointSettings, HostConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use itertools::Itertools; use maplit::hashmap; use miette::{IntoDiagnostic, Report, Result, WrapErr}; @@ -127,15 +127,16 @@ impl PhpVersion { let image_version = image_version(docker, self.image()).await; let haze_version = ImageVersion::from_str(env!("CARGO_PKG_VERSION")); if let (Some(image_version), Ok(haze_version)) = (image_version, haze_version) - && image_version < haze_version { - eprintln!( - "{}: image version is out of date, run {} to update.", - "Warning".red(), - "haze update".blue() - ); - eprintln!(" Haze version: {}", haze_version.bright_yellow()); - eprintln!(" Image version: {}", image_version.bright_yellow()); - } + && image_version < haze_version + { + eprintln!( + "{}: image version is out of date, run {} to update.", + "Warning".red(), + "haze update".blue() + ); + eprintln!(" Haze version: {}", haze_version.bright_yellow()); + eprintln!(" Image version: {}", image_version.bright_yellow()); + } let options = Some(CreateContainerOptions { name: Some(id.to_string()), diff --git a/src/service/clam.rs b/src/service/clam.rs index 02c72b9..d614ecd 100644 --- a/src/service/clam.rs +++ b/src/service/clam.rs @@ -1,12 +1,12 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::exec::exec; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, WrapErr}; use tokio::fs::write; @@ -92,7 +92,9 @@ impl ServiceTrait for ClamIcap { split_cmnd("occ config:app:set files_antivirus av_host --value=clamav-icap"), split_cmnd("occ config:app:set files_antivirus av_port --value=1344"), split_cmnd("occ config:app:set files_antivirus av_icap_request_service --value=avscan"), - split_cmnd("occ config:app:set files_antivirus av_icap_response_header --value=X-Infection-Found"), + split_cmnd( + "occ config:app:set files_antivirus av_icap_response_header --value=X-Infection-Found", + ), ]) } } @@ -196,7 +198,9 @@ impl ServiceTrait for ClamIcapTls { split_cmnd("occ config:app:set files_antivirus av_host --value=clamav-icap-tls"), split_cmnd("occ config:app:set files_antivirus av_port --value=1345"), split_cmnd("occ config:app:set files_antivirus av_icap_request_service --value=avscan"), - split_cmnd("occ config:app:set files_antivirus av_icap_response_header --value=X-Infection-Found"), + split_cmnd( + "occ config:app:set files_antivirus av_icap_response_header --value=X-Infection-Found", + ), split_cmnd("occ security:certificates:import data/icap-cert.pem"), ]) } diff --git a/src/service/dav.rs b/src/service/dav.rs index e0b20f3..5442b3b 100644 --- a/src/service/dav.rs +++ b/src/service/dav.rs @@ -1,12 +1,12 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::config::ContainerCreateBody; use bollard::models::{EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/service/imaginary.rs b/src/service/imaginary.rs index 4ec4d96..65325cf 100644 --- a/src/service/imaginary.rs +++ b/src/service/imaginary.rs @@ -1,12 +1,12 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::config::NetworkingConfig; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/service/kaspersky.rs b/src/service/kaspersky.rs index 00ec187..af9c654 100644 --- a/src/service/kaspersky.rs +++ b/src/service/kaspersky.rs @@ -1,14 +1,14 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::exec::exec; use crate::image::{image_exists, pull_image}; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; -use miette::{bail, IntoDiagnostic}; +use miette::{IntoDiagnostic, bail}; use std::io::Stdout; #[derive(Debug, Clone, Eq, PartialEq)] diff --git a/src/service/ldap.rs b/src/service/ldap.rs index 4f317e6..0514994 100644 --- a/src/service/ldap.rs +++ b/src/service/ldap.rs @@ -1,12 +1,12 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::{HazeConfig, ProxyConfig}; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::config::NetworkingConfig; use bollard::models::{ContainerCreateBody, ContainerState, EndpointSettings, HostConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; use std::net::IpAddr; @@ -102,7 +102,9 @@ impl ServiceTrait for Ldap { split_cmnd("occ ldap:set-config s01 ldapBase dc=example,dc=org"), split_cmnd("occ ldap:set-config s01 ldapBaseUsers dc=example,dc=org"), split_cmnd("occ ldap:set-config s01 ldapBaseGroups dc=example,dc=org"), - split_cmnd("occ ldap:set-config s01 ldapLoginFilter (&(&(objectclass=inetOrgPerson))(uid=%uid))"), + split_cmnd( + "occ ldap:set-config s01 ldapLoginFilter (&(&(objectclass=inetOrgPerson))(uid=%uid))", + ), split_cmnd("occ ldap:set-config s01 ldapUserFilter ((objectclass=inetOrgPerson))"), split_cmnd("occ ldap:set-config s01 ldapUserFilterMode 0"), split_cmnd("occ ldap:set-config s01 ldapUserDisplayName sn"), diff --git a/src/service/mail.rs b/src/service/mail.rs index 9dfcfcb..7367ffd 100644 --- a/src/service/mail.rs +++ b/src/service/mail.rs @@ -1,11 +1,11 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/service/oc.rs b/src/service/oc.rs index 296b2a5..2baac6e 100644 --- a/src/service/oc.rs +++ b/src/service/oc.rs @@ -1,13 +1,13 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::exec::exec; use crate::image::pull_image; use crate::service::ServiceTrait; -use crate::Result; +use bollard::Docker; use bollard::config::NetworkingConfig; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; use std::io::Stdout; diff --git a/src/service/office.rs b/src/service/office.rs index e7db10d..8ff59fe 100644 --- a/src/service/office.rs +++ b/src/service/office.rs @@ -1,13 +1,13 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; -use crate::Result; +use bollard::Docker; use bollard::models::{ ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig, }; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; diff --git a/src/service/onlyoffice.rs b/src/service/onlyoffice.rs index fa12c2c..f33251f 100644 --- a/src/service/onlyoffice.rs +++ b/src/service/onlyoffice.rs @@ -1,14 +1,14 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::exec::exec; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig, }; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; use std::net::Ipv4Addr; diff --git a/src/service/partitioning.rs b/src/service/partitioning.rs index f8f20b5..13425e4 100644 --- a/src/service/partitioning.rs +++ b/src/service/partitioning.rs @@ -1,11 +1,11 @@ use std::io::stdout; +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::database::DatabaseFamily; use crate::exec::exec; use crate::service::ServiceTrait; -use crate::Result; use bollard::Docker; use miette::Report; diff --git a/src/service/push.rs b/src/service/push.rs index b0bbab2..ff7d7d1 100644 --- a/src/service/push.rs +++ b/src/service/push.rs @@ -2,9 +2,9 @@ use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use local_ip_address::list_afinet_netifas; use maplit::hashmap; use miette::{IntoDiagnostic, Result}; diff --git a/src/service/redis.rs b/src/service/redis.rs index 6d5d5e6..6771999 100644 --- a/src/service/redis.rs +++ b/src/service/redis.rs @@ -1,11 +1,11 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/service/sftp.rs b/src/service/sftp.rs index 1f47a40..8125981 100644 --- a/src/service/sftp.rs +++ b/src/service/sftp.rs @@ -1,11 +1,11 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::{Context, IntoDiagnostic}; use std::fs::{create_dir_all, write}; diff --git a/src/service/sharded.rs b/src/service/sharded.rs index 8259eeb..df4e8d0 100644 --- a/src/service/sharded.rs +++ b/src/service/sharded.rs @@ -1,14 +1,14 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::database::DatabaseFamily; use crate::service::ServiceTrait; -use crate::Result; use bollard::Docker; use futures_util::future::try_join_all; use maplit::hashmap; use miette::Report; -use serde_json::json; use serde_json::Value; +use serde_json::json; use std::collections::HashMap; use std::convert::identity; diff --git a/src/service/smb.rs b/src/service/smb.rs index 08f69bd..44fafc3 100644 --- a/src/service/smb.rs +++ b/src/service/smb.rs @@ -1,11 +1,11 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; -use crate::service::{split_cmnd, ServiceTrait}; -use crate::Result; +use crate::service::{ServiceTrait, split_cmnd}; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/service/webhook.rs b/src/service/webhook.rs index e7ebae0..8903b88 100644 --- a/src/service/webhook.rs +++ b/src/service/webhook.rs @@ -1,11 +1,11 @@ +use crate::Result; use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; -use crate::Result; +use bollard::Docker; use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; use bollard::query_parameters::CreateContainerOptions; -use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; diff --git a/src/sources.rs b/src/sources.rs index ccfe564..0471a76 100644 --- a/src/sources.rs +++ b/src/sources.rs @@ -10,8 +10,8 @@ use std::io::Cursor; use std::path::{Path, PathBuf}; use std::time::Duration; use tokio::fs::create_dir_all; -use zip::read::root_dir_common_filter; use zip::ZipArchive; +use zip::read::root_dir_common_filter; pub struct Sources { #[allow(dead_code)]