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

[8.15](backport #5120) refactor: bump github.com/gofrs/uuid to current major version #5249

Merged
merged 6 commits into from
Aug 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2024

depends on: #5250
depends on: #5255

What does this PR do?

bump github.com/gofrs/uuid to current major version
replace google/uuid usage with gofrs/uuid/v5

Why is it important?

standardize on one uuid library and use it consistently across the codebase
use current supported version

Checklist

  • My code follows the style guidelines of this project
  • 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
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

* refactor: bump github.com/gofrs/uuid to current major version

consistently use one uuid library

* lint: run go mod tidy

(cherry picked from commit 10d8e04)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	pkg/component/runtime/manager.go
@mergify mergify bot requested a review from a team as a code owner August 2, 2024 10:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 2, 2024
@mergify mergify bot requested review from blakerouse and michel-laterman and removed request for a team August 2, 2024 10:45
Copy link
Contributor Author

mergify bot commented Aug 2, 2024

Cherry-pick of 10d8e04 has failed:

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

You are currently cherry-picking commit 10d8e04725.
  (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:   .golangci.yml
	modified:   go.sum
	modified:   internal/pkg/agent/application/info/agent_id.go
	modified:   pkg/component/runtime/manager_fake_input_test.go
	modified:   pkg/component/runtime/runtime_comm.go
	modified:   pkg/testing/tools/estools/elasticsearch.go
	modified:   pkg/testing/tools/fleettools/fleet.go
	modified:   testing/fleetservertest/server.go
	modified:   testing/integration/agent_long_running_leak_test.go
	modified:   testing/integration/beats_serverless_test.go
	modified:   testing/integration/container_cmd_test.go
	modified:   testing/integration/delay_enroll_test.go
	modified:   testing/integration/endpoint_security_test.go
	modified:   testing/integration/endpoint_test_tools.go
	modified:   testing/integration/event_logging_test.go
	modified:   testing/integration/fleetserver_test.go
	modified:   testing/integration/log_level_test.go
	modified:   testing/integration/logs_ingestion_test.go
	modified:   testing/integration/metrics_monitoring_test.go
	modified:   testing/integration/monitoring_endpoint_test.go
	modified:   testing/integration/monitoring_probe_preserve_text_cfg_test.go
	modified:   testing/integration/monitoring_probe_reload_test.go
	modified:   testing/integration/proxy_url_test.go
	modified:   testing/integration/upgrade_fleet_test.go
	modified:   testing/proxytest/proxytest.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   pkg/component/runtime/manager.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

Copy link
Contributor Author

mergify bot commented Aug 5, 2024

This pull request has not been merged yet. Could you please review and merge it @kruskall? 🙏

Copy link
Contributor Author

mergify bot commented Aug 5, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.15/pr-5120 upstream/mergify/bp/8.15/pr-5120
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-5120

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Aug 6, 2024
@elasticmachine
Copy link
Contributor

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

Copy link

@michalpristas michalpristas merged commit 22dcdfd into 8.15 Aug 8, 2024
14 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.15/pr-5120 branch August 8, 2024 08:53
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 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.

4 participants