[engsys] ci: Fix tox_harness.py dropping package extras when rewriting dev_requirements.txt (Azure#32864)

* ci: Don't drop extras when rewriting dev_requirements.txt
* fix: Preserve log that shows original and modified dev-requirements

Author: kdestin

scripts/devops_tasks/tox_harness.py

@@ -116,20 +116,23 @@ def replace_dev_reqs(file, pkg_root):
     adjusted_req_lines = []
 
     with open(file, "r") as f:
-        for line in f:
-            args = [part.strip() for part in line.split() if part and not part.strip() == "-e"]
-            amended_line = " ".join(args)
+        original_req_lines = list(line.strip() for line in f)
 
-            if amended_line.endswith("]"):
-                trim_amount = amended_line[::-1].index("[") + 1
-                amended_line = amended_line[0 : (len(amended_line) - trim_amount)]
+    for line in original_req_lines:
+        args = [part.strip() for part in line.split() if part and not part.strip() == "-e"]
+        amended_line = " ".join(args)
+        extras = ""
 
-            adjusted_req_lines.append(amended_line)
+        if amended_line.endswith("]"):
+            amended_line, extras = amended_line.rsplit("[", maxsplit=1)
+            if extras:
+                extras = f"[{extras}"
+
+        adjusted_req_lines.append(f"{build_whl_for_req(amended_line, pkg_root)}{extras}")
 
     req_file_name = os.path.basename(file)
-    logging.info("Old {0}:{1}".format(req_file_name, adjusted_req_lines))
+    logging.info("Old {0}:{1}".format(req_file_name, original_req_lines))
 
-    adjusted_req_lines = list(map(lambda x: build_whl_for_req(x, pkg_root), adjusted_req_lines))
     logging.info("New {0}:{1}".format(req_file_name, adjusted_req_lines))
 
     with open(file, "w") as f: