Merge pull request #171 from ArunaStorage/feat/nats_improvements

Feat/nats improvements
arunaengine · May 8, 2024 · 91f0293 · 91f0293
2 parents dcc3964 + f2704f5
commit 91f0293
Show file tree

Hide file tree

Showing 42 changed files with 940 additions and 319 deletions.
diff --git a/components/data_proxy/src/auth/auth.rs b/components/data_proxy/src/auth/auth.rs
@@ -141,7 +141,7 @@ impl AuthHandler {
             encode_secret
         );
         let encoding_key = EncodingKey::from_ed_pem(private_pem.as_bytes()).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })?;
 
@@ -162,17 +162,17 @@ impl AuthHandler {
             .kid
             .ok_or_else(|| anyhow!("Unspecified kid"))
             .map_err(|e| {
-                tracing::error!(error = ?e, msg = e.to_string());
+                error!(error = ?e, msg = e.to_string());
                 e
             })?;
         let (pk, dec_key) = self
             .cache
             .get_pubkey(i32::from_str(&kid).map_err(|e| {
-                tracing::error!(error = ?e, msg = e.to_string());
+                error!(error = ?e, msg = e.to_string());
                 e
             })?)
             .map_err(|e| {
-                tracing::error!(error = ?e, msg = e.to_string());
+                error!(error = ?e, msg = e.to_string());
                 e
             })?;
         let claims = self.extract_claims(token, &dec_key)?;
@@ -205,7 +205,7 @@ impl AuthHandler {
             // No intent, no Dataproxy/Action check
             Ok((
                 DieselUlid::from_str(&claims.sub).map_err(|e| {
-                    tracing::error!(error = ?e, msg = e.to_string());
+                    error!(error = ?e, msg = e.to_string());
                     e
                 })?,
                 claims.tid,
@@ -229,7 +229,7 @@ impl AuthHandler {
             &validation, //&Validation::new(Algorithm::EdDSA)
         )
         .map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })?;
         Ok(token.claims)
@@ -647,7 +647,7 @@ impl AuthHandler {
         };
 
         self.sign_token(claims).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })
     }
@@ -670,7 +670,7 @@ impl AuthHandler {
         };
 
         self.sign_token(claims).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })
     }
@@ -696,7 +696,7 @@ impl AuthHandler {
         };
 
         self.sign_token(claims).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })
     }
@@ -709,7 +709,7 @@ impl AuthHandler {
         };
 
         let token = jsonwebtoken::encode(&header, &claims, &self.encoding_key.1).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })?;
 

diff --git a/components/data_proxy/src/auth/auth_helpers.rs b/components/data_proxy/src/auth/auth_helpers.rs
@@ -64,7 +64,7 @@ pub fn get_token_from_md(md: &MetadataMap) -> Result<String> {
         .get("Authorization")
         .ok_or(anyhow!("Metadata token not found"))
         .map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })?
         .to_str()?;

diff --git a/components/data_proxy/src/caching/cache.rs b/components/data_proxy/src/caching/cache.rs
@@ -137,7 +137,7 @@ impl Cache {
                 GrpcQueryHandler::new(url, cache.clone(), self_id.to_string())
                     .await
                     .map_err(|e| {
-                        tracing::error!(error = ?e, msg = e.to_string());
+                        error!(error = ?e, msg = e.to_string());
                         e
                     })?,
             );
@@ -486,8 +486,7 @@ impl Cache {
         // /foo/bar: id-foo/bar
 
         // VecDeque<(id, [Option<(String, DieselUlid)>; 4])>
-        const ARRAY_REPEAT_VALUE: std::option::Option<(std::string::String, TypedId)> =
-            None::<(String, TypedId)>;
+        const ARRAY_REPEAT_VALUE: Option<(String, TypedId)> = None::<(String, TypedId)>;
         let mut prefixes = VecDeque::from([(*resource_id, [ARRAY_REPEAT_VALUE; 3])]);
         let mut final_result = Vec::new();
         while let Some((id, visited)) = prefixes.pop_front() {
@@ -627,7 +626,7 @@ impl Cache {
             .pubkeys
             .get(&kid)
             .ok_or_else(|| {
-                tracing::error!(error = "Pubkey not found");
+                error!(error = "Pubkey not found");
                 anyhow!("Pubkey not found")
             })?
             .clone())
@@ -636,7 +635,7 @@ impl Cache {
     #[tracing::instrument(level = "trace", skip(self))]
     pub async fn upsert_user(self: Arc<Cache>, user: GrpcUser) -> Result<()> {
         let user_id = DieselUlid::from_str(&user.id).map_err(|e| {
-            tracing::error!(error = ?e, msg = e.to_string());
+            error!(error = ?e, msg = e.to_string());
             e
         })?;
         let proxy_user = User::try_from(user)?;