PSMDB-1266 Repair dynamic linkage

src/mongo/db/SConscript

@@ -18,9 +18,6 @@ env.InjectThirdParty(libraries=[
     's2',
 ])
 
-if has_option('audit'):
-    env.SConscript(dirs='audit', exports='env')
-
 env.SConscript(
     dirs=[
         'auth',
@@ -308,6 +305,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/util/options_parser/options_parser',
     ],
 )
 
@@ -702,15 +700,55 @@ env.Library(
     ],
 )
 
-env.Clone().InjectModule("enterprise").Library(
-    target="audit",
-    source=[
-        "audit.cpp",
-    ],
-    LIBDEPS=[
-        "$BUILD_DIR/mongo/base",
-    ],
-)
+audit_libdeps = [
+    '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
+    '$BUILD_DIR/mongo/db/query_expressions',
+    '$BUILD_DIR/mongo/db/server_base',
+    '$BUILD_DIR/mongo/util/background_job',
+]
+if has_option('audit'):
+    # The Percona's `audit` library is intended to be a drop-in replacement of
+    # the upstream `audit` (please @see the `else` branch). Hense, it has to
+    # have the same filepath and set of dependencies as the upstream `audit`
+    # has. That's why the Percona's `audit` library is built here rather than in
+    # the `src/mongo/db/audit` directory.
+    env.Library(
+        target='audit',
+        source=[
+            'audit.cpp',
+            'audit/audit_flusher.cpp',
+            'audit/audit_options.cpp',
+            'audit/audit.cpp',
+            'audit/audit_parameters.idl',
+            'audit/audit_options.idl',
+        ],
+        LIBDEPS=audit_libdeps,
+    )
+    # Please note that the `commands` library (@see below) depends on
+    # the `audit` library and the `audit_commands` depends on `commands`.
+    #
+    # Since the Percona's `audit` library is built in this file, it is natural
+    # to build `audit_commands` here as well rather than in
+    # the `src/mongo/db/audit` directory.
+    env.Library(
+        target='audit_commands',
+        source=[
+            'audit/audit_commands.cpp',
+        ],
+        LIBDEPS_PRIVATE=[
+            '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
+            'audit',
+            'commands'
+        ],
+    )
+else:
+    env.Clone().InjectModule("enterprise").Library(
+        target="audit",
+        source=[
+            "audit.cpp",
+        ],
+        LIBDEPS=audit_libdeps,
+    )
 
 env.Library(
     target='client_out_of_line_executor',
@@ -2273,6 +2311,7 @@ env.Library(
         '$BUILD_DIR/mongo/util/version_impl',
         '$BUILD_DIR/mongo/watchdog/watchdog_mongod',
         '$BUILD_DIR/third_party/shim_snappy',
+        'audit_commands' if has_option('audit') else [],
         'auth/auth_op_observer',
         'auth/authmongod',
         'bson/dotted_path_support',

src/mongo/db/auth/external/SConscript

@@ -1,5 +1,6 @@
 # -*- mode: python -*-
 Import("env")
+Import("get_option")
 
 env = env.Clone()
 
@@ -14,8 +15,16 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/saslauth',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/client/sasl_aws_common' if get_option('ssl') == 'on' else [],
+        '$BUILD_DIR/mongo/db/ldap/ldapmanager',
+        '$BUILD_DIR/mongo/db/ldap_options',
+        '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/util/net/http_client',
+    ],
     SYSLIBDEPS=[
         'gssapi_krb5',
+        'ldap',
         'sasl2',
     ],
 )

src/mongo/db/backup/SConscript

@@ -9,7 +9,11 @@ env.Library(
     source=[
         'backup_commands.cpp',
     ],
-    LIBDEPS=[
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
+        '$BUILD_DIR/mongo/db/auth/auth',
+        '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/storage/storage_options',
     ],
 )

src/mongo/db/encryption/SConscript

@@ -16,7 +16,8 @@ env.Library(
         '$BUILD_DIR/mongo/db/encryption/encryption_kmip',
         '$BUILD_DIR/mongo/db/encryption/encryption_options',
         '$BUILD_DIR/mongo/db/encryption/encryption_vault',
-        '$BUILD_DIR/mongo/util/secure_zero_memory'
+        '$BUILD_DIR/mongo/util/secure_zero_memory',
+        'secret_string'
     ],
 )
 
