ci: clippy fixes

molnett · Sep 25, 2024 · 621664a · 621664a
1 parent b815b37
commit 621664a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       checks: write
+      contents: read
     steps:
       - uses: actions/checkout@v4
       - name: Setup FoundationDB
@@ -43,6 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       checks: write
+      contents: read
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust

diff --git a/crates/valv/src/api/server.rs b/crates/valv/src/api/server.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::{
-    valv::valv::v1::{
+    valv::proto::v1::{
         master_key_management_service_server::MasterKeyManagementService, CreateMasterKeyRequest,
         CreateMasterKeyResponse, CreateMasterKeyVersionRequest, CreateMasterKeyVersionResponse,
         DecryptRequest, DecryptResponse, DestroyMasterKeyVersionRequest,
@@ -97,7 +97,7 @@ impl MasterKeyManagementService for API {
             )
             .await;
 
-        let reply = crate::valv::valv::v1::EncryptResponse {
+        let reply = crate::valv::proto::v1::EncryptResponse {
             name: request.get_ref().master_key_id.clone(),
             ciphertext: encrypted_value.into(),
         };

diff --git a/crates/valv/src/cmd/main.rs b/crates/valv/src/cmd/main.rs
@@ -4,7 +4,7 @@ use clap::Parser;
 use secrecy::{ExposeSecret, Secret};
 use tonic::transport::Server;
 use valv::{
-    api, valv::valv::v1::master_key_management_service_server::MasterKeyManagementServiceServer,
+    api, valv::proto::v1::master_key_management_service_server::MasterKeyManagementServiceServer,
     Valv,
 };
 

diff --git a/crates/valv/src/lib.rs b/crates/valv/src/lib.rs
@@ -11,7 +11,7 @@ mod storage;
 mod tests;
 
 pub mod valv {
-    pub mod valv {
+    pub mod proto {
         pub mod v1 {
             include!("gen/valv.v1.rs");
         }
@@ -127,10 +127,9 @@ impl ValvAPI for Valv {
                 nanos: chrono::Utc::now().timestamp_subsec_nanos() as i32,
             }),
             rotation_schedule: Some(prost_types::Duration {
-                seconds: chrono::TimeDelta::days(30).num_seconds() as i64,
+                seconds: chrono::TimeDelta::days(30).num_seconds(),
                 nanos: 0,
             }),
-            ..Default::default()
         };
 
         self.db
@@ -203,9 +202,9 @@ impl ValvAPI for Valv {
         let decrypted_key_material = boring::symm::decrypt_aead(
             boring::symm::Cipher::aes_256_gcm(),
             self.master_key.expose_secret(),
-            Some(&iv),
+            Some(iv),
             &[],
-            &cipher,
+            cipher,
             tag,
         )
         .expect("Failed to decrypt key material");
@@ -270,19 +269,19 @@ impl ValvAPI for Valv {
         let decrypted_key_material = boring::symm::decrypt_aead(
             boring::symm::Cipher::aes_256_gcm(),
             self.master_key.expose_secret(),
-            Some(&kv_iv),
+            Some(kv_iv),
             &[],
-            &kv_cipher,
+            kv_cipher,
             kv_tag,
         )
         .expect("Failed to decrypt key material");
 
         boring::symm::decrypt_aead(
             boring::symm::Cipher::aes_256_gcm(),
             &decrypted_key_material,
-            Some(&iv),
+            Some(iv),
             &[],
-            &cipher,
+            cipher,
             tag,
         )
     }

diff --git a/crates/valv/src/storage/fdb.rs b/crates/valv/src/storage/fdb.rs
@@ -41,7 +41,7 @@ impl FoundationDB {
         let tenant_subspace = directory
             .create_or_open(
                 // the transaction used to read/write the directory.
-                &trx,
+                trx,
                 // the path used, which can view as a UNIX path like `/app/my-app`.
                 &path, // do not use any custom prefix or layer
                 None, None,
@@ -51,8 +51,7 @@ impl FoundationDB {
 
         let path = vec![String::from(key_id), String::from("metadata")];
 
-        let key = tenant_subspace.pack(&path).unwrap();
-        return key;
+        tenant_subspace.pack(&path).unwrap()
     }
 
     // Key structure
@@ -75,7 +74,7 @@ impl FoundationDB {
         let tenant_subspace = directory
             .create_or_open(
                 // the transaction used to read/write the directory.
-                &trx,
+                trx,
                 // the path used, which can view as a UNIX path like `/app/my-app`.
                 &path, // do not use any custom prefix or layer
                 None, None,
@@ -89,9 +88,7 @@ impl FoundationDB {
             version.to_string(),
         ];
 
-        let key = tenant_subspace.pack(&path).unwrap();
-
-        return key;
+        tenant_subspace.pack(&path).unwrap()
     }
 }
 
@@ -148,7 +145,7 @@ impl ValvStorage for FoundationDB {
                 continue;
             }
 
-            let key = internal::Key::decode(&key_value.value()[..]).expect("Failed to decode key");
+            let key = internal::Key::decode(key_value.value()).expect("Failed to decode key");
             keys.push(key);
         }
 
@@ -226,7 +223,7 @@ impl ValvStorage for FoundationDB {
         let mut key_versions: Vec<internal::KeyVersion> = vec![];
 
         for key_value in key_values.iter() {
-            let test: Vec<u8> = unpack(&key_value.value()).expect("Failed to unpack key value");
+            let test: Vec<u8> = unpack(key_value.value()).expect("Failed to unpack key value");
             let version =
                 internal::KeyVersion::decode(&test[..]).expect("Failed to decode key version");
             key_versions.push(version);

diff --git a/crates/valv/src/tests.rs b/crates/valv/src/tests.rs
@@ -2,7 +2,7 @@
 mod tests {
     use crate::{
         api::server::API,
-        valv::valv::v1::{
+        valv::proto::v1::{
             master_key_management_service_server::MasterKeyManagementServiceServer,
             CreateMasterKeyRequest, DecryptRequest, EncryptRequest, MasterKey,
         },
@@ -12,7 +12,7 @@ mod tests {
     use std::{sync::Arc, time::Duration};
     use tonic::transport::Server;
 
-    use crate::valv::valv::v1::master_key_management_service_client::MasterKeyManagementServiceClient;
+    use crate::valv::proto::v1::master_key_management_service_client::MasterKeyManagementServiceClient;
     use tokio::time::sleep;
 
     const SERVER_ADDR: &str = "0.0.0.0:8080";