SERVER-69871 Move feature_flag unit into server_base

48 files changed, 70 insertions, 116 deletions

diff --git a/buildscripts/idl/idl/generator.py b/buildscripts/idl/idl/generator.py
index 3cfed298c9a..490f819990f 100644
--- a/buildscripts/idl/idl/generator.py
+++ b/buildscripts/idl/idl/generator.py
@@ -1016,7 +1016,7 @@ class _CppHeaderFileWriter(_CppFileWriterBase):
 
         if spec.server_parameters:
             if [param for param in spec.server_parameters if param.feature_flag]:
-                header_list.append('mongo/idl/feature_flag.h')
+                header_list.append('mongo/db/feature_flag.h')
             header_list.append('mongo/db/server_parameter.h')
             header_list.append('mongo/db/server_parameter_with_storage.h')
 
diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript
index 1466f4d370d..101bc1324e0 100644
--- a/src/mongo/crypto/SConscript
+++ b/src/mongo/crypto/SConscript
@@ -82,7 +82,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/pipeline/value_idl',
-        '$BUILD_DIR/mongo/idl/feature_flag',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 39f8650777e..f109b4b282f 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -61,6 +61,9 @@ env.Library(
     target='server_base', source=[
         'basic_types.idl',
         'database_name.cpp',
+        'feature_compatibility_version_parser.cpp',
+        'feature_compatibility_version_document.idl',
+        'feature_flag.cpp',
         'index_names.cpp',
         'keypattern.cpp',
         'logical_time.cpp',
@@ -130,7 +133,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/auth',
         '$BUILD_DIR/mongo/db/auth/security_token',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'server_base',
         'server_feature_flags',
     ],
@@ -269,13 +271,30 @@ env.Library(
     ],
 )
 
+env.Command(
+    target=[
+        'feature_flag_test.idl',
+    ],
+    source=[
+        '#buildscripts/cheetah_source_generator.py',
+        'feature_flag_test.idl.tpl',
+        '$BUILD_DIR/mongo/util/version/releases.yml',
+    ],
+    action=[
+        '$PYTHON ${SOURCES[0]} -o ${TARGETS[0]} ${SOURCES[1]} ${SOURCES[2]} ${MONGO_VERSION}',
+    ],
+    # Ensure that that SCons is used to produce this file rather than Ninja, to avoid spurious
+    # dependency cycles due to how we manage generated sources with Ninja.
+    NINJA_TEMPLATE=True,
+)
+
 env.Library(
     target='server_feature_flags',
     source=[
+        'feature_flag_test.idl',
         'server_feature_flags.idl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'server_base',
     ],
 )
@@ -400,9 +419,9 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_settings',
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
         '$BUILD_DIR/mongo/db/storage/storage_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
         'global_settings',
+        'server_base',
         'server_options_base',
         'server_options_servers',
     ],
@@ -448,7 +467,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/repl/repl_server_parameters',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/caching',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         'server_base',
@@ -539,7 +557,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/query/query_knobs',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -854,7 +871,6 @@ env.Library(
         'internal_transactions_feature_flag.idl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'server_base',
         'server_options_core',
     ],
@@ -1942,10 +1958,10 @@ env.Library(
         'client_metadata_propagation_egress_hook.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/rpc/client_metadata',
         '$BUILD_DIR/mongo/rpc/metadata',
         '$BUILD_DIR/mongo/rpc/metadata_impersonated_user',
+        'server_base',
         'server_feature_flags',
     ],
 )
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 77eee327fcb..2b1b866efae 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -16,7 +16,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/service_context',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -203,7 +202,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/global_settings',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         '$BUILD_DIR/mongo/util/icu',
         '$BUILD_DIR/mongo/util/net/ssl_manager',
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index 1a0683feb93..37f9252b47a 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -43,7 +43,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'clustered_collection_options',
     ],
 )
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 99ef69c2bbf..cb1b87d1993 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -42,17 +42,6 @@ env.Library(
     ],
 )
 
