.pre-commit-config.yaml

@@ -22,12 +22,10 @@ repos:
       - id: fmt
         name: fmt
         description: Format files with cargo fmt.
-        entry: cargo +nightly fmt
+        entry: cargo fmt
         language: system
         types: [rust]
         args: ["--", "--check"]
-        # For some reason some formatting is different depending on how you invoke?
-        pass_filenames: false
 
       - id: clippy
         name: clippy

.rustfmt.toml

@@ -1,2 +0,0 @@
-imports_granularity = "Module"
-group_imports = "StdExternalCrate"

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lldap-controller"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 default-run = "lldap-controller"
 
 [workspace]

queries/src/lib.rs

@@ -88,9 +88,9 @@ pub struct GetGroups {
 
 #[cfg(test)]
 mod tests {
-    use cynic::{MutationBuilder, QueryBuilder};
-
     use super::*;
+    use cynic::MutationBuilder;
+    use cynic::QueryBuilder;
 
     #[test]
     fn delete_user_gql_output() {

src/context.rs

@@ -1,7 +1,9 @@
 use async_trait::async_trait;
 use k8s_openapi::api::core::v1::Secret;
-use kube::runtime::events::{Event, EventType, Recorder, Reporter};
+use kube::{
-use kube::{Resource, ResourceExt};
+    runtime::events::{Event, EventType, Recorder, Reporter},
+    Resource, ResourceExt,
+};
 
 use crate::lldap::LldapConfig;
 

src/lldap.rs

@@ -1,19 +1,19 @@
-use std::time::Duration;
-
 use anyhow::Context;
-use cynic::http::{CynicReqwestError, ReqwestExt};
-use cynic::{GraphQlError, GraphQlResponse, MutationBuilder, QueryBuilder};
-use lldap_auth::login::{ClientSimpleLoginRequest, ServerLoginResponse};
 use lldap_auth::opaque::AuthenticationError;
 use lldap_auth::registration::ServerRegistrationStartResponse;
 use lldap_auth::{opaque, registration};
+use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION};
+use std::time::Duration;
+use tracing::{debug, trace};
+
+use cynic::http::{CynicReqwestError, ReqwestExt};
+use cynic::{GraphQlError, GraphQlResponse, MutationBuilder, QueryBuilder};
+use lldap_auth::login::{ClientSimpleLoginRequest, ServerLoginResponse};
 use queries::{
     AddUserToGroup, AddUserToGroupVariables, CreateUser, CreateUserVariables, DeleteUser,
     DeleteUserVariables, GetGroups, GetUser, GetUserVariables, Group, RemoveUserFromGroup,
     RemoveUserFromGroupVariables, User,
 };
-use reqwest::header::{AUTHORIZATION, HeaderMap, HeaderValue};
-use tracing::{debug, trace};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {

src/main.rs

@@ -1,18 +1,18 @@
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
-use std::time::Duration;
 
 use futures::StreamExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::runtime::Controller;
+use kube::{
-use kube::runtime::controller::Action;
+    runtime::{controller::Action, Controller},
-use kube::{Api, Client as KubeClient};
+    Api, Client as KubeClient,
-use lldap_controller::context::Context;
+};
-use lldap_controller::lldap::LldapConfig;
+use lldap_controller::{
-use lldap_controller::resources::{self, ServiceUser, reconcile};
+    context::Context,
+    lldap::LldapConfig,
+    resources::{self, reconcile, ServiceUser},
+};
 use tracing::{debug, info, warn};
-use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
-use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::{EnvFilter, Registry};
 
 fn error_policy(_obj: Arc<ServiceUser>, err: &resources::Error, _ctx: Arc<Context>) -> Action {
     warn!("error: {}", err);

src/resources/mod.rs

@@ -8,14 +8,15 @@ use k8s_openapi::NamespaceResourceScope;
 use kube::runtime::controller::Action;
 use kube::runtime::finalizer;
 use kube::{Api, Resource, ResourceExt};
-use serde::Serialize;
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 use tracing::{debug, instrument};
 
-pub use self::service_user::ServiceUser;
 use crate::context::Context;
 use crate::lldap;
 
+pub use service_user::ServiceUser;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Failed to commit: {0}")]

src/resources/service_user.rs

@@ -229,9 +229,8 @@ impl Reconcile for ServiceUser {
 
 #[cfg(test)]
 mod tests {
-    use kube::CustomResourceExt;
-
     use super::*;
+    use kube::CustomResourceExt;
 
     #[test]
     fn service_user_crd_output() {