SERVER-29626 Remove code to upconvert and downconvert AuditMetadata

3 files changed, 4 insertions, 55 deletions

diff --git a/src/mongo/rpc/metadata.cpp b/src/mongo/rpc/metadata.cpp
index 7b35b2c7821..bf3aab6c8e4 100644
--- a/src/mongo/rpc/metadata.cpp
+++ b/src/mongo/rpc/metadata.cpp
@@ -149,14 +149,8 @@ CommandAndMetadata upconvertRequestMetadata(BSONObj legacyCmdObj, int queryFlags
         ReadPreferenceSetting(ReadPreference::SecondaryPreferred).toContainingBSON(&metadataBob);
     }
 
-    // Ordering is important here - AuditMetadata::upconvert() expects the above up-conversion to
-    // already be done.
-    BSONObjBuilder auditCommandBob;
-    uassertStatusOK(
-        AuditMetadata::upconvert(legacyCmdObj, queryFlags, &auditCommandBob, &metadataBob));
-
     BSONObjBuilder logicalTimeCommandBob;
-    for (auto elem : auditCommandBob.done()) {
+    for (auto elem : legacyCmdObj) {
         if (elem.fieldNameStringData() == LogicalTimeMetadata::fieldName()) {
             metadataBob.append(elem);
         } else {
@@ -169,19 +163,13 @@ CommandAndMetadata upconvertRequestMetadata(BSONObj legacyCmdObj, int queryFlags
 
 LegacyCommandAndFlags downconvertRequestMetadata(BSONObj cmdObj, BSONObj metadata) {
     int legacyQueryFlags = 0;
-    BSONObjBuilder logicalTimeCommandBob;
-    logicalTimeCommandBob.appendElements(cmdObj);
     if (auto logicalTime = metadata[LogicalTimeMetadata::fieldName()]) {
+        BSONObjBuilder logicalTimeCommandBob;
+        logicalTimeCommandBob.appendElements(cmdObj);
         logicalTimeCommandBob.append(logicalTime);
+        cmdObj = logicalTimeCommandBob.obj();
     }
 
-    // Ordering is important here - AuditingMetadata must be downconverted before ReadPreference.
-    BSONObjBuilder auditCommandBob;
-    uassertStatusOK(AuditMetadata::downconvert(
-        logicalTimeCommandBob.done(), metadata, &auditCommandBob, &legacyQueryFlags));
-
-    cmdObj = auditCommandBob.obj();
-
     auto readPref = metadata["$readPreference"];
     if (!readPref)
         readPref = cmdObj["$readPreference"];
diff --git a/src/mongo/rpc/metadata/audit_metadata.cpp b/src/mongo/rpc/metadata/audit_metadata.cpp
index 147e983321b..1dacabd7dc4 100644
--- a/src/mongo/rpc/metadata/audit_metadata.cpp
+++ b/src/mongo/rpc/metadata/audit_metadata.cpp
@@ -60,22 +60,6 @@ Status AuditMetadata::writeToMetadata(BSONObjBuilder*) const {
     return Status::OK();
 }
 
-Status AuditMetadata::downconvert(const BSONObj& command,
-                                  const BSONObj&,
-                                  BSONObjBuilder* commandBob,
-                                  int*) {
-    commandBob->appendElements(command);
-    return Status::OK();
-}
-
-Status AuditMetadata::upconvert(const BSONObj& command,
-                                const int,
-                                BSONObjBuilder* commandBob,
-                                BSONObjBuilder*) {
-    commandBob->appendElements(command);
-    return Status::OK();
-}
-
 #endif
 
 const boost::optional<AuditMetadata::UsersAndRoles>& AuditMetadata::getImpersonatedUsersAndRoles()
@@ -83,8 +67,5 @@ const boost::optional<AuditMetadata::UsersAndRoles>& AuditMetadata::getImpersona
     return _impersonatedUsersAndRoles;
 }
 
-const char kLegacyImpersonatedUsersFieldName[] = "impersonatedUsers";
-const char kLegacyImpersonatedRolesFieldName[] = "impersonatedRoles";
-
 }  // namespace rpc
 }  // namespace mongo
diff --git a/src/mongo/rpc/metadata/audit_metadata.h b/src/mongo/rpc/metadata/audit_metadata.h
index b7519d3cbd7..0724001d97c 100644
--- a/src/mongo/rpc/metadata/audit_metadata.h
+++ b/src/mongo/rpc/metadata/audit_metadata.h
@@ -65,16 +65,6 @@ public:
 
     Status writeToMetadata(BSONObjBuilder* metadataBob) const;
 
-    static Status downconvert(const BSONObj& command,
-                              const BSONObj& metadata,
-                              BSONObjBuilder* legacyCommandBob,
-                              int* legacyQueryFlags);
-
-    static Status upconvert(const BSONObj& legacyCommand,
-                            const int legacyQueryFlags,
-                            BSONObjBuilder* commandBob,
-                            BSONObjBuilder* metadataBob);
-
     using UsersAndRoles = std::tuple<std::vector<UserName>, std::vector<RoleName>>;
 
     const boost::optional<UsersAndRoles>& getImpersonatedUsersAndRoles() const;
@@ -89,15 +79,5 @@ private:
     boost::optional<UsersAndRoles> _impersonatedUsersAndRoles;
 };
 
-/**
- * The legacy field name used to hold impersonated users.
- */
-extern const char kLegacyImpersonatedUsersFieldName[];
-
-/**
- * The legacy field name used to hold impersonated roles.
- */
-extern const char kLegacyImpersonatedRolesFieldName[];
-
 }  // namespace rpc
 }  // namespace mongo