[mrodm]

Proposed commit message

[Backport] Add backport-aws-6.x entry for aws package

Add a new entry in `.backports.yml` for the `aws` package backport branch
`backport-aws-6.x`, based on version 6.21.0 (commit 913b779a20).

This branch is active (`archived: false`) and configured to strip all
other packages (`remove_other_packages: true`), consistent with other
aws backport entries.

Author's Checklist

• base_version matches the package version at the point the branch diverged from main.
• base_commit is the exact commit SHA (or short SHA) on main that the branch is based on.
• maintained_until is set to the date until which this branch will receive backports, or null if indefinite.
• archived: false — branch is active and should receive backports.
• remove_other_packages: true — only the aws package is kept on the branch.

How to test this PR locally

No local testing required. CI will validate the .backports.yml entry (inventory check) and dry-run the backport branch creation. After merge, the backport-aws-6.x branch will be created automatically by CI.

Related issues

---

This PR was generated with the assistance of Claude (claude-sonnet-4-6).

[mrodm]

New entry to create backport-aws-6.x branch.

The base commit and base version fields should be updated accordingly before merging this PR once the PR #19828 in charge of the major and spec bump is merged. This is needed in case there is some other PR merged in the meantime updating the versioning for the aws package.

@andrewkroh should we set some maintained_until date ? It could be left as null for now and updated later if needed.

[andrewkroh]

Let's set it to 2027-01-16 (one day after the 8.x end-of-maintainence date from https://www.elastic.co/support/eol).

[mrodm]

Ok, updated in 6a052c0

That would mean that starting on 2027-01-16 this branch would not be part of the suggested backport branches in the automation that I'm working on (to create backport branches automatically).

[andrewkroh]

Can't come soon enough 😂

[mrodm]

@andrewkroh Setting remove_other_packages with value true here.

This means that this backport branch will be intended just for the aws package. All the other packages will be removed in this backport branch, and other packages will require new backport branches.

[infra-vault-gh-plugin-prod]

💚 Build Succeeded

• Buildkite Build
• Commit: 6a052c0

History

• 💚 Build #45989 succeeded ad6ec35

cc @mrodm

[andrewkroh]

913b779 is the right commit. LGTM. Thanks 🚢

[mrodm]

@andrewkroh There are some changes that were merged in main branch without doing a release bump:

• Bump patch version for each packages affected by Agentless renaming #20182

And there is now a PR to bump that version because of that: #20182 At the moment of writing that PR does not contain changes for aws package.

Should we create the backport branch in any case based in that branch ?
If so, is it needed to update the backport branch with those doc changes ? Who is going to apply that change in the backport branch?

[mergify]

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

• Queue this pull request

[teresaromero]

👍🏻 lets wait until above comment from @mrodm is resolved though

[andrewkroh]

Should we create the backport branch in any case based in that branch ?

Yes. Let's create backport-aws-6.x from the configured base (6.21.0, 913b779). #19756 landed after that commit, so it's outside the branch base and doesn't block creation.

If so, is it needed to update the backport branch with those doc changes ? Who is going to apply that change in the backport branch?

The branch doesn't need the "Elastic Managed" rename to be cut. The rename is a cosmetic docs change. If we later want the wording consistent on 6.x, that's a small follow-up PR against the branch with a 6.21.1 bump, and I can do that.

On aws not being in #20182, I think that's correct. aws was already bumped to 7.0.0 in #19828, which regenerated the docs and captured the rename, so it doesn't need the retroactive patch bump that the other packages do.

[elastic-vault-github-plugin-prod]

✅ Backport branch backport-aws-6.x created successfully for package aws 6.21.0.

Buildkite build