diff --git a/.go-version b/.go-version index 8407e26008..d905a6d1d6 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.7 +1.25.1 diff --git a/.golangci.yml b/.golangci.yml index 79a5435c4d..7e6232d7d1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,7 @@ run: timeout: 1m build-tags: - integration - go: "1.24.7" + go: "1.25.1" issues: # Maximum count of issues with the same text. diff --git a/changelog/fragments/1758819869-bump-golang-1.25.1.yaml b/changelog/fragments/1758819869-bump-golang-1.25.1.yaml new file mode 100644 index 0000000000..9d7955c853 --- /dev/null +++ b/changelog/fragments/1758819869-bump-golang-1.25.1.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: enhancement + +# Change summary; a 80ish characters long description of the change. +summary: Update Go to v1.25.1 + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: fleet-server + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/fleet-server/pull/5562 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 diff --git a/dev-tools/go.mod b/dev-tools/go.mod index 31d66003bc..1a81c1e55e 100644 --- a/dev-tools/go.mod +++ b/dev-tools/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/dev-tools -go 1.24.7 +go 1.25.1 tool ( github.com/elastic/go-json-schema-generate/cmd/schema-generate diff --git a/go.mod b/go.mod index f11d90bdae..a5dde3280b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/v7 -go 1.24.7 +go 1.25.1 require ( github.com/Pallinder/go-randomdata v1.2.0 diff --git a/testing/e2e/agent_container_test.go b/testing/e2e/agent_container_test.go index 67e744d235..f91a55edae 100644 --- a/testing/e2e/agent_container_test.go +++ b/testing/e2e/agent_container_test.go @@ -89,7 +89,7 @@ func (suite *AgentContainerSuite) TearDownTest() { // It checks the status API on the fleet-server's external port and that the agent listed in Kibana states "online" // Tests that enroll another agent explicitly need fleet-server to be online func (suite *AgentContainerSuite) FleetIsHealthy(bCtx context.Context, endpoint string) { - ctx, cancel := context.WithTimeout(bCtx, 4*time.Minute) + ctx, cancel := context.WithTimeout(bCtx, 5*time.Minute) defer cancel() suite.FleetServerStatusOK(ctx, endpoint) diff --git a/testing/go.mod b/testing/go.mod index ff64f70409..bd147e5523 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/testing -go 1.24.7 +go 1.25.1 replace ( github.com/elastic/fleet-server/pkg/api => ../pkg/api