From 16c48c5d855b85f911118d8cb87fb5c4d54ec816 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:02:56 -0400 Subject: [PATCH 1/5] [Automation] Bump Golang version to 1.21.9 (#38727) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * Add changelog. * Update Go mod patch version. * Automatically bump golang patch version. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie (cherry picked from commit b08df788fb8f1db16d5dc235a09e488461fda216) # Conflicts: # go.mod # libbeat/docs/version.asciidoc # metricbeat/Dockerfile --- .ci/bump-golang.yml | 2 +- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- go.mod | 4 ++++ heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 6 ++++++ metricbeat/Dockerfile | 5 +++++ metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 18 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml index 8e23c2679c01..2957acd62236 100644 --- a/.ci/bump-golang.yml +++ b/.ci/bump-golang.yml @@ -92,7 +92,7 @@ targets: spec: content: 'go {{ source "gomod" }}' file: go.mod - matchpattern: 'go \d+.\d+' + matchpattern: 'go \d+.\d+.\d+' update-go-version: name: "Update .go-version" sourceid: latestGoVersion diff --git a/.go-version b/.go-version index 428abfd24fbe..f124bfa15544 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.8 +1.21.9 diff --git a/.golangci.yml b/.golangci.yml index 4fd7b93f1b19..ae0ddaf03944 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -114,7 +114,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -132,19 +132,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.21.8" + go: "1.21.9" gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 4ecb1a9827db..168aa5828cdc 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -102,6 +102,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Beats will now connect to older Elasticsearch instances by default {pull}36884[36884] - Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments - elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843] +- Update to Go 1.21.9. {pulk}38727[38727] *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 982680c7f630..f04ddebe8488 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.8 +FROM golang:1.21.9 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index b46b2a73cc29..ba6e39d9f419 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.8 as builder +FROM golang:1.21.9 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index e1e9dddabacf..44aa0dc1eced 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.8 as builder +FROM golang:1.21.9 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 0b81f3635d9d..bda15a5708a6 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.8 as builder +FROM golang:1.21.9 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index f6d8d3d9cb5b..5b1394345461 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,10 @@ module github.com/elastic/beats/v7 +<<<<<<< HEAD go 1.21 +======= +go 1.21.9 +>>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) require ( cloud.google.com/go/bigquery v1.55.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 7fc0102259c3..4d7d45237da3 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.8 +FROM golang:1.21.9 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 9ec8c9420144..b0a8ec46e1fa 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,12 @@ +<<<<<<< HEAD :stack-version: 8.13.1 :doc-branch: 8.13 :go-version: 1.21.8 +======= +:stack-version: 8.14.0 +:doc-branch: main +:go-version: 1.21.9 +>>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index b6da04173167..f315210aeafb 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,9 @@ +<<<<<<< HEAD FROM golang:1.21.8 +======= +FROM golang:1.21.9 +COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ +>>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) RUN \ apt update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index e855e12fe030..00c6518bf4ce 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.8 +FROM golang:1.21.9 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 8d06be18187d..6459dc6bf6a8 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -FROM golang:1.21.8 AS build-env +FROM golang:1.21.9 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/nats.go.git /nats-go RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index a5268391f732..62e7a752fbf7 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.21.8 +FROM golang:1.21.9 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index e565e21af41d..686f97b947f4 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.8 +FROM golang:1.21.9 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 810dd6a9cf16..f97bf89cb7e0 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.8 +FROM golang:1.21.9 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 14cf1ba28317..2f5b44963d3f 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -FROM golang:1.21.8 AS build-env +FROM golang:1.21.9 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/stan.go.git /stan-go RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . From 6d4512e65579c44d2b56924d39f564cd8e3ac64e Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Sun, 7 Apr 2024 14:15:54 +0200 Subject: [PATCH 2/5] Update go.mod --- go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 5b1394345461..c165a2c81f2f 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,6 @@ module github.com/elastic/beats/v7 -<<<<<<< HEAD -go 1.21 -======= go 1.21.9 ->>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) require ( cloud.google.com/go/bigquery v1.55.0 From 89f5afd33cf08003a9e90662722445baf861999f Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Sun, 7 Apr 2024 14:16:20 +0200 Subject: [PATCH 3/5] Update version.asciidoc --- libbeat/docs/version.asciidoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index b0a8ec46e1fa..5d3c348c6177 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,12 +1,7 @@ <<<<<<< HEAD :stack-version: 8.13.1 :doc-branch: 8.13 -:go-version: 1.21.8 -======= -:stack-version: 8.14.0 -:doc-branch: main :go-version: 1.21.9 ->>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) :release-state: unreleased :python: 3.7 :docker: 1.12 From e355bce98bc72f5e3fea3b2ccc492415379ccea6 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Sun, 7 Apr 2024 14:16:34 +0200 Subject: [PATCH 4/5] Update version.asciidoc --- libbeat/docs/version.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 5d3c348c6177..6bf345a5437f 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,4 +1,3 @@ -<<<<<<< HEAD :stack-version: 8.13.1 :doc-branch: 8.13 :go-version: 1.21.9 From 5909d3062601586b1264df803b88d1535f337a20 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Sun, 7 Apr 2024 14:17:21 +0200 Subject: [PATCH 5/5] Update Dockerfile --- metricbeat/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index f315210aeafb..119956077699 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,9 +1,5 @@ -<<<<<<< HEAD -FROM golang:1.21.8 -======= FROM golang:1.21.9 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ ->>>>>>> b08df788fb ([Automation] Bump Golang version to 1.21.9 (#38727)) RUN \ apt update \