Skip to content

Commit 9040b90

Browse files
committed
chore: Apply formatting
1 parent 4b2b40c commit 9040b90

File tree

14 files changed

+62
-62
lines changed

14 files changed

+62
-62
lines changed

rust/crd/src/affinity.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,9 @@ pub fn get_affinity(
7676

7777
#[cfg(test)]
7878
mod tests {
79-
use super::*;
80-
81-
use rstest::rstest;
8279
use std::collections::BTreeMap;
8380

84-
use crate::DruidCluster;
81+
use rstest::rstest;
8582
use stackable_operator::{
8683
commons::affinity::StackableAffinity,
8784
k8s_openapi::{
@@ -92,6 +89,9 @@ mod tests {
9289
},
9390
};
9491

92+
use super::*;
93+
use crate::DruidCluster;
94+
9595
#[rstest]
9696
#[case(DruidRole::Coordinator)]
9797
#[case(DruidRole::Broker)]

rust/crd/src/authentication.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,14 @@ impl AuthenticationClassesResolved {
232232

233233
#[cfg(test)]
234234
mod tests {
235-
use indoc::formatdoc;
236-
use oidc::ClientAuthenticationOptions;
237-
238-
use crate::DruidClusterConfig;
239-
240235
use std::pin::Pin;
241236

242-
use indoc::indoc;
237+
use indoc::{formatdoc, indoc};
238+
use oidc::ClientAuthenticationOptions;
243239
use stackable_operator::kube;
244240

245241
use super::*;
246-
247-
use crate::authentication::AuthenticationClassesResolved;
242+
use crate::{authentication::AuthenticationClassesResolved, DruidClusterConfig};
248243

249244
const BASE_CLUSTER_CONFIG: &str = r#"
250245
deepStorage:

rust/crd/src/lib.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ pub mod security;
77
pub mod storage;
88
pub mod tls;
99

10-
use crate::{
11-
affinity::get_affinity,
12-
authorization::DruidAuthorization,
13-
resource::RoleResource,
14-
tls::{default_druid_tls, DruidTls},
15-
};
10+
use std::collections::{BTreeMap, HashMap, HashSet};
1611

1712
use indoc::formatdoc;
1813
use product_config::types::PropertyNameKind;
@@ -55,9 +50,15 @@ use stackable_operator::{
5550
COMMON_BASH_TRAP_FUNCTIONS,
5651
},
5752
};
58-
use std::collections::{BTreeMap, HashMap, HashSet};
5953
use strum::{Display, EnumDiscriminants, EnumIter, EnumString, IntoStaticStr};
6054

55+
use crate::{
56+
affinity::get_affinity,
57+
authorization::DruidAuthorization,
58+
resource::RoleResource,
59+
tls::{default_druid_tls, DruidTls},
60+
};
61+
6162
pub const APP_NAME: &str = "druid";
6263
pub const OPERATOR_NAME: &str = "druid.stackable.tech";
6364

rust/crd/src/memory.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,10 @@ fn format_for_druid(memory_quantity: &MemoryQuantity) -> String {
167167

168168
#[cfg(test)]
169169
mod tests {
170-
use super::*;
171170
use rstest::*;
172171

172+
use super::*;
173+
173174
#[rstest]
174175
#[case(1000, 1)]
175176
#[case(1400, 1)]

rust/crd/src/resource.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
use std::collections::BTreeMap;
2-
use std::sync::LazyLock;
1+
use std::{collections::BTreeMap, sync::LazyLock};
32

4-
use crate::memory::{HistoricalDerivedSettings, RESERVED_OS_MEMORY};
5-
use crate::storage::{self, default_free_percentage_empty_dir_fragment};
6-
use crate::{DruidRole, PATH_SEGMENT_CACHE, PROP_SEGMENT_CACHE_LOCATIONS};
73
use snafu::{OptionExt, ResultExt, Snafu};
8-
use stackable_operator::builder;
9-
use stackable_operator::memory::MemoryQuantity;
104
use stackable_operator::{
5+
builder,
116
builder::pod::{container::ContainerBuilder, volume::VolumeBuilder, PodBuilder},
127
commons::resources::{
138
CpuLimitsFragment, MemoryLimits, MemoryLimitsFragment, NoRuntimeLimits,
@@ -17,9 +12,16 @@ use stackable_operator::{
1712
api::core::v1::{EmptyDirVolumeSource, ResourceRequirements},
1813
apimachinery::pkg::api::resource::Quantity,
1914
},
15+
memory::MemoryQuantity,
2016
};
2117
use strum::{EnumDiscriminants, IntoStaticStr};
2218

19+
use crate::{
20+
memory::{HistoricalDerivedSettings, RESERVED_OS_MEMORY},
21+
storage::{self, default_free_percentage_empty_dir_fragment},
22+
DruidRole, PATH_SEGMENT_CACHE, PROP_SEGMENT_CACHE_LOCATIONS,
23+
};
24+
2325
// volume names
2426
const SEGMENT_CACHE_VOLUME_NAME: &str = "segment-cache";
2527

@@ -242,13 +244,6 @@ pub static ROUTER_RESOURCES: LazyLock<ResourcesFragment<storage::DruidStorage, N
242244

243245
#[cfg(test)]
244246
mod test {
245-
use super::*;
246-
use crate::{
247-
storage::{default_free_percentage_empty_dir, HistoricalStorage},
248-
tests::deserialize_yaml_file,
249-
DruidCluster, MiddleManagerConfig,
250-
};
251-
252247
use rstest::*;
253248
use stackable_operator::{
254249
commons::resources::{
@@ -259,6 +254,13 @@ mod test {
259254
role_utils::{CommonConfiguration, RoleGroup},
260255
};
261256

257+
use super::*;
258+
use crate::{
259+
storage::{default_free_percentage_empty_dir, HistoricalStorage},
260+
tests::deserialize_yaml_file,
261+
DruidCluster, MiddleManagerConfig,
262+
};
263+
262264
#[rstest]
263265
#[case(
264266
Some(ResourcesFragment{

rust/crd/src/security.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
use crate::{
2-
authentication::{self, AuthenticationClassesResolved},
3-
DruidCluster, DruidRole, METRICS_PORT,
4-
};
5-
use crate::{STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD};
1+
use std::collections::BTreeMap;
2+
63
use snafu::{ResultExt, Snafu};
74
use stackable_operator::{
85
builder::{
@@ -23,7 +20,10 @@ use stackable_operator::{
2320
time::Duration,
2421
};
2522

26-
use std::collections::BTreeMap;
23+
use crate::{
24+
authentication::{self, AuthenticationClassesResolved},
25+
DruidCluster, DruidRole, METRICS_PORT, STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD,
26+
};
2727

2828
#[derive(Snafu, Debug)]
2929
pub enum Error {

rust/crd/src/storage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use serde::{Deserialize, Serialize};
2-
use stackable_operator::k8s_openapi::apimachinery::pkg::api::resource::Quantity;
32
use stackable_operator::{
43
config::{fragment::Fragment, merge::Merge},
4+
k8s_openapi::apimachinery::pkg::api::resource::Quantity,
55
schemars::{self, JsonSchema},
66
};
77

rust/crd/src/tls.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ pub fn tls_default() -> Option<String> {
3131

3232
#[cfg(test)]
3333
mod tests {
34-
use crate::{tests::deserialize_yaml_str, tls::DruidTls, DruidClusterConfig};
3534
use indoc::formatdoc;
3635

36+
use crate::{tests::deserialize_yaml_str, tls::DruidTls, DruidClusterConfig};
37+
3738
const BASE_DRUID_CONFIGURATION: &str = r#"
3839
deepStorage:
3940
hdfs:

rust/operator-binary/src/authentication/ldap.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
use std::collections::BTreeMap;
22

33
use snafu::ResultExt;
4+
use stackable_druid_crd::security::{
5+
add_cert_to_trust_store_cmd, STACKABLE_TLS_DIR, TLS_STORE_PASSWORD,
6+
};
47
use stackable_operator::{
58
builder::pod::{container::ContainerBuilder, PodBuilder},
69
commons::authentication::ldap::AuthenticationProvider,
710
};
811

9-
use stackable_druid_crd::security::{
10-
add_cert_to_trust_store_cmd, STACKABLE_TLS_DIR, TLS_STORE_PASSWORD,
11-
};
12-
1312
use crate::authentication::{
1413
AddLdapVolumesSnafu, ConstructLdapEndpointUrlSnafu, Error, MissingLdapBindCredentialsSnafu,
1514
};

rust/operator-binary/src/discovery.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Discovery for Druid. We make Druid discoverable by putting a connection string to the router service
22
//! inside a config map. We only provide a connection string to the router service, since it serves as
33
//! a gateway to the cluster for client queries.
4-
use crate::DRUID_CONTROLLER_NAME;
5-
64
use snafu::{OptionExt, ResultExt, Snafu};
75
use stackable_druid_crd::{
86
build_recommended_labels, security::DruidTlsSecurity, DruidCluster, DruidRole,
@@ -15,6 +13,8 @@ use stackable_operator::{
1513
utils::cluster_info::KubernetesClusterInfo,
1614
};
1715

16+
use crate::DRUID_CONTROLLER_NAME;
17+
1818
#[derive(Snafu, Debug)]
1919
pub enum Error {
2020
#[snafu(display("object {} is missing metadata to build owner reference", druid))]

0 commit comments

Comments
 (0)