-env.Library(
-    target='feature_compatibility_parsers',
-    source=[
-        'feature_compatibility_version_parser.cpp',
-        'feature_compatibility_version_document.idl',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/server_base',
-    ],
-)
-
 # Commands available in every process that executes commands
 env.Library(
     target='core',
@@ -160,7 +149,6 @@ env.Library(
         '$BUILD_DIR/mongo/util/ntservice',
         'authentication_commands',
         'core',
-        'feature_compatibility_parsers',
         'test_commands_enabled',
     ],
 )
@@ -218,9 +206,6 @@ env.Library(
         'feature_compatibility_version.cpp',
         'feature_compatibility_version.idl',
     ],
-    LIBDEPS=[
-        'feature_compatibility_parsers',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/dbdirectclient',
@@ -277,7 +262,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -378,6 +362,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
         '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker',
         '$BUILD_DIR/mongo/db/rw_concern_d',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/session/session_catalog_mongod',
         '$BUILD_DIR/mongo/db/stats/counters',
@@ -396,7 +381,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/views/view_catalog_helpers',
         '$BUILD_DIR/mongo/db/views/views_mongod',
         '$BUILD_DIR/mongo/executor/async_request_executor',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/rpc/rewrite_state_change_errors',
         '$BUILD_DIR/mongo/s/grid',
         '$BUILD_DIR/mongo/util/log_and_backoff',
@@ -474,7 +458,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        'feature_compatibility_parsers',
     ],
 )
 
@@ -694,9 +677,9 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/repl_server_parameters',
         '$BUILD_DIR/mongo/db/repl/tenant_migration_state_machine_idl',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/serverless/serverless_types_idl',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
diff --git a/src/mongo/db/commands/feature_compatibility_version.cpp b/src/mongo/db/commands/feature_compatibility_version.cpp
index 0faf55c09f3..c47fc23b532 100644
--- a/src/mongo/db/commands/feature_compatibility_version.cpp
+++ b/src/mongo/db/commands/feature_compatibility_version.cpp
@@ -36,10 +36,10 @@
 
 #include "mongo/base/status.h"
 #include "mongo/db/catalog_raii.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
 #include "mongo/db/commands/feature_compatibility_version_gen.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/dbdirectclient.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/optime.h"
diff --git a/src/mongo/db/commands/feature_compatibility_version.h b/src/mongo/db/commands/feature_compatibility_version.h
index 5fdaf463ea9..da663d35bb0 100644
--- a/src/mongo/db/commands/feature_compatibility_version.h
+++ b/src/mongo/db/commands/feature_compatibility_version.h
@@ -32,8 +32,8 @@
 #include "mongo/base/status_with.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobj.h"
-#include "mongo/db/commands/feature_compatibility_version_document_gen.h"
 #include "mongo/db/commands/set_feature_compatibility_version_gen.h"
+#include "mongo/db/feature_compatibility_version_document_gen.h"
 #include "mongo/db/repl/storage_interface.h"
 #include "mongo/db/server_options.h"
 
diff --git a/src/mongo/db/commands/set_feature_compatibility_version.idl b/src/mongo/db/commands/set_feature_compatibility_version.idl
index 416b5d8ee03..4250895c094 100644
--- a/src/mongo/db/commands/set_feature_compatibility_version.idl
+++ b/src/mongo/db/commands/set_feature_compatibility_version.idl
@@ -29,7 +29,7 @@
 global:
   cpp_namespace: "mongo"
   cpp_includes:
-    - "mongo/db/commands/feature_compatibility_version_parser.h"
+    - "mongo/db/feature_compatibility_version_parser.h"
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
index 29e7088a522..dba9bfc42d5 100644
--- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
+++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
@@ -46,12 +46,12 @@
 #include "mongo/db/coll_mod_gen.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/feature_compatibility_version.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/commands/set_feature_compatibility_version_gen.h"
 #include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/global_settings.h"
 #include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/namespace_string.h"
diff --git a/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp b/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp
index 49d8e85217c..44e65bf66f9 100644
--- a/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp
+++ b/src/mongo/db/commands/tenant_migration_recipient_cmds.cpp
@@ -29,9 +29,9 @@
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/commands/tenant_migration_donor_cmds_gen.h"
 #include "mongo/db/commands/tenant_migration_recipient_cmds_gen.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/repl/primary_only_service.h"
 #include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/repl/tenant_migration_recipient_service.h"
