avoid throwing err

tailcallhq · May 23, 2024 · a5ecc2c · a5ecc2c
1 parent e6e07ed
commit a5ecc2c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/src/core/lambda/cache.rs b/src/core/lambda/cache.rs
@@ -40,20 +40,21 @@ impl Eval for Cache {
     ) -> Pin<Box<dyn Future<Output = Result<ConstValue, EvaluationError>> + 'a + Send>> {
         Box::pin(async move {
             if let Expression::IO(io) = self.expr.deref() {
-                let key = io
-                    .cache_key(&ctx)
-                    .ok_or(anyhow::anyhow!("Unable to generate Cache Key"))?;
-
-                if let Some(val) = ctx.request_ctx.runtime.cache.get(&key).await? {
-                    Ok(val)
+                let key = io.cache_key(&ctx);
+                if let Some(key) = key {
+                    if let Some(val) = ctx.request_ctx.runtime.cache.get(&key).await? {
+                        Ok(val)
+                    } else {
+                        let val = self.expr.eval(ctx.clone()).await?;
+                        ctx.request_ctx
+                            .runtime
+                            .cache
+                            .set(key, val.clone(), self.max_age)
+                            .await?;
+                        Ok(val)
+                    }
                 } else {
-                    let val = self.expr.eval(ctx.clone()).await?;
-                    ctx.request_ctx
-                        .runtime
-                        .cache
-                        .set(key, val.clone(), self.max_age)
-                        .await?;
-                    Ok(val)
+                    self.expr.eval(ctx).await
                 }
             } else {
                 Ok(self.expr.eval(ctx).await?)

diff --git a/src/core/lambda/io.rs b/src/core/lambda/io.rs
@@ -51,15 +51,17 @@ impl Eval for IO {
     ) -> Pin<Box<dyn Future<Output = Result<ConstValue, EvaluationError>> + 'a + Send>> {
         if ctx.request_ctx.upstream.dedupe {
             Box::pin(async move {
-                let key = self
-                    .cache_key(&ctx)
-                    .ok_or(anyhow::anyhow!("Unable to generate Cache Key"))?;
-                ctx.request_ctx
-                    .cache
-                    .get_or_eval(key, move || Box::pin(self.eval_inner(ctx)))
-                    .await
-                    .as_ref()
-                    .clone()
+                let key = self.cache_key(&ctx);
+                if let Some(key) = key {
+                    ctx.request_ctx
+                        .cache
+                        .get_or_eval(key, move || Box::pin(self.eval_inner(ctx)))
+                        .await
+                        .as_ref()
+                        .clone()
+                } else {
+                    self.eval_inner(ctx).await
+                }
             })
         } else {
             Box::pin(self.eval_inner(ctx))