SERVER-68826 Move basic_types into server_base

10 files changed, 21 insertions, 25 deletions

diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 32fc6a3df7f..ab481424ac6 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -183,10 +183,10 @@ env.Library(
 env.Library(
     target='auth_options',
     source=[
-        "auth_options.idl",
+        'auth_options.idl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/server_parameter',
+        '$BUILD_DIR/mongo/db/server_base',
     ],
 )
 
@@ -310,19 +310,19 @@ env.Library(
         'authorization_manager_global.cpp',
         'authorization_manager_global_parameters.idl',
     ],
-    LIBDEPS_PRIVATE=[
-        "$BUILD_DIR/mongo/client/authentication",
-        '$BUILD_DIR/mongo/idl/server_parameter',
-        "$BUILD_DIR/mongo/util/net/ssl_manager",
-        "$BUILD_DIR/mongo/util/net/ssl_parameters_auth",
-        'cluster_auth_mode',
-        'security_key',
-    ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
         'auth',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/client/authentication',
+        '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/util/net/ssl_manager',
+        '$BUILD_DIR/mongo/util/net/ssl_parameters_auth',
+        'cluster_auth_mode',
+        'security_key',
+    ],
 )
 
 env.Library(
@@ -406,9 +406,8 @@ env.Library(
         'sasl_options.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/stats/counters',
-        '$BUILD_DIR/mongo/idl/server_parameter',
     ],
 )
 
@@ -480,12 +479,9 @@ env.Library(
         'user_cache_invalidator_job.cpp',
         'user_cache_invalidator_job_parameters.idl',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/multitenancy',
-        '$BUILD_DIR/mongo/idl/server_parameter',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/s/coreshard',
         'authservercommon',
     ],
diff --git a/src/mongo/db/auth/action_type.idl b/src/mongo/db/auth/action_type.idl
index 1a85e758508..dbc5fe12efb 100644
--- a/src/mongo/db/auth/action_type.idl
+++ b/src/mongo/db/auth/action_type.idl
@@ -36,7 +36,7 @@ global:
     cpp_namespace: "mongo"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 enums:
     ActionType:
diff --git a/src/mongo/db/auth/address_restriction.idl b/src/mongo/db/auth/address_restriction.idl
index 28ba12dd5f9..ff8aa07b486 100644
--- a/src/mongo/db/auth/address_restriction.idl
+++ b/src/mongo/db/auth/address_restriction.idl
@@ -36,7 +36,7 @@ global:
     - "mongo/db/auth/address_restriction.h"
 
 imports:
-  - "mongo/idl/basic_types.idl"
+  - "mongo/db/basic_types.idl"
 
 structs:
 
diff --git a/src/mongo/db/auth/auth_options.idl b/src/mongo/db/auth/auth_options.idl
index a0d5139938a..d1af197ff08 100644
--- a/src/mongo/db/auth/auth_options.idl
+++ b/src/mongo/db/auth/auth_options.idl
@@ -30,7 +30,7 @@ global:
   cpp_namespace: "mongo"
 
 imports:
-  - "mongo/idl/basic_types.idl"
+  - "mongo/db/basic_types.idl"
 
 server_parameters:
   roleGraphInvalidationIsFatal:
diff --git a/src/mongo/db/auth/auth_types.idl b/src/mongo/db/auth/auth_types.idl
index 3b55541a4da..032ec847055 100644
--- a/src/mongo/db/auth/auth_types.idl
+++ b/src/mongo/db/auth/auth_types.idl
@@ -35,7 +35,7 @@ global:
     - "mongo/db/auth/role_name_or_string.h"
 
 imports:
-  - "mongo/idl/basic_types.idl"
+  - "mongo/db/basic_types.idl"
 
 types:
   UserName:
diff --git a/src/mongo/db/auth/authorization_manager_impl_parameters.idl b/src/mongo/db/auth/authorization_manager_impl_parameters.idl
index 795c83f219d..353ea0cd0d0 100644
--- a/src/mongo/db/auth/authorization_manager_impl_parameters.idl
+++ b/src/mongo/db/auth/authorization_manager_impl_parameters.idl
@@ -31,7 +31,7 @@ global:
     - mongo/db/auth/authorization_manager_impl.h
 
 imports:
-  - mongo/idl/basic_types.idl
+  - mongo/db/basic_types.idl
 
 server_parameters:
   authorizationManagerCacheSize:
diff --git a/src/mongo/db/auth/sasl_commands.idl b/src/mongo/db/auth/sasl_commands.idl
index cf3ec89c23f..ede7543ac58 100644
--- a/src/mongo/db/auth/sasl_commands.idl
+++ b/src/mongo/db/auth/sasl_commands.idl
@@ -31,7 +31,7 @@ global:
     - "mongo/db/auth/sasl_payload.h"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 types:
     SaslPayload:
diff --git a/src/mongo/db/auth/security_token.idl b/src/mongo/db/auth/security_token.idl
index 62076ac8b31..133d67eb913 100644
--- a/src/mongo/db/auth/security_token.idl
+++ b/src/mongo/db/auth/security_token.idl
@@ -32,7 +32,7 @@ global:
 imports:
     - "mongo/db/auth/auth_types.idl"
     - "mongo/crypto/sha256_block.idl"
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 structs:
     SecurityToken:
diff --git a/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl b/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl
index 19a37d19d5f..89bcca29822 100644
--- a/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl
+++ b/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl
@@ -31,7 +31,7 @@ global:
     - "mongo/db/auth/user_cache_invalidator_job.h"
 
 imports:
-  - "mongo/idl/basic_types.idl"
+  - "mongo/db/basic_types.idl"
 
 server_parameters:
   userCacheInvalidationIntervalSecs:
diff --git a/src/mongo/db/auth/user_management_commands_parser.idl b/src/mongo/db/auth/user_management_commands_parser.idl
index 10ffb919d29..508700daa6d 100644
--- a/src/mongo/db/auth/user_management_commands_parser.idl
+++ b/src/mongo/db/auth/user_management_commands_parser.idl
@@ -32,7 +32,7 @@ global:
     - "mongo/db/auth/umc_info_command_arg.h"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
     - "mongo/db/auth/auth_types.idl"
 
 types: