SERVER-54436 Refactor validateResult method from cluster_create_indexes to use checkIsErrorStatus

1 files changed, 26 insertions, 16 deletions

diff --git a/src/mongo/s/commands/cluster_collection_mod_cmd.cpp b/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
index c8ee99af54d..0d895756b91 100644
--- a/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
+++ b/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
@@ -117,26 +117,36 @@ public:
 
     void validateResult(const BSONObj& resultObj) final {
         auto ctx = IDLParserErrorContext("CollModReply");
+        if (checkIsErrorStatus(resultObj, ctx)) {
+            return;
+        }
+
         StringDataSet ignorableFields({kWriteConcernErrorFieldName,
                                        ErrorReply::kOkFieldName,
                                        kTopologyVersionFieldName,
                                        kRawFieldName});
-        if (!checkIsErrorStatus(resultObj, ctx)) {
-            auto reply = Reply::parse(ctx, resultObj.removeFields(ignorableFields));
-            coll_mod_reply_validation::validateReply(reply);
-
-            if (resultObj.hasField(kRawFieldName)) {
-                const auto& rawData = resultObj[kRawFieldName];
-                if (ctx.checkAndAssertType(rawData, Object)) {
-                    for (const auto& element : rawData.Obj()) {
-                        const auto& shardReply = element.Obj();
-                        if (!checkIsErrorStatus(shardReply, ctx)) {
-                            auto reply =
-                                Reply::parse(ctx, shardReply.removeFields(ignorableFields));
-                            coll_mod_reply_validation::validateReply(reply);
-                        }
-                    }
-                }
+        auto reply = Reply::parse(ctx, resultObj.removeFields(ignorableFields));
+        coll_mod_reply_validation::validateReply(reply);
+
+        if (!resultObj.hasField(kRawFieldName)) {
+            return;
+        }
+
+        const auto& rawData = resultObj[kRawFieldName];
+        if (!ctx.checkAndAssertType(rawData, Object)) {
+            return;
+        }
+
+        auto rawCtx = IDLParserErrorContext(kRawFieldName, &ctx);
+        for (const auto& element : rawData.Obj()) {
+            if (!rawCtx.checkAndAssertType(element, Object)) {
+                return;
+            }
+
+            const auto& shardReply = element.Obj();
+            if (!checkIsErrorStatus(shardReply, ctx)) {
+                auto reply = Reply::parse(ctx, shardReply.removeFields(ignorableFields));
+                coll_mod_reply_validation::validateReply(reply);
             }
         }
     }