code_tenting: Fix mononoke build after race condition

Summary:
D91887015 landed around the same time as D95219906.

They weren't conflicting, but are incompatible and broke the build.

This just updates content manifest code to do the same thing done in fsnodes.

Reviewed By: Joald

Differential Revision: D96010294

fbshipit-source-id: 9e6ac2694b937b7b51363d9b6635a86dae2b6cf3

Author: gustavoavena

eden/mononoke/derived_data/content_manifest_derivation/BUCK

@@ -38,7 +38,7 @@ rust_library(
         "//eden/mononoke/derived_data/remote/if:derived_data_service_if-rust",
         "//eden/mononoke/manifest:manifest",
         "//eden/mononoke/mononoke_types:mononoke_types",
-        "//eden/mononoke/repo_attributes/restricted_paths:restricted_paths",
+        "//eden/mononoke/repo_attributes/restricted_paths_common:restricted_paths_common",
         "//eden/mononoke/servers/slapi/slapi_server/context:context",
     ],
 )

eden/mononoke/derived_data/content_manifest_derivation/Cargo.toml

@@ -22,7 +22,7 @@ futures = { version = "0.3.31", features = ["async-await", "compat"] }
 justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 manifest = { version = "0.1.0", path = "../../manifest" }
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
-restricted_paths = { version = "0.1.0", path = "../../repo_attributes/restricted_paths" }
+restricted_paths_common = { version = "0.1.0", path = "../../repo_attributes/restricted_paths_common" }
 thiserror = "2.0.18"
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
 

eden/mononoke/derived_data/content_manifest_derivation/src/derive.rs

@@ -41,10 +41,10 @@ use mononoke_types::content_manifest::ContentManifestFile;
 use mononoke_types::content_manifest::ContentManifestRollupData;
 use mononoke_types::sharded_map_v2::LoadableShardedMapV2Node;
 use mononoke_types::sharded_map_v2::ShardedMapV2Node;
-use restricted_paths::ManifestId;
-use restricted_paths::ManifestType;
-use restricted_paths::RestrictedPathManifestIdEntry;
-use restricted_paths::RestrictedPaths;
+use restricted_paths_common::ManifestId;
+use restricted_paths_common::ManifestType;
+use restricted_paths_common::RestrictedPathManifestIdEntry;
+use restricted_paths_common::RestrictedPathsConfigBased;
 
 use crate::ContentManifestDerivationError;
 use crate::RootContentManifestId;
@@ -150,7 +150,7 @@ pub(crate) async fn create_content_manifest_directory(
     ctx: CoreContext,
     blobstore: Arc<dyn KeyedBlobstore>,
     path: &MPath,
-    restricted_paths: &Arc<RestrictedPaths>,
+    restricted_paths: &Arc<RestrictedPathsConfigBased>,
     subentries: TreeInfoSubentries<
         ContentManifestId,
         ContentManifestFile,
@@ -193,26 +193,28 @@ pub(crate) async fn create_content_manifest_directory(
         Some("content_manifest_write"),
     )?;
 
-    if restricted_paths_enabled
-        && let Some(non_root_path) = path.clone().into_optional_non_root_path()
-        && restricted_paths.is_restricted_path(&non_root_path)
-    {
-        let entry = RestrictedPathManifestIdEntry::new(
-            ManifestType::ContentManifest,
-            ManifestId::from(&id.blake2().into_inner()),
-            RepoPath::DirectoryPath(non_root_path),
-        )?;
-
-        if let Err(e) = restricted_paths
-            .manifest_id_store()
-            .add_entry(&ctx, entry)
-            .await
-        {
-            tracing::warn!(
-                path = %path,
-                error = %e,
-                "Failed to track restricted path"
-            );
+    if restricted_paths_enabled {
+        if let Some(non_root_path) = path.clone().into_optional_non_root_path() {
+            let is_restricted = restricted_paths.is_restricted_path(&non_root_path);
+            if is_restricted {
+                let entry = RestrictedPathManifestIdEntry::new(
+                    ManifestType::ContentManifest,
+                    ManifestId::from(&id.blake2().into_inner()),
+                    RepoPath::DirectoryPath(non_root_path),
+                )?;
+
+                if let Err(e) = restricted_paths
+                    .manifest_id_store()
+                    .add_entry(&ctx, entry)
+                    .await
+                {
+                    tracing::warn!(
+                        path = %path,
+                        error = %e,
+                        "Failed to track restricted path"
+                    );
+                }
+            }
         }
     }
 

eden/mononoke/derived_data/content_manifest_derivation/src/derive_from_predecessor.rs

@@ -28,7 +28,7 @@ use crate::derive::empty_directory;
 pub(crate) async fn inner_derive_from_predecessor(
     ctx: &CoreContext,
     blobstore: &Arc<dyn KeyedBlobstore>,
-    restricted_paths: &Arc<restricted_paths::RestrictedPaths>,
+    restricted_paths: &Arc<restricted_paths_common::RestrictedPathsConfigBased>,
     predecessor: mononoke_types::FsnodeId,
     chunk_size: usize,
 ) -> Result<Option<ContentManifestId>> {