Skip to content

Commit 65f323e

Browse files
chore: Update templated files (9001281) (#916)
* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@9001281 Reference-to: stackabletech/operator-templating@9001281 (Fix pre-commit hook) * chore: Apply formatting --------- Co-authored-by: Techassi <git@techassi.dev>
1 parent 71c6999 commit 65f323e

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.github/workflows/pr_pre-commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
CARGO_TERM_COLOR: always
9-
RUST_TOOLCHAIN_VERSION: "1.82.0"
9+
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
1010
HADOLINT_VERSION: "v2.12.0"
1111
PYTHON_VERSION: "3.12"
1212

.pre-commit-config.yaml

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ repos:
1717
- repo: https://github.com/doublify/pre-commit-rust
1818
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
1919
hooks:
20-
- id: fmt
21-
# Pinning to a specific rustc version, so that we get consistent formatting
22-
entry: RUSTUP_TOOLCHAIN=nightly-2025-01-15 cargo fmt
23-
args: ["--all", "--", "--check"]
2420
- id: clippy
2521
args: ["--all-targets", "--", "-D", "warnings"]
2622

@@ -78,3 +74,10 @@ repos:
7874
entry: cargo test
7975
stages: [pre-commit, pre-merge-commit, manual]
8076
pass_filenames: false
77+
78+
- id: cargo-rustfmt
79+
name: cargo-rustfmt
80+
language: system
81+
entry: cargo +nightly-2025-01-15 fmt --all -- --check
82+
stages: [pre-commit]
83+
pass_filenames: false

rust/crd/src/authentication.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use serde::{Deserialize, Serialize};
22
use snafu::{ResultExt, Snafu};
3-
use stackable_operator::commons::authentication::AuthenticationClassProvider;
43
use stackable_operator::{
54
client::Client,
6-
commons::authentication::AuthenticationClass,
5+
commons::authentication::{AuthenticationClass, AuthenticationClassProvider},
76
schemars::{self, JsonSchema},
87
};
98

rust/crd/src/security.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
//! This is required due to overlaps between TLS encryption and e.g. mTLS authentication or Kerberos
77
use std::collections::BTreeMap;
88

9-
use crate::{authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster};
109
use snafu::{ResultExt, Snafu};
11-
use stackable_operator::time::Duration;
1210
use stackable_operator::{
1311
builder::{
1412
self,
@@ -24,8 +22,11 @@ use stackable_operator::{
2422
client::Client,
2523
commons::authentication::AuthenticationClassProvider,
2624
k8s_openapi::api::core::v1::Volume,
25+
time::Duration,
2726
};
2827

28+
use crate::{authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster};
29+
2930
type Result<T, E = Error> = std::result::Result<T, E>;
3031

3132
#[derive(Snafu, Debug)]

rust/operator-binary/src/znode_controller.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,9 @@ pub fn error_policy(
413413
}
414414

415415
mod znode_mgmt {
416-
use snafu::{OptionExt, ResultExt, Snafu};
417416
use std::{collections::VecDeque, net::SocketAddr};
417+
418+
use snafu::{OptionExt, ResultExt, Snafu};
418419
use tokio::net::lookup_host;
419420
use tokio_zookeeper::{Acl, Permission, ZooKeeper};
420421

0 commit comments

Comments
 (0)