From a70dfae7b9d91dfbc57774c366d661a9c394ea8f Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Wed, 7 May 2025 08:40:07 +0300 Subject: [PATCH 1/2] chore: update go to 1.24.2 --- .ci/bump-golang.yml | 36 +++++++++++-------- .../1746596216-Update-to-go-1.24.2.yaml | 32 +++++++++++++++++ dev-tools/go.mod | 2 +- go.mod | 2 +- testing/go.mod | 2 +- 5 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 changelog/fragments/1746596216-Update-to-go-1.24.2.yaml diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml index 4a249f329f..26edb062fa 100644 --- a/.ci/bump-golang.yml +++ b/.ci/bump-golang.yml @@ -53,18 +53,6 @@ sources: kind: regex pattern: go1\.{{ source "minor" }}\.(\d*)$ - gomod: - dependson: - - latestGoVersion - name: Get version in go.mod format - kind: shell - transformers: - - findsubmatch: - pattern: '^(\d+.\d+).\d+' - captureindex: 1 - spec: - command: echo {{ source "latestGoVersion" }} - conditions: dockerTag: name: Is docker image golang:{{ source "latestGoVersion" }} published @@ -102,10 +90,28 @@ targets: matchpattern: '\d+.\d+.\d+' update-gomod: name: "Update go.mod" - sourceid: gomod + sourceid: latestGoVersion scmid: githubConfig kind: file spec: - content: 'go {{ source "gomod" }}' + content: 'go {{ source "latestGoVersion" }}' file: go.mod - matchpattern: 'go \d+.\d+' + matchpattern: 'go \d+.\d+.\d+' + update-testing-gomod: + name: "Update go.mod" + sourceid: latestGoVersion + scmid: githubConfig + kind: file + spec: + content: 'go {{ source "latestGoVersion" }}' + file: testing/go.mod + matchpattern: 'go \d+.\d+.\d+' + update-dev-tools-gomod: + name: "Update go.mod" + sourceid: latestGoVersion + scmid: githubConfig + kind: file + spec: + content: 'go {{ source "latestGoVersion" }}' + file: dev-tools/go.mod + matchpattern: 'go \d+.\d+.\d+' diff --git a/changelog/fragments/1746596216-Update-to-go-1.24.2.yaml b/changelog/fragments/1746596216-Update-to-go-1.24.2.yaml new file mode 100644 index 0000000000..bf1da84e2c --- /dev/null +++ b/changelog/fragments/1746596216-Update-to-go-1.24.2.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.24.2 + +# 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: + +# 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/4891 + +# 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 4c7efd91e1..14678e614f 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.0 +go 1.24.2 tool ( github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen diff --git a/go.mod b/go.mod index fdef642be8..4de4f6b4e4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/v7 -go 1.24.1 +go 1.24.2 require ( github.com/Pallinder/go-randomdata v1.2.0 diff --git a/testing/go.mod b/testing/go.mod index 4f9c612ea4..18eb2511a4 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/testing -go 1.24.1 +go 1.24.2 replace ( github.com/elastic/fleet-server/pkg/api => ../pkg/api From e9e89ae394567c14f9813110b4bedbf24e0e76ec Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 8 May 2025 12:21:57 +0300 Subject: [PATCH 2/2] chore: bump to go 1.24.3 --- .go-version | 2 +- .golangci.yml | 2 +- ...-to-go-1.24.2.yaml => 1746596216-Update-to-go-1.24.3.yaml} | 4 ++-- dev-tools/go.mod | 2 +- go.mod | 2 +- testing/go.mod | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename changelog/fragments/{1746596216-Update-to-go-1.24.2.yaml => 1746596216-Update-to-go-1.24.3.yaml} (96%) diff --git a/.go-version b/.go-version index e4a973f913..ae96cc7310 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.2 +1.24.3 diff --git a/.golangci.yml b/.golangci.yml index b58dc56c68..086f5a5780 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,7 @@ run: timeout: 1m build-tags: - integration - go: "1.24.2" + go: "1.24.3" issues: # Maximum count of issues with the same text. diff --git a/changelog/fragments/1746596216-Update-to-go-1.24.2.yaml b/changelog/fragments/1746596216-Update-to-go-1.24.3.yaml similarity index 96% rename from changelog/fragments/1746596216-Update-to-go-1.24.2.yaml rename to changelog/fragments/1746596216-Update-to-go-1.24.3.yaml index bf1da84e2c..2b122227ae 100644 --- a/changelog/fragments/1746596216-Update-to-go-1.24.2.yaml +++ b/changelog/fragments/1746596216-Update-to-go-1.24.3.yaml @@ -11,7 +11,7 @@ kind: enhancement # Change summary; a 80ish characters long description of the change. -summary: Update go to v1.24.2 +summary: Update go to v1.24.3 # Long description; in case the summary is not enough to describe the change # this field accommodate a description without length limits. @@ -19,7 +19,7 @@ summary: Update go to v1.24.2 #description: # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. -component: +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. diff --git a/dev-tools/go.mod b/dev-tools/go.mod index 14678e614f..cd5d866a3a 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.2 +go 1.24.3 tool ( github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen diff --git a/go.mod b/go.mod index 4de4f6b4e4..ff7cd975a4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/v7 -go 1.24.2 +go 1.24.3 require ( github.com/Pallinder/go-randomdata v1.2.0 diff --git a/testing/go.mod b/testing/go.mod index 18eb2511a4..48bd0c6b1a 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/testing -go 1.24.2 +go 1.24.3 replace ( github.com/elastic/fleet-server/pkg/api => ../pkg/api