diff --git a/src/mongo/db/commands/feature_compatibility_version_document.idl b/src/mongo/db/feature_compatibility_version_document.idl
index b2e0491ccf4..96d3ca7726d 100644
--- a/src/mongo/db/commands/feature_compatibility_version_document.idl
+++ b/src/mongo/db/feature_compatibility_version_document.idl
@@ -28,7 +28,7 @@
 global:
   cpp_namespace: "mongo"
   cpp_includes:
-    - "mongo/db/commands/feature_compatibility_version_parser.h"
+    - "mongo/db/feature_compatibility_version_parser.h"
 
 
 imports:
diff --git a/src/mongo/db/commands/feature_compatibility_version_documentation.h b/src/mongo/db/feature_compatibility_version_documentation.h
index cfdfe8f1025..56a9168b25d 100644
--- a/src/mongo/db/commands/feature_compatibility_version_documentation.h
+++ b/src/mongo/db/feature_compatibility_version_documentation.h
@@ -31,7 +31,7 @@
 
 #include <fmt/format.h>
 
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 
 namespace mongo {
 namespace feature_compatibility_version_documentation {
diff --git a/src/mongo/db/commands/feature_compatibility_version_parser.cpp b/src/mongo/db/feature_compatibility_version_parser.cpp
index 3e19a5413da..ef039ce158a 100644
--- a/src/mongo/db/commands/feature_compatibility_version_parser.cpp
+++ b/src/mongo/db/feature_compatibility_version_parser.cpp
@@ -29,12 +29,12 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 
 #include "mongo/base/status.h"
 #include "mongo/bson/bsonobj.h"
-#include "mongo/db/commands/feature_compatibility_version_document_gen.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_document_gen.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/util/version/releases.h"
 
diff --git a/src/mongo/db/commands/feature_compatibility_version_parser.h b/src/mongo/db/feature_compatibility_version_parser.h
index 0a9cc4eb238..0a9cc4eb238 100644
--- a/src/mongo/db/commands/feature_compatibility_version_parser.h
+++ b/src/mongo/db/feature_compatibility_version_parser.h
diff --git a/src/mongo/idl/feature_flag.cpp b/src/mongo/db/feature_flag.cpp
index 4fbbf8d374c..e818deb9992 100644
--- a/src/mongo/idl/feature_flag.cpp
+++ b/src/mongo/db/feature_flag.cpp
@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "mongo/idl/feature_flag.h"
+#include "mongo/db/feature_flag.h"
 
 #include "mongo/util/debug_util.h"
 #include "mongo/util/version/releases.h"
diff --git a/src/mongo/idl/feature_flag.h b/src/mongo/db/feature_flag.h
index b76f8c6892c..f81f0342dd7 100644
--- a/src/mongo/idl/feature_flag.h
+++ b/src/mongo/db/feature_flag.h
@@ -31,7 +31,7 @@
 
 #include <string>
 
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/server_parameter.h"
 #include "mongo/util/version/releases.h"
diff --git a/src/mongo/idl/feature_flag_test.idl.tpl b/src/mongo/db/feature_flag_test.idl.tpl
index 86a2734dfa3..86a2734dfa3 100644
--- a/src/mongo/idl/feature_flag_test.idl.tpl
+++ b/src/mongo/db/feature_flag_test.idl.tpl
diff --git a/src/mongo/db/matcher/schema/json_schema_parser.cpp b/src/mongo/db/matcher/schema/json_schema_parser.cpp
index 3db0391051b..0942d0ead05 100644
--- a/src/mongo/db/matcher/schema/json_schema_parser.cpp
+++ b/src/mongo/db/matcher/schema/json_schema_parser.cpp
@@ -36,7 +36,7 @@
 
 #include "mongo/bson/bsontypes.h"
 #include "mongo/bson/unordered_fields_bsonelement_comparator.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/matcher/doc_validation_util.h"
 #include "mongo/db/matcher/expression_always_boolean.h"
 #include "mongo/db/matcher/expression_parser.h"
diff --git a/src/mongo/db/op_observer/fcv_op_observer.cpp b/src/mongo/db/op_observer/fcv_op_observer.cpp
index 069c1c0e2af..5acca8bc3ae 100644
--- a/src/mongo/db/op_observer/fcv_op_observer.cpp
+++ b/src/mongo/db/op_observer/fcv_op_observer.cpp
@@ -31,7 +31,7 @@
 #include "mongo/db/op_observer/fcv_op_observer.h"
 
 #include "mongo/db/commands/feature_compatibility_version.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/op_observer/op_observer_util.h"
 #include "mongo/db/operation_context.h"
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index e3ef1f3b6e6..be13b5fc366 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -55,8 +55,8 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/query/query_knobs',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
diff --git a/src/mongo/db/pipeline/accumulation_statement.cpp b/src/mongo/db/pipeline/accumulation_statement.cpp
index 05ebadf7a80..d503e143af0 100644
--- a/src/mongo/db/pipeline/accumulation_statement.cpp
+++ b/src/mongo/db/pipeline/accumulation_statement.cpp
@@ -34,8 +34,8 @@
 
 #include "mongo/db/pipeline/accumulation_statement.h"
 
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
 #include "mongo/db/exec/document_value/value.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/pipeline/accumulator.h"
 #include "mongo/db/query/allowed_contexts.h"
 #include "mongo/db/stats/counters.h"
diff --git a/src/mongo/db/pipeline/document_source.cpp b/src/mongo/db/pipeline/document_source.cpp
index 9be46641489..87858f4e7e5 100644
--- a/src/mongo/db/pipeline/document_source.cpp
+++ b/src/mongo/db/pipeline/document_source.cpp
@@ -32,8 +32,8 @@
 
 #include "mongo/db/pipeline/document_source.h"
 
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
 #include "mongo/db/exec/document_value/value.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/matcher/expression_algo.h"
 #include "mongo/db/pipeline/document_source_add_fields.h"
 #include "mongo/db/pipeline/document_source_group.h"
diff --git a/src/mongo/db/pipeline/document_source_change_stream.cpp b/src/mongo/db/pipeline/document_source_change_stream.cpp
index 2c56f29d45b..38b7d67fc32 100644
--- a/src/mongo/db/pipeline/document_source_change_stream.cpp
+++ b/src/mongo/db/pipeline/document_source_change_stream.cpp
@@ -32,7 +32,7 @@
 
 #include "mongo/bson/simple_bsonelement_comparator.h"
 #include "mongo/db/bson/bson_helper.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/pipeline/change_stream_constants.h"
 #include "mongo/db/pipeline/change_stream_filter_helpers.h"
diff --git a/src/mongo/db/pipeline/document_source_list_catalog.cpp b/src/mongo/db/pipeline/document_source_list_catalog.cpp
index 42b136616a6..9b32a8ee011 100644
--- a/src/mongo/db/pipeline/document_source_list_catalog.cpp
+++ b/src/mongo/db/pipeline/document_source_list_catalog.cpp
@@ -31,7 +31,7 @@
 
 #include <fmt/format.h>
 
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/process_interface/mongo_process_interface.h"
diff --git a/src/mongo/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp
index 1f8bff1b9d9..f1ad7a8cfb4 100644
--- a/src/mongo/db/pipeline/expression.cpp
+++ b/src/mongo/db/pipeline/expression.cpp
@@ -43,9 +43,9 @@
 #include "mongo/bson/bsontypes.h"
 #include "mongo/crypto/fle_crypto.h"
 #include "mongo/db/bson/dotted_path_support.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/exec/document_value/value.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/hasher.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pipeline/expression_context.h"
diff --git a/src/mongo/db/pipeline/window_function/window_function_expression.cpp b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
index fe6771ed05d..b7fefdb2fc2 100644
--- a/src/mongo/db/pipeline/window_function/window_function_expression.cpp
+++ b/src/mongo/db/pipeline/window_function/window_function_expression.cpp
@@ -29,7 +29,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/pipeline/accumulation_statement.h"
 #include "mongo/db/pipeline/document_source_add_fields.h"
 #include "mongo/db/pipeline/document_source_project.h"
diff --git a/src/mongo/db/process_health/SConscript b/src/mongo/db/process_health/SConscript
index d90819ef330..d30b66e619b 100644
--- a/src/mongo/db/process_health/SConscript
+++ b/src/mongo/db/process_health/SConscript
@@ -31,7 +31,7 @@ env.Library(
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/feature_flag',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/s/grid',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
     ],
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 548e73b0ba6..c3fd8626436 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -262,7 +262,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/pcre_wrapper',
     ],
 )
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index a54ce4a292f..54bb5718fa1 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -13,7 +13,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/client/read_preference',
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -76,7 +75,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/change_stream_change_collection_manager',
         '$BUILD_DIR/mongo/db/change_stream_pre_images_collection_manager',
         '$BUILD_DIR/mongo/db/change_stream_serverless_helpers',
