Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport PRs] Adds preset contentRegistry for IngestProcessors #3281 #3316

Open
2 of 6 tasks
brianf-aws opened this issue Dec 31, 2024 · 1 comment
Open
2 of 6 tasks
Labels
bug Something isn't working untriaged

Comments

@brianf-aws
Copy link
Contributor

brianf-aws commented Dec 31, 2024

Following a code commit (#3281) these are the following Backport PRs that need to be fixed. They stem from code divergence from using HTTPHeaders that previous branches are unfamiliar with.

  • The backport to 2.x : [REVIEWED] backport/backport-3281-to-2.x

  • The backport to 2.18: [REVIEWED] backport/backport-3281-to-2.18

  • The backport to 2.17: [TBA] backport/backport-3281-to-2.17

  • The backport to 2.15 : [TBA] backport/backport-3281-to-2.15

  • The backport to 2.16: [TBA] backport/backport-3281-to-2.16

Next Steps:

  • [] Investigate how we can avoid tedious backports like these
    • Different branches have different implementations of spotless apply. e.g main will add new lines for a method with many arguments, while 2.x will flatten it to one line
    • Dependencies are different such as HTTPHeaders not being supported.
  • Clean up local repo for these backports
git worktree remove .worktrees/backport-2.x && git worktree remove .worktrees/backport-2.18
  • Consider future steps we can take to make this less tedious
    - In the backport conflict message add a apply spotless to reduce a commit to the backport PR
@pyek-bot
Copy link
Contributor

I would suggest fixing it for 2.18 and then adding backport labels for that fix itself, maybe that will reduce some manual effort and repeat that if you have to fix another conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working untriaged
Projects
None yet
Development

No branches or pull requests

2 participants