@@ -49,7 +50,9 @@ env.Library(
         'winhttp' if env.TargetOSIs('windows') else 'curl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/encryption/secret_string'
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/encryption/secret_string',
+        'encryption_options'
     ],
 )
 
@@ -71,7 +74,9 @@ env.Library(
     source=[
         'encryption_kmip.cpp',
     ],
-    LIBDEPS=[
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/third_party/shim_kmippp',
+        'encryption_options'
     ],
 )

src/mongo/db/ldap/SConscript

@@ -9,6 +9,11 @@ env.Library(
         'ldap_manager.cpp',
         'ldap_manager_impl.cpp',
         ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/ldap_options',
+        '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/util/background_job',
+    ],
     SYSLIBDEPS=[
         'ldap',
         'lber',

src/mongo/db/pipeline/SConscript

@@ -240,7 +240,10 @@ env.Library(
         'document_source_backup_cursor.cpp',
         'document_source_backup_cursor_extend.cpp',
     ],
-    LIBDEPS=[],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/server_base',
+        'pipeline',
+    ],
 )
 
 env.Library(

src/mongo/db/storage/SConscript

@@ -394,6 +394,7 @@ env.Library(
     LIBDEPS=[],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/encryption/encryption_options',
         '$BUILD_DIR/mongo/db/encryption/key',
         '$BUILD_DIR/mongo/db/service_context',
         'storage_change_lock',

src/mongo/db/storage/inmemory/SConscript

@@ -17,8 +17,9 @@ if inmemory:
             'inmemory_options_init.cpp',
             'inmemory_global_options.idl',
             ],
-        LIBDEPS=[
-            '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger_core',
+        LIBDEPS_PRIVATE=[
+            '$BUILD_DIR/mongo/db/storage/storage_engine_common',
+            '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger',
             ],
         )
 

src/mongo/db/storage/wiredtiger/SConscript

@@ -15,6 +15,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/encryption/encryption_options',
         '$BUILD_DIR/mongo/db/service_context',
     ],
 )
