Skip to content

[9.4](backport #6955) OpAMP redact slice maps#7008

Open
mergify[bot] wants to merge 1 commit into
9.4from
mergify/bp/9.4/pr-6955
Open

[9.4](backport #6955) OpAMP redact slice maps#7008
mergify[bot] wants to merge 1 commit into
9.4from
mergify/bp/9.4/pr-6955

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 11, 2026

What is the problem this PR solves?

Redact slice maps with the form:

- name: Authorization
  value: secretValue

How does this PR solve the problem?

Use the shared redact package in elastic-agent-libs

How to test this PR locally

Enroll an opamp agent with sensitive values in the headers slices.

Design Checklist

  • I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.
  • I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.
  • I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.

Checklist

  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool

Related issues

* OpAMP redact slice maps

Redact slice maps with the form:
- name: Authorization
  value: secretValue

* update testing go.mod

* Update notice

* Fix test

(cherry picked from commit 4d84c65)

# Conflicts:
#	internal/pkg/api/handleOpAMP.go
#	internal/pkg/api/handleOpAMP_test.go
@mergify mergify Bot requested a review from a team as a code owner May 11, 2026 21:39
@mergify mergify Bot added the backport label May 11, 2026
@mergify mergify Bot requested a review from blakerouse May 11, 2026 21:39
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label May 11, 2026
@mergify mergify Bot requested a review from michel-laterman May 11, 2026 21:39
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 11, 2026

Cherry-pick of 4d84c65 has failed:

On branch mergify/bp/9.4/pr-6955
Your branch is up to date with 'origin/9.4'.

You are currently cherry-picking commit 4d84c65.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1777917457-OpAMP-redact-sensitive-values-in-header-maps.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/api/handleOpAMP.go
	both modified:   internal/pkg/api/handleOpAMP_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions Bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels May 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug Something isn't working conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant