Skip to content

Backport of Ensure that SourceBundleParser always receives a relative path for the Source Directory into v1.14#38124

Merged
dbanck merged 7 commits intov1.14from
backport/stacks_validate_relative_path_fix/uniquely-clever-wren
Feb 5, 2026
Merged

Backport of Ensure that SourceBundleParser always receives a relative path for the Source Directory into v1.14#38124
dbanck merged 7 commits intov1.14from
backport/stacks_validate_relative_path_fix/uniquely-clever-wren

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Feb 4, 2026

Backport

This PR is auto-generated from #38071 to be assessed for backporting due to the inclusion of the label 1.14-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@aaabdelgany
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: unable to process merge commit: "587fc8e66b431a9b69a57a6500b1ea1dbb83dcaf", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


The source bundle parsing process relies on the output of sourcebundle#Bundle.LocalPathForSource to determine the source directory for a source bundle. This function can confusingly return both absolute and relative paths. It was previously assumed that this output would always be absolute -which led us to run into errors when trying to relativize an already relative path.

This PR corrects that by converting absolute paths to relative ones or leaving in the source directory as is if it's already relative.

Fixes #
#38025

Target Release

1.15.x

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

N/A

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

Overview of commits

@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Feb 4, 2026

Changelog Warning

Currently this PR would target a v1.15 release. Please add a changelog entry for in the .changes/v1.15 folder, or discuss which release you'd like to target with your reviewer. If you believe this change does not need a changelog entry, please add the 'no-changelog-needed' label.

@aaabdelgany aaabdelgany force-pushed the backport/stacks_validate_relative_path_fix/uniquely-clever-wren branch from 831194c to 6db9b6d Compare February 4, 2026 20:58
@aaabdelgany aaabdelgany marked this pull request as ready for review February 5, 2026 15:00
@aaabdelgany aaabdelgany requested a review from a team as a code owner February 5, 2026 15:00
Copy link
Copy Markdown
Member

@dbanck dbanck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dbanck dbanck enabled auto-merge (squash) February 5, 2026 15:03
@dbanck dbanck merged commit e168d93 into v1.14 Feb 5, 2026
14 of 15 checks passed
@dbanck dbanck deleted the backport/stacks_validate_relative_path_fix/uniquely-clever-wren branch February 5, 2026 15:06
@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Mar 8, 2026

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants