From 53d230938d071dbf6ecd81c83b4686ed201d5d5d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:21:42 -0500 Subject: [PATCH 1/2] [Automation] Bump Golang version to 1.22.12 (#6700) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update .go-version Made with ❤️️ by updatecli * Add changelog. * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update go.mod version Made with ❤️️ by updatecli * chore: Update from dockerfiles Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * Update changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie (cherry picked from commit a29af648901e3025eee6bccb45b321c83775d227) # Conflicts: # .golangci.yml # Dockerfile # Dockerfile.skaffold # go.mod # version/docs/version.asciidoc --- .go-version | 2 +- .golangci.yml | 16 ++++++++++ Dockerfile | 4 +++ Dockerfile.skaffold | 4 +++ .../1738617834-Upgrade-to-Go-1.22.11..yaml | 32 +++++++++++++++++++ go.mod | 4 +++ version/docs/version.asciidoc | 4 +++ 7 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml diff --git a/.go-version b/.go-version index f5ae945712e..2560439f071 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.10 +1.22.12 diff --git a/.golangci.yml b/.golangci.yml index bcfef9a3d8f..4ce27f1fd91 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -130,7 +130,11 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.10" +======= + go: "1.22.12" +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) nolintlint: # Enable to ensure that nolint directives are all used. Default is true. @@ -146,17 +150,29 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.10" +======= + go: "1.22.12" +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.10" +======= + go: "1.22.12" +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.10" +======= + go: "1.22.12" +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) gosec: excludes: diff --git a/Dockerfile b/Dockerfile index 5aa38597904..b54dbb18201 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD ARG GO_VERSION=1.22.10 +======= +ARG GO_VERSION=1.22.12 +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index 54c55718b6c..2d066421b8f 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,8 @@ +<<<<<<< HEAD ARG GO_VERSION=1.22.10 +======= +ARG GO_VERSION=1.22.12 +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild" ARG AGENT_VERSION=8.9.0-SNAPSHOT ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent" diff --git a/changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml b/changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml new file mode 100644 index 00000000000..526ce6230e6 --- /dev/null +++ b/changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..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: security + +# Change summary; a 80ish characters long description of the change. +summary: Upgrade to Go 1.22.12. + +# 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: "elastic-agent" + +# 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/elastic-agent/pull/6700 + +# 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/go.mod b/go.mod index f79d5ed34c9..cb224168d07 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,10 @@ module github.com/elastic/elastic-agent +<<<<<<< HEAD go 1.22.10 +======= +go 1.22.12 +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) require ( github.com/Jeffail/gabs/v2 v2.6.0 diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc index 5f46c27bd9a..63d7a77b99d 100644 --- a/version/docs/version.asciidoc +++ b/version/docs/version.asciidoc @@ -3,7 +3,11 @@ // FIXME: once elastic.co docs have been switched over to use `main`, remove // the `doc-site-branch` line below as well as any references to it in the code. :doc-site-branch: master +<<<<<<< HEAD :go-version: 1.22.10 +======= +:go-version: 1.22.12 +>>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) :release-state: unreleased :python: 3.7 :docker: 1.12 From f29fe1b00727275751117f9d06c88ace420ffe81 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 12 Feb 2025 17:56:20 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- .golangci.yml | 16 ---------------- Dockerfile | 4 ---- Dockerfile.skaffold | 4 ---- go.mod | 4 ---- version/docs/version.asciidoc | 4 ---- 5 files changed, 32 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 4ce27f1fd91..bf7d733c141 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -130,11 +130,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.10" -======= go: "1.22.12" ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) nolintlint: # Enable to ensure that nolint directives are all used. Default is true. @@ -150,29 +146,17 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.10" -======= go: "1.22.12" ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.10" -======= go: "1.22.12" ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.10" -======= go: "1.22.12" ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) gosec: excludes: diff --git a/Dockerfile b/Dockerfile index b54dbb18201..d14b635a4dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -ARG GO_VERSION=1.22.10 -======= ARG GO_VERSION=1.22.12 ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index 2d066421b8f..240406c9c06 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,8 +1,4 @@ -<<<<<<< HEAD -ARG GO_VERSION=1.22.10 -======= ARG GO_VERSION=1.22.12 ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild" ARG AGENT_VERSION=8.9.0-SNAPSHOT ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent" diff --git a/go.mod b/go.mod index cb224168d07..13b77a23101 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,6 @@ module github.com/elastic/elastic-agent -<<<<<<< HEAD -go 1.22.10 -======= go 1.22.12 ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) require ( github.com/Jeffail/gabs/v2 v2.6.0 diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc index 63d7a77b99d..c85ec7ac9c8 100644 --- a/version/docs/version.asciidoc +++ b/version/docs/version.asciidoc @@ -3,11 +3,7 @@ // FIXME: once elastic.co docs have been switched over to use `main`, remove // the `doc-site-branch` line below as well as any references to it in the code. :doc-site-branch: master -<<<<<<< HEAD -:go-version: 1.22.10 -======= :go-version: 1.22.12 ->>>>>>> a29af6489 ([Automation] Bump Golang version to 1.22.12 (#6700)) :release-state: unreleased :python: 3.7 :docker: 1.12