-        '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
         '$BUILD_DIR/mongo/db/commands/txn_cmd_request',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/dbdirectclient',
@@ -89,6 +87,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/ops/write_ops',
         '$BUILD_DIR/mongo/db/pipeline/change_stream_preimage',
         '$BUILD_DIR/mongo/db/s/sharding_catalog',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/session/session_catalog_mongod',
         '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/stats/counters',
@@ -905,7 +904,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'repl_server_parameters',
         'split_horizon',
     ],
@@ -1245,8 +1243,8 @@ env.Library(
         'tenant_migration_access_blocker',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/session/session_catalog_mongod',
         '$BUILD_DIR/mongo/executor/scoped_task_executor',
         'repl_server_parameters',
@@ -1713,7 +1711,6 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
             '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
             '$BUILD_DIR/mongo/db/change_stream_pre_images_collection_manager',
-            '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
             '$BUILD_DIR/mongo/db/commands/mongod_fcv',
             '$BUILD_DIR/mongo/db/commands/txn_cmd_request',
             '$BUILD_DIR/mongo/db/dbdirectclient',
diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp
index 1a475ae4d62..361e6aabe1f 100644
--- a/src/mongo/db/repl/initial_syncer.cpp
+++ b/src/mongo/db/repl/initial_syncer.cpp
@@ -42,9 +42,9 @@
 #include "mongo/bson/util/bson_extract.h"
 #include "mongo/client/fetcher.h"
 #include "mongo/client/remote_command_retry_scheduler.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/commands/server_status_metric.h"
 #include "mongo/db/concurrency/d_concurrency.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/namespace_string.h"
diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp
index 7bc8da73f7a..e98b65b9d76 100644
--- a/src/mongo/db/repl/initial_syncer_test.cpp
+++ b/src/mongo/db/repl/initial_syncer_test.cpp
@@ -35,8 +35,8 @@
 #include <ostream>
 
 #include "mongo/db/client.h"
-#include "mongo/db/commands/feature_compatibility_version_document_gen.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
+#include "mongo/db/feature_compatibility_version_document_gen.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/index_builds_coordinator_mongod.h"
 #include "mongo/db/json.h"
 #include "mongo/db/namespace_string.h"
diff --git a/src/mongo/db/repl/oplog_applier_impl_test.cpp b/src/mongo/db/repl/oplog_applier_impl_test.cpp
index 842cca1bc65..8c658574ef0 100644
--- a/src/mongo/db/repl/oplog_applier_impl_test.cpp
+++ b/src/mongo/db/repl/oplog_applier_impl_test.cpp
@@ -43,11 +43,11 @@
 #include "mongo/db/catalog/document_validation.h"
 #include "mongo/db/change_stream_pre_images_collection_manager.h"
 #include "mongo/db/client.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/ops/write_ops.h"
 #include "mongo/db/pipeline/change_stream_preimage_gen.h"
diff --git a/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp b/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp
index a001755861f..55c295b5c3c 100644
--- a/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp
+++ b/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp
@@ -36,9 +36,9 @@
 #include "mongo/client/streamable_replica_set_monitor_for_testing.h"
 #include "mongo/config.h"
 #include "mongo/db/client.h"
-#include "mongo/db/commands/feature_compatibility_version_document_gen.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
+#include "mongo/db/feature_compatibility_version_document_gen.h"
 #include "mongo/db/op_observer/op_observer_impl.h"
 #include "mongo/db/op_observer/op_observer_registry.h"
 #include "mongo/db/op_observer/oplog_writer_impl.h"
diff --git a/src/mongo/db/repl/tenant_migration_state_machine.idl b/src/mongo/db/repl/tenant_migration_state_machine.idl
index 96e46bfb562..1fea8f61ceb 100644
--- a/src/mongo/db/repl/tenant_migration_state_machine.idl
+++ b/src/mongo/db/repl/tenant_migration_state_machine.idl
@@ -29,7 +29,7 @@ global:
     cpp_namespace: "mongo"
     cpp_includes:
         - "mongo/client/read_preference.h"
-        - "mongo/db/commands/feature_compatibility_version_parser.h"
+        - "mongo/db/feature_compatibility_version_parser.h"
         - "mongo/db/repl/tenant_migration_util.h"
 
 imports:
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp
index bd170413ab5..274ca03fdc5 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp
@@ -50,9 +50,9 @@
 #include "mongo/db/client.h"
 #include "mongo/db/commands/cluster_server_parameter_cmds_gen.h"
 #include "mongo/db/commands/feature_compatibility_version.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/commands/set_cluster_parameter_invocation.h"
 #include "mongo/db/commands/set_feature_compatibility_version_gen.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/persistent_task_store.h"
diff --git a/src/mongo/db/session/logical_session_id_helpers.cpp b/src/mongo/db/session/logical_session_id_helpers.cpp
index 553443e71d5..739c87f18bd 100644
--- a/src/mongo/db/session/logical_session_id_helpers.cpp
+++ b/src/mongo/db/session/logical_session_id_helpers.cpp
@@ -34,7 +34,7 @@
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/auth/user.h"
 #include "mongo/db/auth/user_name.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/session/logical_session_cache.h"
 
diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp
index 705732e93dc..3ef2619a94e 100644
--- a/src/mongo/db/startup_recovery.cpp
+++ b/src/mongo/db/startup_recovery.cpp
@@ -35,12 +35,12 @@
 #include "mongo/db/catalog/drop_collection.h"
 #include "mongo/db/catalog/multi_index_block.h"
 #include "mongo/db/commands/feature_compatibility_version.h"
-#include "mongo/db/commands/feature_compatibility_version_document_gen.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
 #include "mongo/db/concurrency/exception_util.h"
 #include "mongo/db/database_name.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbhelpers.h"
+#include "mongo/db/feature_compatibility_version_document_gen.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
 #include "mongo/db/index_builds_coordinator.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index a4378a89caf..c2705c91824 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -80,7 +80,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index d34e87bcc22..4d07e90204c 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -184,7 +184,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -197,7 +196,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/concurrency/ticketholder',
     ],
 )
diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript
index 18b64b990bf..7574d6f7048 100644
--- a/src/mongo/db/timeseries/SConscript
+++ b/src/mongo/db/timeseries/SConscript
@@ -15,7 +15,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/storage/storage_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/processinfo',
     ],
 )
@@ -53,7 +52,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/storage/storage_options',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/fail_point',
     ],
 )
diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript
index d0f2301cd21..9e02498ee18 100644
--- a/src/mongo/executor/SConscript
+++ b/src/mongo/executor/SConscript
@@ -14,8 +14,8 @@ env.Library(
         '$BUILD_DIR/mongo/util/net/network',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )
 
@@ -118,8 +118,8 @@ env.Library(
         'remote_command',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         'egress_tag_closer_manager',
     ],
 )
diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript
index 262afe7f42e..489dcc9ef56 100644
--- a/src/mongo/idl/SConscript
+++ b/src/mongo/idl/SConscript
@@ -22,7 +22,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        'feature_flag',
     ],
 )
 
@@ -92,35 +91,6 @@ env.CppUnitTest(
     ],
 )
 
-env.Command(
-    target=[
-        'feature_flag_test.idl',
-    ],
-    source=[
-        '#buildscripts/cheetah_source_generator.py',
-        'feature_flag_test.idl.tpl',
-        '$BUILD_DIR/mongo/util/version/releases.yml',
-    ],
-    action=[
-        '$PYTHON ${SOURCES[0]} -o ${TARGETS[0]} ${SOURCES[1]} ${SOURCES[2]} ${MONGO_VERSION}',
-    ],
-    # Ensure that that SCons is used to produce this file rather than Ninja, to avoid spurious
-    # dependency cycles due to how we manage generated sources with Ninja.
-    NINJA_TEMPLATE=True,
-)
-
-env.Library(
-    target='feature_flag',
-    source=[
-        'feature_flag.cpp',
-        'feature_flag_test.idl',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
-        '$BUILD_DIR/mongo/db/server_base',
-    ],
-)
-
 env.CppUnitTest(
     target='idl_test',
     source=[
@@ -141,11 +111,11 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authprivilege',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
         'cluster_server_parameter',
-        'feature_flag',
     ],
 )
