Skip to content

Commit 584938d

Browse files
author
Jacob Mages-Haskins
committed
AIML-150 Update resetting the Issue as well.
1 parent 06d272b commit 584938d

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/git_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ def find_issue_with_label(label: str) -> int:
625625
return None
626626

627627

628-
def reset_issue(issue_number: int, remediation_label: str) -> bool:
628+
def reset_issue(issue_number: int, issue_title: str, remediation_label: str) -> bool:
629629
"""
630630
Resets a GitHub issue by:
631631
1. Removing all existing labels that start with "smartfix-id:"
@@ -650,7 +650,7 @@ def reset_issue(issue_number: int, remediation_label: str) -> bool:
650650
return False
651651

652652
# First check if there's an open PR for this issue
653-
open_pr = find_open_pr_for_issue(issue_number)
653+
open_pr = find_open_pr_for_issue(issue_number, issue_title)
654654
if open_pr:
655655
pr_number = open_pr.get("number")
656656
pr_url = open_pr.get("url")

src/github/external_coding_agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def generate_fixes(self, vuln_uuid: str, remediation_id: str, vuln_title: str, i
183183
error_exit(remediation_id, FailureCategory.AGENT_FAILURE.value)
184184
else:
185185
debug_log(f"Found existing GitHub issue #{issue_number} with label {vulnerability_label}")
186-
if not git_handler.reset_issue(issue_number, remediation_label):
186+
if not git_handler.reset_issue(issue_number, issue_title, remediation_label):
187187
log(f"Failed to reset issue #{issue_number} with labels {vulnerability_label}, {remediation_label}", is_error=True)
188188
error_exit(remediation_id, FailureCategory.AGENT_FAILURE.value)
189189
is_existing_issue = True

test/test_external_coding_agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def test_generate_fixes_with_existing_issue(self, mock_log, mock_debug_log, mock
254254
mock_debug_log.assert_any_call("Found existing GitHub issue #42 with label contrast-vuln-id:VULN-1234-FAKE-ABCD")
255255

256256
# Verify reset_issue was called
257-
mock_reset_issue.assert_called_once_with(42, "smartfix-id:1REM-FAKE-ABCD")
257+
mock_reset_issue.assert_called_once_with(42, "Fake Vulnerability Title", "smartfix-id:1REM-FAKE-ABCD")
258258

259259
@patch('src.git_handler.check_issues_enabled')
260260
@patch('src.git_handler.find_issue_with_label')

test/test_git_handler.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def test_reset_issue_success(self, mock_config, mock_debug_log, mock_log, mock_e
248248
_ = get_config(testing=True)
249249

250250
# Execute
251-
result = git_handler.reset_issue(issue_number, remediation_label)
251+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
252252

253253
# Assert
254254
mock_check_issues.assert_called_once()
@@ -275,7 +275,7 @@ def test_reset_issue_failure(self, mock_log, mock_run_command, mock_find_pr, moc
275275
_ = get_config(testing=True)
276276

277277
# Execute
278-
result = git_handler.reset_issue(issue_number, remediation_label)
278+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
279279

280280
# Assert
281281
mock_check_issues.assert_called_once()
@@ -302,10 +302,10 @@ def test_reset_issue_with_open_pr(self, mock_log, mock_find_open_pr):
302302
_ = get_config(testing=True)
303303

304304
# Execute
305-
result = git_handler.reset_issue(issue_number, remediation_label)
305+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
306306

307307
# Assert
308-
mock_find_open_pr.assert_called_once_with(issue_number)
308+
mock_find_open_pr.assert_called_once_with(issue_number, "Test Issue Title")
309309
self.assertFalse(result)
310310
mock_log.assert_any_call(
311311
"Cannot reset issue #42 because it has an open PR #123: https://github.com/mock/repo/pull/123",
@@ -347,7 +347,7 @@ def test_reset_issue_claude_code(self, mock_config, mock_debug_log, mock_log, mo
347347
mock_ensure_label.return_value = True
348348

349349
# Execute
350-
result = git_handler.reset_issue(issue_number, remediation_label)
350+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
351351

352352
# Assert
353353
mock_check_issues.assert_called_once()
@@ -407,7 +407,7 @@ def test_reset_issue_claude_code_error(self, mock_config, mock_log, mock_ensure_
407407
mock_ensure_label.return_value = True
408408

409409
# Execute
410-
result = git_handler.reset_issue(issue_number, remediation_label)
410+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
411411

412412
# Assert
413413
mock_check_issues.assert_called_once()
@@ -941,7 +941,7 @@ def test_reset_issue_issues_disabled(self, mock_log, mock_find_open_pr, mock_che
941941
_ = get_config(testing=True)
942942

943943
# Execute
944-
result = git_handler.reset_issue(issue_number, remediation_label)
944+
result = git_handler.reset_issue(issue_number, "Test Issue Title", remediation_label)
945945

946946
# Assert
947947
self.assertFalse(result)

0 commit comments

Comments
 (0)