From bb188e2a4042316f8baed4dd4b641044925135b3 Mon Sep 17 00:00:00 2001
From: Mathias Stearn <mathias@mongodb.com>
Date: Fri, 22 Aug 2025 16:29:29 +0200
Subject: [PATCH] SERVER-98435 Minor cleanups to modularity metadata (#40177)

GitOrigin-RevId: b8441051ff18df2b2d6c31743b0095164cf55969
---
 .github/ALLOWED_UNOWNED_FILES.yml |  5 +++++
 .github/CODEOWNERS                |  6 ++----
 .gitignore                        |  1 +
 modules_poc/OWNERS.yml            | 12 ++----------
 modules_poc/modules.yaml          | 18 +++++++++---------
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.github/ALLOWED_UNOWNED_FILES.yml b/.github/ALLOWED_UNOWNED_FILES.yml
index 7a0060325df..200f6d99a8c 100644
--- a/.github/ALLOWED_UNOWNED_FILES.yml
+++ b/.github/ALLOWED_UNOWNED_FILES.yml
@@ -2,3 +2,8 @@ version: 1.0.0
 filters:
   - filter: "/.github/CODEOWNERS"
     justification: "Generated by all of the individual owners files in the repo."
+  - filter: "/modules_poc/modules.yaml"
+    justification: >-
+      Not production code, more like linter config. All teams should be able to edit
+      their own module definitions, but there are advantages to keeping all modules
+      defined in a single file.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cd8804ae1f2..12dca489c9f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1598,10 +1598,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/with_mongot/**/* @10gen/query-integration-search @svc-auto-approve-bot
 
 # The following patterns are parsed from ./modules_poc/OWNERS.yml
-/modules_poc/**/OWNERS.yml @10gen/server-programmability @svc-auto-approve-bot
-/modules_poc/**/*.py @10gen/server-programmability @svc-auto-approve-bot
-/modules_poc/**/*.jq @10gen/server-programmability @svc-auto-approve-bot
-/modules_poc/**/*.sh @10gen/server-programmability @svc-auto-approve-bot
+/modules_poc/**/* @10gen/server-programmability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./rpm/OWNERS.yml
 /rpm/**/* @10gen/devprod-build @svc-auto-approve-bot
@@ -3105,3 +3102,4 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following lines are added from .github/ALLOWED_UNOWNED_FILES.yml
 /.github/CODEOWNERS
+/modules_poc/modules.yaml
diff --git a/.gitignore b/.gitignore
index d585c0c2da0..221bb132173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 /perf.data
 /perf.data.old
 /massif.out.*
+/merged_decls.json
 /modules_dump.yaml
 venv
 
diff --git a/modules_poc/OWNERS.yml b/modules_poc/OWNERS.yml
index 688cd93074b..d2e669a1378 100644
--- a/modules_poc/OWNERS.yml
+++ b/modules_poc/OWNERS.yml
@@ -1,14 +1,6 @@
 version: 1.0.0
 filters:
-  - "OWNERS.yml":
-    approvers:
-      - 10gen/server-programmability
-  - "*.py":
-    approvers:
-      - 10gen/server-programmability
-  - "*.jq":
-    approvers:
-      - 10gen/server-programmability
-  - "*.sh":
+  - "*":
     approvers:
       - 10gen/server-programmability
+# NOTE: modules.yaml is explicitly unowned via .github/ALLOWED_UNOWNED_FILES.yml
diff --git a/modules_poc/modules.yaml b/modules_poc/modules.yaml
index 3e18712a7e1..2ed55bfe3e8 100644
--- a/modules_poc/modules.yaml
+++ b/modules_poc/modules.yaml
@@ -490,7 +490,7 @@ access_control:
 admission:
   meta:
     slack: server-workload-scheduling
-    jira: server-workload-scheduling
+    jira: Workload Scheduling
   files:
     - src/mongo/db/admission/
     - src/mongo/db/flow_control_ticketholder*
@@ -499,7 +499,7 @@ admission:
 workload_simulation:
   meta:
     slack: server-workload-scheduling
-    jira: server-workload-scheduling
+    jira: Workload Scheduling
   files:
     - src/mongo/tools/workload_simulation/
 
@@ -975,7 +975,7 @@ tracking_allocators: # authoritative: @10gen/server-tracking-allocators
   files:
     - src/mongo/util/tracking
 
-atlas-streams:
+atlas_streams:
   meta:
     slack: streams-engine
     jira: Atlas Streams
@@ -1000,7 +1000,7 @@ installer:
 replication:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/repl/ # excluding ./dbcheck*
     - src/mongo/db/command_can_run_here*
@@ -1018,7 +1018,7 @@ replication:
 replication.hello:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/repl/hello/
     - src/mongo/db/repl/replication_info.cpp
@@ -1026,7 +1026,7 @@ replication.hello:
 replication.initial_sync:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/modules/enterprise/src/fcbis/
     - src/mongo/db/repl/initial_sync/
@@ -1034,7 +1034,7 @@ replication.initial_sync:
 replication.oplog:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/op_observer/op_observer*
     - src/mongo/db/op_observer/operation_logger*
@@ -1051,7 +1051,7 @@ replication.oplog:
 replication.server_rw_concerns:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/commands/read_write_concern_defaults_server_status.cpp
     - src/mongo/db/*read_concern*
@@ -1065,7 +1065,7 @@ replication.server_rw_concerns:
 replication.rs_aware_service:
   meta:
     slack: server-replication
-    jira: Server Replication
+    jira: Replication
   files:
     - src/mongo/db/repl/*primary_only_service*
     - src/mongo/db/repl/*replica_set_aware_service*