@@ -29,6 +30,7 @@ wtEnv.InjectThirdParty(libraries=['valgrind'])
 wtEnv.Library(
     target='storage_wiredtiger_core',
     source=[
+        'encryption_extension.c',
         'encryption_keydb.cpp',
         'oplog_truncate_markers_server_status_section.cpp',
         'wiredtiger_backup_cursor_hooks.cpp',
@@ -111,6 +113,7 @@ wtEnv.Library(
         'aws-c-event-stream',
         'aws-c-common',
         'aws-checksums',
+        'curl',
     ],
 )
 

src/third_party/wiredtiger/ext/encryptors/percona/encryption_extension.c → src/mongo/db/storage/wiredtiger/encryption_extension.c

@@ -43,7 +43,7 @@ Copyright (C) 2018-present Percona and/or its affiliates. All rights reserved.
 #include <wiredtiger.h>
 #include <wiredtiger_ext.h>
 
-#include "encryption_keydb_c_api.h"
+#include "mongo/db/storage/wiredtiger/encryption_keydb_c_api.h"
 
 #define KEY_LEN 32
 #define GCM_TAG_LEN 16

src/mongo/db/storage/wiredtiger/encryption_keydb.cpp

@@ -34,13 +34,12 @@ Copyright (C) 2018-present Percona and/or its affiliates. All rights reserved.
 
 #include <cstring>  // memcpy
 
+#include "mongo/db/storage/wiredtiger/encryption_keydb_c_api.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_util.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/debug_util.h"
 
-#include <third_party/wiredtiger/ext/encryptors/percona/encryption_keydb_c_api.h>
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage
 
 

src/mongo/db/storage/wiredtiger/wiredtiger_data_protector.cpp

@@ -35,11 +35,10 @@ Copyright (C) 2018-present Percona and/or its affiliates. All rights reserved.
 #include <openssl/err.h>
 
 #include "mongo/base/status.h"
+#include "mongo/db/storage/wiredtiger/encryption_keydb_c_api.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_data_protector.h"
 #include "mongo/logv2/log.h"
 
-#include <third_party/wiredtiger/ext/encryptors/percona/encryption_keydb_c_api.h>
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage
 
 

src/mongo/db/storage/wiredtiger/wiredtiger_encryption_hooks.cpp

@@ -37,12 +37,11 @@ Copyright (C) 2018-present Percona and/or its affiliates. All rights reserved.
 #include <wiredtiger.h>
 
 #include "mongo/db/encryption/encryption_options.h"
+#include "mongo/db/storage/wiredtiger/encryption_keydb_c_api.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_data_protector.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_encryption_hooks.h"
 #include "mongo/logv2/log.h"
 
-#include <third_party/wiredtiger/ext/encryptors/percona/encryption_keydb_c_api.h>
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage
 
 

src/mongo/embedded/SConscript

@@ -4,6 +4,7 @@ import re
 
 Import("env")
 Import("get_option")
+Import("has_option")
 Import("wiredtiger")
 
 env = env.Clone()
@@ -78,6 +79,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/audit',
+        '$BUILD_DIR/mongo/db/audit_commands' if has_option('audit') else [],
         '$BUILD_DIR/mongo/db/auth/auth',
         '$BUILD_DIR/mongo/db/catalog/catalog_impl',
         '$BUILD_DIR/mongo/db/catalog/database_holder',

src/mongo/s/SConscript

@@ -3,6 +3,7 @@
 Import([
     "env",
     "get_option",
+    "has_option",
     "version_extra",
     "version_parts",
 ])
@@ -458,6 +459,7 @@ env.Library(
         # NOTE: If you need to add a static or mongo initializer to mongos startup,
         # please add that library here, as a private library dependency.
         '$BUILD_DIR/mongo/db/audit',
+        '$BUILD_DIR/mongo/db/audit_commands' if has_option('audit') else [],
         '$BUILD_DIR/mongo/db/auth/authmongos',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/commands/server_status_servers',
@@ -535,6 +537,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/change_streams_cluster_parameter',
         '$BUILD_DIR/mongo/db/commands/rwc_defaults_commands',
         '$BUILD_DIR/mongo/db/ftdc/ftdc_mongos',
+        '$BUILD_DIR/mongo/db/ldap/ldapmanager',
         '$BUILD_DIR/mongo/db/process_health/fault_manager',
         '$BUILD_DIR/mongo/db/read_write_concern_defaults',
         '$BUILD_DIR/mongo/db/serverinit',

src/mongo/shell/SConscript

@@ -268,6 +268,7 @@ if not has_option('noshell') and jsEngine:
             # please add that library here, as a private library dependency.
             "$BUILD_DIR/mongo/client/clientdriver_network",
             "$BUILD_DIR/mongo/client/connection_string",
+            "$BUILD_DIR/mongo/db/audit_commands" if has_option('audit') else '',
             "$BUILD_DIR/mongo/db/catalog/index_key_validate",
             "$BUILD_DIR/mongo/db/mongohasher",
             "$BUILD_DIR/mongo/db/pipeline/change_stream_error_extra_info",

src/third_party/SConscript

@@ -619,10 +619,11 @@ if wiredtiger:
         ])
     else:
         wiredtigerEnv = wiredtigerEnv.Clone()
-        wiredtigerEnv.InjectThirdParty(libraries=['wiredtiger'])
+        wiredtigerEnv.InjectThirdParty(libraries=['wiredtiger', 'wiredtiger_checksum'])
         wiredtigerEnv.SConscript('wiredtiger/SConscript', exports={'env': wiredtigerEnv})
         wiredtigerEnv = wiredtigerEnv.Clone(LIBDEPS_INTERFACE=[
             'wiredtiger/wiredtiger',
+            'wiredtiger/wiredtiger_checksum',
         ])
 
     wiredtigerEnv.ShimLibrary(name="wiredtiger")

src/third_party/wiredtiger/SConscript

@@ -202,9 +202,6 @@ with open(File(filelistfile).srcnode().abspath) as filelist:
 with open(File(filelistfile).srcnode().abspath) as filelist:
     cssources = list(filtered_filelist(filelist, True))
 
-# unconditionally add Percona encryption extension
-wtsources.append("ext/encryptors/percona/encryption_extension.c")
-
 if useZlib:
     env.Append(CPPDEFINES=['HAVE_BUILTIN_EXTENSION_ZLIB'])
     wtsources.append("ext/compressors/zlib/zlib_compress.c")