From cca35e8dd1c25852fa69f442562f9ef945dc6c88 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Mon, 7 Jun 2021 12:54:51 -0700 Subject: [PATCH 1/6] Update go version to 1.16.5 --- .go-version | 2 +- CHANGELOG-developer.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- filebeat/Dockerfile | 2 +- heartbeat/Dockerfile | 2 +- journalbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/elastic-agent/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- 14 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.go-version b/.go-version index a23207367c3..0d92a10285c 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.16.4 +1.16.5 diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 7b2491c72ee..4dd953361fd 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -116,3 +116,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Update Go version to 1.15.12. {pull}25629[25629] - Update Go version to 1.16.4. {issue}25346[25346] {pull}25671[25671] - Add sorting to array fields for generated data files (*-generated.json) {pull}25320[25320] +- Update Go version to 1.16.5. {issue}26182[26182] diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 309403e784e..657afaa62b5 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 2d5bbdef1ba..ce08a772265 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 03ff6ad9793..4684c21e8e1 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile index 29d60fe1dc4..8185be4c28f 100644 --- a/journalbeat/Dockerfile +++ b/journalbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index 49cc104dada..e1d532843b9 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index e0e026cddf2..42e6e20127b 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 8.0.0 :doc-branch: master -:go-version: 1.16.4 +:go-version: 1.16.5 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index acc0d31e16c..063efa1cc90 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 08b11ac5898..650c1c7c062 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 COPY test/main.go main.go diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index e22c5b5b9fd..528d4f25e5f 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/x-pack/elastic-agent/Dockerfile b/x-pack/elastic-agent/Dockerfile index c3e8e98e69a..807cbd2ead3 100644 --- a/x-pack/elastic-agent/Dockerfile +++ b/x-pack/elastic-agent/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.16.4 +ARG GO_VERSION=1.16.5 FROM circleci/golang:${GO_VERSION} diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 99943388b53..fbdfc5736d1 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile index 72f27c1dd4c..bf894365b73 100644 --- a/x-pack/libbeat/Dockerfile +++ b/x-pack/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 +FROM golang:1.16.5 RUN \ apt-get update \ From f6d268dade0cb97d2e3ede2bab0bb60fcaaf7d88 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 8 Jun 2021 09:10:32 -0700 Subject: [PATCH 2/6] Add pr to changelog --- CHANGELOG-developer.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 4dd953361fd..b8c99528712 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -116,4 +116,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Update Go version to 1.15.12. {pull}25629[25629] - Update Go version to 1.16.4. {issue}25346[25346] {pull}25671[25671] - Add sorting to array fields for generated data files (*-generated.json) {pull}25320[25320] -- Update Go version to 1.16.5. {issue}26182[26182] +- Update Go version to 1.16.5. {issue}26182[26182] {pull}26186[26186] From ab28de57d8bdb4ed9999829dff36a047365fb52c Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Wed, 9 Jun 2021 08:51:31 -0700 Subject: [PATCH 3/6] Generator runs go mod download all --- generator/common/beatgen/setup/setup.go | 1 + 1 file changed, 1 insertion(+) diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index d797fd4416c..af7a359c2e6 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -156,4 +156,5 @@ func Update() error { return err } return gotool.Mod.Tidy() + return gotool.Mod.Download("all") } From 24651c8fc7b2afd4fc26bc07d5b1de4f4969cdfc Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Wed, 9 Jun 2021 09:26:40 -0700 Subject: [PATCH 4/6] fix syntax --- generator/common/beatgen/setup/setup.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index af7a359c2e6..a8e98ff2a89 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -156,5 +156,8 @@ func Update() error { return err } return gotool.Mod.Tidy() - return gotool.Mod.Download("all") + return gotool.Mod.Download(func() gotool.ArgOpt { + a := &gotool.Args{} + return a.Add("all") + }) } From dce9a06b385548458fc8afedecb60e3aeed1e3ba Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Wed, 9 Jun 2021 10:21:02 -0700 Subject: [PATCH 5/6] syntax fix --- generator/common/beatgen/setup/setup.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index a8e98ff2a89..2c1f9e82957 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -156,8 +156,7 @@ func Update() error { return err } return gotool.Mod.Tidy() - return gotool.Mod.Download(func() gotool.ArgOpt { - a := &gotool.Args{} - return a.Add("all") + return gotool.Mod.Download(func(a *gotool.Args) { + a.Add("all") }) } From cc103dd3c684b9578bd2f854c075aa73c96c2103 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Thu, 10 Jun 2021 09:21:57 -0700 Subject: [PATCH 6/6] Move go mod download all to makefile --- generator/common/Makefile | 1 + generator/common/beatgen/setup/setup.go | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/generator/common/Makefile b/generator/common/Makefile index 97f845d4b0d..ba3eb1af477 100644 --- a/generator/common/Makefile +++ b/generator/common/Makefile @@ -23,6 +23,7 @@ test-package: test cd ${BEAT_PATH} ; \ export PATH=$${GOPATH}/bin:$${PATH}; \ go mod tidy && \ + go mod download all && \ mage package .PHONY: prepare-test diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index 2c1f9e82957..d797fd4416c 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -156,7 +156,4 @@ func Update() error { return err } return gotool.Mod.Tidy() - return gotool.Mod.Download(func(a *gotool.Args) { - a.Add("all") - }) }