Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr_pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN_VERSION: "1.82.0"
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
HADOLINT_VERSION: "v2.12.0"
PYTHON_VERSION: "3.12"

Expand Down
11 changes: 7 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ repos:
- repo: https://github.com/doublify/pre-commit-rust
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
hooks:
- id: fmt
# Pinning to a specific rustc version, so that we get consistent formatting
entry: RUSTUP_TOOLCHAIN=nightly-2025-01-15 cargo fmt
args: ["--all", "--", "--check"]
- id: clippy
args: ["--all-targets", "--", "-D", "warnings"]

Expand Down Expand Up @@ -78,3 +74,10 @@ repos:
entry: cargo test
stages: [pre-commit, pre-merge-commit, manual]
pass_filenames: false

- id: cargo-rustfmt
name: cargo-rustfmt
language: system
entry: cargo +nightly-2025-01-15 fmt --all -- --check
stages: [pre-commit]
pass_filenames: false
3 changes: 1 addition & 2 deletions rust/crd/src/authentication.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use serde::{Deserialize, Serialize};
use snafu::{ResultExt, Snafu};
use stackable_operator::commons::authentication::AuthenticationClassProvider;
use stackable_operator::{
client::Client,
commons::authentication::AuthenticationClass,
commons::authentication::{AuthenticationClass, AuthenticationClassProvider},
schemars::{self, JsonSchema},
};

Expand Down
5 changes: 3 additions & 2 deletions rust/crd/src/security.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
//! This is required due to overlaps between TLS encryption and e.g. mTLS authentication or Kerberos
use std::collections::BTreeMap;

use crate::{authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster};
use snafu::{ResultExt, Snafu};
use stackable_operator::time::Duration;
use stackable_operator::{
builder::{
self,
Expand All @@ -24,8 +22,11 @@ use stackable_operator::{
client::Client,
commons::authentication::AuthenticationClassProvider,
k8s_openapi::api::core::v1::Volume,
time::Duration,
};

use crate::{authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster};

type Result<T, E = Error> = std::result::Result<T, E>;

#[derive(Snafu, Debug)]
Expand Down
3 changes: 2 additions & 1 deletion rust/operator-binary/src/znode_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,9 @@ pub fn error_policy(
}

mod znode_mgmt {
use snafu::{OptionExt, ResultExt, Snafu};
use std::{collections::VecDeque, net::SocketAddr};

use snafu::{OptionExt, ResultExt, Snafu};
use tokio::net::lookup_host;
use tokio_zookeeper::{Acl, Permission, ZooKeeper};

Expand Down