diff --git a/src/mongo/idl/feature_flag_test.cpp b/src/mongo/idl/feature_flag_test.cpp
index 1b6be251604..c30b115b45c 100644
--- a/src/mongo/idl/feature_flag_test.cpp
+++ b/src/mongo/idl/feature_flag_test.cpp
@@ -30,7 +30,7 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/platform/basic.h"
 
-#include "mongo/idl/feature_flag_test_gen.h"
+#include "mongo/db/feature_flag_test_gen.h"
 #include "mongo/idl/server_parameter_test_util.h"
 #include "mongo/unittest/bson_test_util.h"
 #include "mongo/unittest/unittest.h"
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index d0faf09bea5..4493a22e02d 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -112,7 +112,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/commands/core',
         '$BUILD_DIR/mongo/db/commands/create_command',
         '$BUILD_DIR/mongo/db/commands/current_op_common',
-        '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
         '$BUILD_DIR/mongo/db/commands/kill_common',
         '$BUILD_DIR/mongo/db/commands/list_databases_command',
         '$BUILD_DIR/mongo/db/commands/map_reduce_parser',
diff --git a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
index d7d14a8711c..2f88401dc30 100644
--- a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
+++ b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
@@ -31,9 +31,9 @@
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
-#include "mongo/db/commands/feature_compatibility_version_documentation.h"
-#include "mongo/db/commands/feature_compatibility_version_parser.h"
 #include "mongo/db/commands/set_feature_compatibility_version_gen.h"
