Skip to content

Commit 84d9bad

Browse files
committed
chore: Apply formatting
1 parent 98179db commit 84d9bad

File tree

7 files changed

+34
-22
lines changed

7 files changed

+34
-22
lines changed

rust/crd/src/affinity.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ pub fn get_affinity(cluster_name: &str, role: &SupersetRole) -> StackableAffinit
2121

2222
#[cfg(test)]
2323
mod tests {
24-
use super::*;
25-
2624
use std::collections::BTreeMap;
2725

28-
use crate::SupersetCluster;
2926
use stackable_operator::{
3027
commons::affinity::StackableAffinity,
3128
k8s_openapi::{
@@ -34,6 +31,9 @@ mod tests {
3431
},
3532
};
3633

34+
use super::*;
35+
use crate::SupersetCluster;
36+
3737
#[test]
3838
fn test_affinity_defaults() {
3939
let input = r#"

rust/crd/src/authentication.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,16 @@ mod tests {
324324
use std::pin::Pin;
325325

326326
use indoc::indoc;
327-
use stackable_operator::commons::networking::HostName;
328-
use stackable_operator::commons::tls_verification::{
329-
CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
327+
use stackable_operator::{
328+
commons::{
329+
authentication::oidc,
330+
networking::HostName,
331+
tls_verification::{
332+
CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
333+
},
334+
},
335+
kube,
330336
};
331-
use stackable_operator::{commons::authentication::oidc, kube};
332337

333338
use super::*;
334339

rust/crd/src/druidconnection.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use serde::{Deserialize, Serialize};
22
use snafu::Snafu;
3-
use stackable_operator::k8s_openapi::apimachinery::pkg::apis::meta::v1::Time;
4-
use stackable_operator::k8s_openapi::chrono::Utc;
5-
use stackable_operator::kube::CustomResource;
6-
use stackable_operator::kube::ResourceExt;
7-
use stackable_operator::schemars::{self, JsonSchema};
3+
use stackable_operator::{
4+
k8s_openapi::{apimachinery::pkg::apis::meta::v1::Time, chrono::Utc},
5+
kube::{CustomResource, ResourceExt},
6+
schemars::{self, JsonSchema},
7+
};
88

99
#[derive(Snafu, Debug)]
1010
#[allow(clippy::enum_variant_names)]

rust/crd/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ use stackable_operator::{
1414
Resources, ResourcesFragment,
1515
},
1616
},
17-
config::{fragment, fragment::Fragment, fragment::ValidationError, merge::Merge},
17+
config::{
18+
fragment,
19+
fragment::{Fragment, ValidationError},
20+
merge::Merge,
21+
},
1822
k8s_openapi::apimachinery::pkg::api::resource::Quantity,
1923
kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt},
2024
memory::{BinaryMultiple, MemoryQuantity},

rust/operator-binary/src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::collections::BTreeMap;
2+
13
use indoc::formatdoc;
24
use snafu::{ResultExt, Snafu};
35
use stackable_operator::commons::authentication::{ldap, oidc};
@@ -8,7 +10,6 @@ use stackable_superset_crd::{
810
},
911
SupersetConfigOptions,
1012
};
11-
use std::collections::BTreeMap;
1213

1314
#[derive(Snafu, Debug)]
1415
pub enum Error {

rust/operator-binary/src/druid_connection_controller.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use crate::util::{get_job_state, JobState};
2-
31
use std::sync::Arc;
42

53
use const_format::concatcp;
@@ -16,8 +14,7 @@ use stackable_operator::{
1614
core::v1::{ConfigMap, PodSpec, PodTemplateSpec},
1715
},
1816
kube::{
19-
core::DynamicObject,
20-
core::{error_boundary, DeserializeGuard},
17+
core::{error_boundary, DeserializeGuard, DynamicObject},
2118
runtime::{controller::Action, reflector::ObjectRef},
2219
ResourceExt,
2320
},
@@ -31,7 +28,12 @@ use stackable_superset_crd::{
3128
};
3229
use strum::{EnumDiscriminants, IntoStaticStr};
3330

34-
use crate::{rbac, superset_controller::DOCKER_IMAGE_BASE_NAME, APP_NAME, OPERATOR_NAME};
31+
use crate::{
32+
rbac,
33+
superset_controller::DOCKER_IMAGE_BASE_NAME,
34+
util::{get_job_state, JobState},
35+
APP_NAME, OPERATOR_NAME,
36+
};
3537

3638
pub const DRUID_CONNECTION_CONTROLLER_NAME: &str = "druid-connection";
3739
pub const DRUID_CONNECTION_FULL_CONTROLLER_NAME: &str =

rust/operator-binary/src/util.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use crate::OPERATOR_NAME;
2-
use stackable_operator::k8s_openapi::api::batch::v1::Job;
3-
use stackable_operator::kvp::ObjectLabels;
1+
use stackable_operator::{k8s_openapi::api::batch::v1::Job, kvp::ObjectLabels};
42
use stackable_superset_crd::APP_NAME;
53

4+
use crate::OPERATOR_NAME;
5+
66
pub enum JobState {
77
InProgress,
88
Complete,

0 commit comments

Comments
 (0)