Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 2, 2025

What does this PR do?

This PR bumps up the github.com/go-viper/mapstructure/v2 module dependency to the latest available version.

Why is it important?

To keep our dependencies up to date.


This is an automatic backport of pull request #8764 done by [Mergify](https://mergify.com).

* Bump up github.com/go-viper/mapstructure/v2 dependency

* Update unit tests

* Update unit tests

(cherry picked from commit 676e18d)

# Conflicts:
#	NOTICE-fips.txt
#	go.mod
#	internal/pkg/otel/run_nofips_test.go
@mergify mergify bot requested a review from a team as a code owner July 2, 2025 17:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 2, 2025
@mergify mergify bot requested review from kaanyalti and pkoutsovasilis and removed request for a team July 2, 2025 17:46
@mergify
Copy link
Contributor Author

mergify bot commented Jul 2, 2025

Cherry-pick of 676e18d has failed:

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

You are currently cherry-picking commit 676e18de4.
  (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:
	modified:   NOTICE.txt
	modified:   go.sum
	modified:   pkg/component/component_test.go
	modified:   pkg/component/config_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   NOTICE-fips.txt
	both modified:   go.mod
	deleted by us:   internal/pkg/otel/run_nofips_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

@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

ycombinator
ycombinator previously approved these changes Jul 2, 2025
@elasticmachine
Copy link
Collaborator

⏳ Build in-progress, with failures

Failed CI Steps

History

cc @ycombinator

@ycombinator ycombinator enabled auto-merge (squash) July 2, 2025 19:43
@elastic-sonarqube
Copy link

@ycombinator ycombinator merged commit 33786a1 into 9.0 Jul 2, 2025
19 checks passed
@ycombinator ycombinator deleted the mergify/bp/9.0/pr-8764 branch July 2, 2025 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog 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.

3 participants