fix: [CI-8053]: remove uuid

Author: devkimittal

953-yaml-commons/src/main/java/io/harness/pms/yaml/YamlUtils.java

@@ -718,14 +718,19 @@ private boolean checkIfSiblingHasDefaultValue(FQN currentNodeFqn, Map<FQN, Objec
 
   private void removeUuidInObject(JsonNode node) {
     ObjectNode objectNode = (ObjectNode) node;
+    List<String> removalKeyList = new ArrayList<>();
     for (Iterator<Entry<String, JsonNode>> it = objectNode.fields(); it.hasNext();) {
       Entry<String, JsonNode> field = it.next();
       if (field.getKey().equals(YamlNode.UUID_FIELD_NAME)) {
-        objectNode.remove(field.getKey());
+        removalKeyList.add(field.getKey());
       } else {
         removeUuid(field.getValue());
       }
     }
+
+    for (String key : removalKeyList) {
+      objectNode.remove(key);
+    }
   }
 
   private void removeUuidInArray(JsonNode node) {

953-yaml-commons/src/test/java/io/harness/pms/yaml/YamlUtilsTest.java

@@ -10,6 +10,7 @@
 import static io.harness.annotations.dev.HarnessTeam.PIPELINE;
 import static io.harness.rule.OwnerRule.ARCHIT;
 import static io.harness.rule.OwnerRule.BRIJESH;
+import static io.harness.rule.OwnerRule.DEV_MITTAL;
 import static io.harness.rule.OwnerRule.PRASHANTSHARMA;
 import static io.harness.rule.OwnerRule.SAHIL;
 
@@ -24,7 +25,9 @@
 import io.harness.rule.Owner;
 import io.harness.rule.OwnerRule;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.api.client.util.Charsets;
 import com.google.common.io.Resources;
 import java.io.IOException;
@@ -878,4 +881,24 @@ public void testDuplicateField() {
     assertThatCode(() -> YamlUtils.readTree(valid, true)).doesNotThrowAnyException();
     assertThatCode(() -> YamlUtils.readTree(valid)).doesNotThrowAnyException();
   }
+
+  @Test
+  @Owner(developers = DEV_MITTAL)
+  @Category(UnitTests.class)
+  public void testRemoveUuid() {
+    ObjectMapper mapper = new ObjectMapper();
+    ObjectNode stepElementConfig = mapper.createObjectNode();
+
+    stepElementConfig.put("a", "a");
+    stepElementConfig.put("b", "b");
+    stepElementConfig.put("c", "c");
+    YamlUtils.removeUuid(stepElementConfig);
+
+    stepElementConfig.put(YamlNode.UUID_FIELD_NAME, "d");
+    YamlUtils.removeUuid(stepElementConfig);
+
+    stepElementConfig.put(YamlNode.UUID_FIELD_NAME, "d");
+    stepElementConfig.put("e", "e");
+    YamlUtils.removeUuid(stepElementConfig);
+  }
 }