From a88f111fc6ac29889b103adda54a509802c888be Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 4 Aug 2023 14:15:43 -0400 Subject: [PATCH] [Automation] Bump Golang version to 1.20.7 (#36241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/http/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/filebeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /x-pack/functionbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [2] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/vsphere/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/metricbeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: Updated to content ":go-version: 1.20.7" in file "libbeat/docs... ... /version.asciidoc" Made with ❤️️ by updatecli * chore: Updated to content "go 1.20" in file "go.mod" Made with ❤️️ by updatecli * chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats... ... /x-pack/metricbeat/module/stan/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".golangci.yml" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /auditbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /heartbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/nats/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".go-version" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/heartbeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /packetbeat/Dockerfile" Made with ❤️️ by updatecli * Update changelog. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie --- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 2 +- 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 | 2 +- heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- 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 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.go-version b/.go-version index e63679c7661..8909929f6e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.6 +1.20.7 diff --git a/.golangci.yml b/.golangci.yml index db4489901a7..acd08cfb0a0 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -109,7 +109,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.20.6" + go: "1.20.7" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -127,19 +127,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.6" + go: "1.20.7" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.6" + go: "1.20.7" # 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.20.6" + go: "1.20.7" gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 35f6aebd1f4..e66541f062f 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] *Affecting all Beats* - Fix status reporting to Elastic-Agent when output configuration is invalid running under Elastic-Agent {pull}35719[35719] -- Upgrade Go to 1.20.6 {pull}36000[36000] +- Upgrade Go to 1.20.7 {pull}36241[36241] *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index d3390a85517..97199e89a0e 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 0a639f769f3..5184138de53 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.6 as builder +FROM golang:1.20.7 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 e6787232a5b..16defa414fd 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.6 as builder +FROM golang:1.20.7 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 c4f357ec5a2..24c588d0f24 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.6 as builder +FROM golang:1.20.7 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 0d7fcad73ae..c37d1002a58 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.19 +go 1.20 require ( cloud.google.com/go/bigquery v1.44.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 776d8290f7d..dade8329713 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 01c3e225870..ba9dffcfac0 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 8.10.0 :doc-branch: main -:go-version: 1.20.6 +:go-version: 1.20.7 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index d02c807d375..b3450fb8c24 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 RUN \ apt update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 1ddf090399b..4bcd674a247 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index a12879d2804..85751dda114 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.20.6 AS build-env +FROM golang:1.20.7 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 c2a157cab08..f54e001b936 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:${VSPHERE_GOLANG_VERSION} +FROM golang:1.20.7 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 74490244201..9a522cbc230 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 8de2b067034..b49fdc7bfd8 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.6 +FROM golang:1.20.7 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index acee2d22c09..3f707023d1a 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.20.6 AS build-env +FROM golang:1.20.7 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 .