From 289c2a3a923ee1cb9ab4cded9089e1d37d1e8cd2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:59:06 -0700 Subject: [PATCH 1/2] [Automation] Bump Golang version to 1.24.5 (#5122) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit fd465bf5ebc741e6fcf947c4eddd478574a59340) # Conflicts: # dev-tools/go.mod --- .go-version | 2 +- .golangci.yml | 2 +- dev-tools/go.mod | 44 ++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- testing/go.mod | 2 +- 5 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 dev-tools/go.mod diff --git a/.go-version b/.go-version index 2f4320f67f..6521720b41 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.4 +1.24.5 diff --git a/.golangci.yml b/.golangci.yml index 3bde69e9bc..c078648a5a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,7 @@ run: timeout: 1m build-tags: - integration - go: "1.24.4" + go: "1.24.5" issues: # Maximum count of issues with the same text. diff --git a/dev-tools/go.mod b/dev-tools/go.mod new file mode 100644 index 0000000000..85cb5fd2b7 --- /dev/null +++ b/dev-tools/go.mod @@ -0,0 +1,44 @@ +module github.com/elastic/fleet-server/dev-tools + +go 1.24.5 + +tool ( + github.com/elastic/go-json-schema-generate/cmd/schema-generate + github.com/elastic/go-licenser + github.com/jstemmer/go-junit-report + github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen + go.elastic.co/go-licence-detector + golang.org/x/perf/cmd/benchstat + golang.org/x/tools/cmd/goimports +) + +require ( + github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect + github.com/cyphar/filepath-securejoin v0.2.5 // indirect + github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect + github.com/elastic/go-json-schema-generate v0.0.0-20220323152209-ec19b88f6b5e // indirect + github.com/elastic/go-licenser v0.4.2 // indirect + github.com/getkin/kin-openapi v0.131.0 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/jstemmer/go-junit-report v1.0.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect + github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect + github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect + github.com/perimeterx/marshmallow v1.1.5 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect + github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect + go.elastic.co/go-licence-detector v0.7.0 // indirect + golang.org/x/mod v0.24.0 // indirect + golang.org/x/perf v0.0.0-20250305200902-02a15fd477ba // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/text v0.23.0 // indirect + golang.org/x/tools v0.33.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.mod b/go.mod index 960bf2de00..24d8100903 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/v7 -go 1.24.4 +go 1.24.5 require ( github.com/Pallinder/go-randomdata v1.2.0 diff --git a/testing/go.mod b/testing/go.mod index add316b39b..031092ab2f 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/fleet-server/testing -go 1.24.4 +go 1.24.5 replace ( github.com/elastic/fleet-server/pkg/api => ../pkg/api From 585cd40c5903610063d567e0f9cf24ff2f5e684f Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 9 Jul 2025 16:23:05 -0700 Subject: [PATCH 2/2] Remove file that doesn't exist on this branch --- dev-tools/go.mod | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 dev-tools/go.mod diff --git a/dev-tools/go.mod b/dev-tools/go.mod deleted file mode 100644 index 85cb5fd2b7..0000000000 --- a/dev-tools/go.mod +++ /dev/null @@ -1,44 +0,0 @@ -module github.com/elastic/fleet-server/dev-tools - -go 1.24.5 - -tool ( - github.com/elastic/go-json-schema-generate/cmd/schema-generate - github.com/elastic/go-licenser - github.com/jstemmer/go-junit-report - github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen - go.elastic.co/go-licence-detector - golang.org/x/perf/cmd/benchstat - golang.org/x/tools/cmd/goimports -) - -require ( - github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect - github.com/cyphar/filepath-securejoin v0.2.5 // indirect - github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect - github.com/elastic/go-json-schema-generate v0.0.0-20220323152209-ec19b88f6b5e // indirect - github.com/elastic/go-licenser v0.4.2 // indirect - github.com/getkin/kin-openapi v0.131.0 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect - github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/jstemmer/go-junit-report v1.0.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect - github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect - github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect - github.com/perimeterx/marshmallow v1.1.5 // indirect - github.com/sergi/go-diff v1.1.0 // indirect - github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect - github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect - go.elastic.co/go-licence-detector v0.7.0 // indirect - golang.org/x/mod v0.24.0 // indirect - golang.org/x/perf v0.0.0-20250305200902-02a15fd477ba // indirect - golang.org/x/sync v0.14.0 // indirect - golang.org/x/text v0.23.0 // indirect - golang.org/x/tools v0.33.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -)