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

[7.17](backport #40082) Update to Go 1.22.5 #40322

Merged
merged 12 commits into from
Jul 29, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2024

Proposed commit message

Update to the latest version of golang 1.22.5.

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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

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

* Update to go 1.22.4.

* Link to PR.

* Fix bad merge.

* Fix some regex.

* Fix config_test.go

* Comment out ping.

* Update to go 1.22.5.

* Un-comment code.

* Update go.mod.

* Add encrypt=false to mssql py test.

* Make CI happy

* Fix NOTICE.txt.

---------

Co-authored-by: subham sarkar <[email protected]>
Co-authored-by: Julien Lind <[email protected]>
(cherry picked from commit c0f8ae3)

# Conflicts:
#	auditbeat/module/file_integrity/config_test.go
#	dev-tools/mage/crossbuild.go
#	go.mod
#	libbeat/docs/version.asciidoc
#	libbeat/processors/actions/drop_fields_test.go
#	metricbeat/Dockerfile
@mergify mergify bot added the backport label Jul 23, 2024
@mergify mergify bot requested a review from a team as a code owner July 23, 2024 21:05
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 23, 2024
@mergify mergify bot requested review from a team as code owners July 23, 2024 21:05
@mergify mergify bot requested review from rdner and VihasMakwana and removed request for a team July 23, 2024 21:05
Copy link
Contributor Author

mergify bot commented Jul 23, 2024

Cherry-pick of c0f8ae3 has failed:

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

You are currently cherry-picking commit c0f8ae3b25.
  (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:   .go-version
	modified:   .golangci.yml
	modified:   CHANGELOG.next.asciidoc
	modified:   auditbeat/Dockerfile
	modified:   dev-tools/kubernetes/filebeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/heartbeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/metricbeat/Dockerfile.debug
	modified:   heartbeat/Dockerfile
	modified:   metricbeat/module/http/_meta/Dockerfile
	modified:   metricbeat/module/nats/_meta/Dockerfile
	modified:   metricbeat/module/vsphere/_meta/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/functionbeat/Dockerfile
	modified:   x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
	modified:   x-pack/metricbeat/module/mssql/docker-compose.yml
	modified:   x-pack/metricbeat/module/stan/_meta/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   auditbeat/module/file_integrity/config_test.go
	both modified:   dev-tools/mage/crossbuild.go
	both modified:   go.mod
	both modified:   libbeat/docs/version.asciidoc
	deleted by us:   libbeat/processors/actions/drop_fields_test.go
	both modified:   metricbeat/Dockerfile

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 23, 2024
@cmacknz cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 23, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 23, 2024
@blakerouse blakerouse enabled auto-merge (squash) July 24, 2024 20:14
@blakerouse blakerouse disabled auto-merge July 24, 2024 20:14
@blakerouse blakerouse enabled auto-merge (squash) July 24, 2024 20:14
@pierrehilbert
Copy link
Collaborator

Licences should be updated

Copy link
Contributor Author

mergify bot commented Jul 25, 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/7.17/pr-40082 upstream/mergify/bp/7.17/pr-40082
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-40082

@blakerouse blakerouse requested a review from a team as a code owner July 26, 2024 16:47
@blakerouse blakerouse requested review from faec and removed request for a team July 26, 2024 16:47
@blakerouse
Copy link
Contributor

Note clear why on my machine its different then CI:

My machine (no error):

>> check: Checking source code for common problems
blake@Blakes-MBP-3 filebeat % 

CI (error):

>> check: Checking source code for common problems
go: downloading github.com/coreos/go-systemd/v22 v22.3.2
go: downloading github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2
go: downloading gotest.tools v2.2.0+incompatible
go: downloading github.com/gorilla/websocket v1.4.2
Error: some files are not up-to-date. Run 'mage fmt update' then review and commit the changes. Modified: [filebeat/tests/system/test_autodiscover.py]

Copy link
Contributor Author

mergify bot commented Jul 29, 2024

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

@blakerouse
Copy link
Contributor

Fixes the weird change my mage check did on test_autodiscover.py. Hopefully it allows this PR to go green.

@blakerouse blakerouse merged commit 4944196 into 7.17 Jul 29, 2024
116 of 120 checks passed
@blakerouse blakerouse deleted the mergify/bp/7.17/pr-40082 branch July 29, 2024 14:58
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-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants