chore(server): fix clippy lints

Author: akrantz01

src/server/database.rs

@@ -114,26 +114,23 @@ impl Databases {
             .fetch_optional(&default)
             .await?;
 
-        match pgbouncer {
-            Some(user) => {
-                info!(
-                    %user.can_login,
-                    %user.create_db,
-                    %user.create_role,
-                    %user.bypass_rls,
-                    %user.superuser,
-                    "pgbouncer user already exists"
-                );
-                if !user.can_login {
-                    warn!("pgbouncer user should be able to login");
-                }
-            }
-            None => {
-                warn!("pgbouncer user does not exist, creating...");
-                query!("CREATE USER pgbouncer WITH LOGIN NOSUPERUSER NOCREATEROLE NOCREATEDB NOREPLICATION NOBYPASSRLS")
-                    .execute(&default)
-                    .await?;
+        if let Some(user) = pgbouncer {
+            info!(
+                %user.can_login,
+                %user.create_db,
+                %user.create_role,
+                %user.bypass_rls,
+                %user.superuser,
+                "pgbouncer user already exists"
+            );
+            if !user.can_login {
+                warn!("pgbouncer user should be able to login");
             }
+        } else {
+            warn!("pgbouncer user does not exist, creating...");
+            query!("CREATE USER pgbouncer WITH LOGIN NOSUPERUSER NOCREATEROLE NOCREATEDB NOREPLICATION NOBYPASSRLS")
+                .execute(&default)
+                .await?;
         }
 
         // Setup the default database for pgbouncer authentication just in case
@@ -146,7 +143,7 @@ impl Databases {
     /// Get a list of all the managed databases
     pub fn managed_databases(&self) -> Vec<String> {
         let pools = self.0.pools.read();
-        pools.keys().map(|d| d.to_owned()).collect()
+        pools.keys().map(Clone::clone).collect()
     }
 
     /// Get a connection to the default database
@@ -223,13 +220,10 @@ impl Databases {
             return Err(Error::DefaultDatabase);
         }
 
-        let pool = match {
+        let Some(pool) = ({
             let mut pools = self.0.pools.write();
             pools.remove(database)
-        } {
-            Some(p) => p,
-            None => return Ok(()),
-        };
+        }) else { return Ok(()) };
 
         pool.close().await;
 

src/server/operator.rs

@@ -1,10 +1,9 @@
 use super::database::{self, Databases};
 use clap::Args;
 use futures::StreamExt;
-use k8s_openapi::api::core::v1::Secret;
-use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
+use k8s_openapi::{api::core::v1::Secret, apimachinery::pkg::apis::meta::v1::ObjectMeta};
 use kube::{
-    api::{Patch, PatchParams},
+    api::{DeleteParams, ListParams, Patch, PatchParams},
     client::Client,
     config::{Config, KubeConfigOptions, Kubeconfig},
     runtime::{
@@ -192,7 +191,7 @@ impl Operator {
         }
 
         let databases = Api::<Database>::all(client.clone());
-        Controller::new(databases, Default::default())
+        Controller::new(databases, ListParams::default())
             .graceful_shutdown_on(async {
                 stop.await.unwrap();
                 debug!("shutdown signal received");
@@ -333,7 +332,9 @@ async fn cleanup(object: Arc<Database>, databases: Databases, client: Client) ->
     let secret_name = secret_name_for_database(&object);
     for namespace in &object.spec.secret.namespaces {
         let secrets = Api::<Secret>::namespaced(client.clone(), namespace);
-        secrets.delete(&secret_name, &Default::default()).await?;
+        secrets
+            .delete(&secret_name, &DeleteParams::default())
+            .await?;
 
         info!(%namespace, "removed secret from namespace");
     }