+#include "mongo/db/feature_compatibility_version_documentation.h"
+#include "mongo/db/feature_compatibility_version_parser.h"
 #include "mongo/s/client/shard.h"
 #include "mongo/s/client/shard_registry.h"
 #include "mongo/s/grid.h"
diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript
index 632e32347e0..29de1d74759 100644
--- a/src/mongo/transport/SConscript
+++ b/src/mongo/transport/SConscript
@@ -72,7 +72,6 @@ tlEnv.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/stats/counters',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/util/net/ssl_manager',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
         '$BUILD_DIR/third_party/shim_asio',
@@ -125,11 +124,11 @@ env.Library(
         '$BUILD_DIR/mongo/db/auth/authentication_restriction',
         '$BUILD_DIR/mongo/db/dbmessage',
         '$BUILD_DIR/mongo/db/query/command_request_response',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/stats/counters',
-        '$BUILD_DIR/mongo/idl/feature_flag',
         '$BUILD_DIR/mongo/rpc/message',
         '$BUILD_DIR/mongo/util/processinfo',
         'service_executor',
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index e0b0487dd49..f6bde5e39a9 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -237,7 +237,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/server_feature_flags',
         '$BUILD_DIR/mongo/db/server_options_core',
-        '$BUILD_DIR/mongo/idl/feature_flag',
     ],
 )