Fix failed auto-cherry-pick: Confirm SAT-34783 fixes are already present#18867
Closed
Fix failed auto-cherry-pick: Confirm SAT-34783 fixes are already present#18867
Conversation
Collaborator
|
Can one of the admins verify this patch? |
Copilot
AI
changed the title
[WIP] [Failed-AutoCherryPick] - Fix apache id and keytab creating command for SAT-34783
Fix failed auto-cherry-pick: Confirm SAT-34783 fixes are already present
Jul 1, 2025
Member
|
Is the conclusion of Copilot correct, @lhellebr ? |
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR resolves the failed auto-cherry-pick issue for SAT-34783 by confirming that the required fixes are already present in both the master and 6.15.z branches.
Issue Analysis
The auto-cherry-pick workflow failed for PR #18639 not due to merge conflicts or missing functionality, but because the changes were already applied to the target branch (6.15.z).
Required Fixes for SAT-34783
The original issue required two critical fixes in the
enroll_ad_and_configure_external_authmethod:Apache ID extraction fix: Properly access stdout from execute command
Keytab command fix: Use correct Kerberos command
Verification Results
✅ Master branch (lines 2603 & 2637): Both fixes are present and correct
✅ 6.15.z branch (lines 2432 & 2466): Both fixes are present and correct
✅ Code syntax validation: Passes without errors
✅ Pattern verification: No old incorrect patterns found
Root Cause
The auto-cherry-pick failed because the changes were already present in the target branch, likely through:
Resolution
No code changes were required. The functionality is working correctly in both branches. This PR documents the analysis and confirms that the SAT-34783 fixes are properly implemented.
Fixes #18683.
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.