Fix a bunch of ok_or(anyhow!())s (#37674)

GitOrigin-RevId: 6f6c24d141a73e226f2da110c64bc86b56710179

Author: goffrie

crates/isolate/src/environment/analyze.rs

@@ -664,7 +664,7 @@ fn udf_analyze<RT: Runtime>(
             let resource_name_val = handler
                 .get_script_origin()
                 .resource_name()
-                .ok_or(anyhow!("resource_name was None"))?;
+                .context("resource_name was None")?;
             let resource_name = resource_name_val.to_rust_string_lossy(scope);
             let resource_url = module_specifier_from_str(&resource_name)?;
             let canon_path = path_from_module_specifier(&resource_url)?;
@@ -913,7 +913,7 @@ fn http_analyze<RT: Runtime>(
             let resource_name_val = handler
                 .get_script_origin()
                 .resource_name()
-                .ok_or(anyhow!("resource_name was None"))?;
+                .context("resource_name was None")?;
             let resource_name = resource_name_val.to_rust_string_lossy(scope);
             let resource_url = module_specifier_from_str(&resource_name)?;
             let canon_path = path_from_module_specifier(&resource_url)?;

crates/isolate/src/environment/helpers/module_loader.rs

@@ -104,5 +104,5 @@ pub fn path_from_module_specifier(
                 .parse::<CanonicalizedModulePath>()
         })
         .transpose()?
-        .ok_or(anyhow!("module specifier did not start with {}", prefix))
+        .ok_or_else(|| anyhow!("module specifier did not start with {}", prefix))
 }

crates/isolate/src/environment/schema.rs

@@ -229,7 +229,7 @@ impl SchemaEnvironment {
         let default_str = strings::default.create(&mut scope)?;
         let schema_val: v8::Local<v8::Value> = namespace
             .get(&mut scope, default_str.into())
-            .ok_or(missing_schema_export_error())?;
+            .ok_or_else(missing_schema_export_error)?;
         if schema_val.is_null_or_undefined() {
             anyhow::bail!(missing_schema_export_error());
         }

crates/local_backend/src/public_api.rs

@@ -274,7 +274,7 @@ pub async fn public_function_post_with_path(
     if path_parts.len() < 2 {
         return Err(bad_request_error().into());
     }
-    let function_name = path_parts.pop().ok_or(bad_request_error())?;
+    let function_name = path_parts.pop().ok_or_else(bad_request_error)?;
     let udf_path_str = format!("{}:{}", path_parts.join("/"), function_name);
     let udf_path = parse_udf_path(&udf_path_str)?;
     let udf_result = st

crates/model/src/fivetran_import/mod.rs

@@ -158,17 +158,20 @@ impl<'a, RT: Runtime> FivetranImportModel<'a, RT> {
                     && *index.name.descriptor() == *FIVETRAN_PRIMARY_KEY_INDEX_DESCRIPTOR
                     && index.is_database_index()
             })
-            .ok_or(ErrorMetadata::bad_request(
-                "MissingFivetranPrimaryKeyIndex",
-                format!(
-                    "The `{}` index on the `{table_name}` table is missing. Please edit your \
-                     `schema.ts` file and add the following index to the `{table_name}` table: \
-                     .index(\"{}\", [/* …attributes in the primary key… */]) (or \
-                     .index(\"sync_index\", [\"fivetran.deleted\", /* …attributes in the primary \
-                     key… */]).",
-                    *FIVETRAN_PRIMARY_KEY_INDEX_DESCRIPTOR, *FIVETRAN_PRIMARY_KEY_INDEX_DESCRIPTOR,
-                ),
-            ))?;
+            .ok_or_else(|| {
+                ErrorMetadata::bad_request(
+                    "MissingFivetranPrimaryKeyIndex",
+                    format!(
+                        "The `{}` index on the `{table_name}` table is missing. Please edit your \
+                         `schema.ts` file and add the following index to the `{table_name}` \
+                         table: .index(\"{}\", [/* …attributes in the primary key… */]) (or \
+                         .index(\"sync_index\", [\"fivetran.deleted\", /* …attributes in the \
+                         primary key… */]).",
+                        *FIVETRAN_PRIMARY_KEY_INDEX_DESCRIPTOR,
+                        *FIVETRAN_PRIMARY_KEY_INDEX_DESCRIPTOR,
+                    ),
+                )
+            })?;
 
         let IndexConfig::Database {
             developer_config: DeveloperDatabaseIndexConfig { fields },
@@ -230,13 +233,15 @@ impl<'a, RT: Runtime> FivetranImportModel<'a, RT> {
                 *index.name.table() == *table_name
                     && *index.name.descriptor() == *FIVETRAN_SYNCED_INDEX_DESCRIPTOR
             })
-            .ok_or(ErrorMetadata::bad_request(
-                "MissingFivetranSyncedIndex",
-                format!(
-                    "The Fivetran synchronization index on the `{table_name}` table is missing. \
-                     Something went wrong with the Fivetran sync.",
-                ),
-            ))?;
+            .ok_or_else(|| {
+                ErrorMetadata::bad_request(
+                    "MissingFivetranSyncedIndex",
+                    format!(
+                        "The Fivetran synchronization index on the `{table_name}` table is \
+                         missing. Something went wrong with the Fivetran sync.",
+                    ),
+                )
+            })?;
 
         if !index.is_database_index() {
             anyhow::bail!("Unexpected index type");

crates/simulation/src/tests/sync.rs

@@ -59,7 +59,7 @@ fn assert_objects_match(expected: &ConvexObject, actual: &ConvexObject) -> anyho
     for (key, value) in expected.iter() {
         let actual_value = actual
             .get(key)
-            .ok_or(anyhow::anyhow!("Key not found: {}", key))?;
+            .ok_or_else(|| anyhow::anyhow!("Key not found: {}", key))?;
         _assert_results_match(value, actual_value)?;
     }
     Ok(())