fix: also check the JIRA affects version when re-resolving without a fix version change

Co-authored-by: Isaac <no-reply@databricks.com>

Author: Yicong-Huang

dev/merge_spark_pr.py

@@ -1366,6 +1366,17 @@ def reconcile_jira_affects_versions(
     jira_ops.update_affects_versions(issue, new_names)
 
 
+def maybe_reconcile_jira_affects_versions(issue, fix_version_names, affects_available):
+    """Reconcile the Affects Version/s only when they fail to precede the fix version(s).
+
+    A thin gate over ``reconcile_jira_affects_versions`` so every resolve path -- fresh
+    merge, backport that adds a fix version, and a re-run that adds none -- can check the
+    invariant without repeating ``fix_precedes_affects``.
+    """
+    if fix_precedes_affects(fix_version_names, [v.name for v in issue.fields.versions]):
+        reconcile_jira_affects_versions(issue, fix_version_names, affects_available)
+
+
 def get_jira_issue(prompt, default_jira_id=""):
     jira_id = bold_input("%s [%s]: " % (prompt, default_jira_id))
     if jira_id == "":
@@ -1449,8 +1460,13 @@ def resolve_jira_issue(
         )
         if all_inferred_present:
             print(
-                "JIRA issue %s already contains all inferred fix versions; no update needed."
-                % issue.key
+                "JIRA issue %s already contains all inferred fix versions; no fix version "
+                "update needed." % issue.key
+            )
+            # Even when no fix version changes, the recorded Affects Version/s may still sit
+            # above them (e.g. a re-run of an issue whose affected version was never fixed).
+            maybe_reconcile_jira_affects_versions(
+                issue, existing_fix_version_names, affects_available
             )
             return
         if default_fix_list:
@@ -1494,11 +1510,9 @@ def resolve_jira_issue(
             print("Error setting fix version(s), try again (or leave blank and fix manually)")
 
     # On a fresh resolve, offer to update the Affects Version/s when they sit above the fix
-    # version(s) just chosen; the backport path above handles the already-resolved case.
-    if not is_resolved and fix_precedes_affects(
-        fix_versions, [v.name for v in issue.fields.versions]
-    ):
-        reconcile_jira_affects_versions(issue, fix_versions, affects_available)
+    # version(s) just chosen; the already-resolved paths handle their own cases.
+    if not is_resolved:
+        maybe_reconcile_jira_affects_versions(issue, fix_versions, affects_available)
 
     def get_version_json(version_str):
         return list(filter(lambda v: v.name == version_str, versions))[0].raw
@@ -1510,12 +1524,14 @@ def get_version_json(version_str):
         jira_fix_versions = [v for v in jira_fix_versions if v["name"] not in existing_names]
         if not jira_fix_versions:
             print("No new fix versions selected for JIRA issue %s; no update needed." % issue.key)
+            maybe_reconcile_jira_affects_versions(
+                issue, existing_fix_version_names, affects_available
+            )
             return
         # A backport adds an earlier fix line, which usually means that line is affected too;
         # offer to extend the Affects Version/s down when they miss the full fix set.
         full_fix_names = existing_fix_version_names + [v["name"] for v in jira_fix_versions]
-        if fix_precedes_affects(full_fix_names, [v.name for v in issue.fields.versions]):
-            reconcile_jira_affects_versions(issue, full_fix_names, affects_available)
+        maybe_reconcile_jira_affects_versions(issue, full_fix_names, affects_available)
         jira_ops.add_fix_versions(issue, existing_fix_versions, jira_fix_versions)
         return