From bb9d84bcbe4be9cc07606e234cbe9b94cea348b7 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Fri, 8 Dec 2023 09:21:56 +0000 Subject: [PATCH 1/5] chore: Update .golangci.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .golangci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b3bcd8666a7..b0ff52496bf 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -116,7 +116,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.20.11" + go: "1.20.12" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -136,17 +136,17 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.11" + go: "1.20.12" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.11" + go: "1.20.12" checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.20.11" + go: "1.20.12" gosec: excludes: From 8c34cb896e6b9cedc3791dbf9168df860e073ed8 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Fri, 8 Dec 2023 09:22:02 +0000 Subject: [PATCH 2/5] chore: Update .go-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index 4bb1a22f8ec..3b9e4a0c187 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.11 +1.20.12 From ea28dbe6b675ddcba950493ab941190130d23d67 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Fri, 8 Dec 2023 09:22:09 +0000 Subject: [PATCH 3/5] chore: Update from dockerfiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- Dockerfile | 2 +- Dockerfile.skaffold | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f727a50317..450047803a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.20.12 FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index 96d0a1ea800..40ef12042a4 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.20.12 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" From a0388d8905a143e65032be652c356af3202598d3 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Fri, 8 Dec 2023 09:22:15 +0000 Subject: [PATCH 4/5] chore: Update version.asciidoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- version/docs/version.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc index f4443fa3f95..dc8ed764ac6 100644 --- a/version/docs/version.asciidoc +++ b/version/docs/version.asciidoc @@ -3,7 +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 -:go-version: 1.20.11 +:go-version: 1.20.12 :release-state: unreleased :python: 3.7 :docker: 1.12 From dfb7e07dc5b2b83276a9918b8f631e9d85de5bdf Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 8 Dec 2023 12:12:44 -0500 Subject: [PATCH 5/5] Add changelog. --- .../1702055473-Upgrade-to-Go-1.20.12.yaml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 changelog/fragments/1702055473-Upgrade-to-Go-1.20.12.yaml diff --git a/changelog/fragments/1702055473-Upgrade-to-Go-1.20.12.yaml b/changelog/fragments/1702055473-Upgrade-to-Go-1.20.12.yaml new file mode 100644 index 00000000000..826ce34b5ea --- /dev/null +++ b/changelog/fragments/1702055473-Upgrade-to-Go-1.20.12.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.20.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/3885 + +# 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