[Automation] Bump Golang version to 1.20.7 (#36241)

* 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 <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]> (cherry picked from commit a88f111) # Conflicts: # .go-version # .golangci.yml # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/heartbeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # metricbeat/module/vsphere/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/functionbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile
elastic · Aug 4, 2023 · b3d6995 · b3d6995
1 parent 65cd7f0
commit b3d6995
Show file tree

Hide file tree

Showing 17 changed files with 81 additions and 1 deletion.
diff --git a/.go-version b/.go-version
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.19.10
+=======
+1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
diff --git a/.golangci.yml b/.golangci.yml
@@ -108,7 +108,11 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.10"
+=======
+    go: "1.20.7"
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -126,19 +130,31 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.10"
+=======
+    go: "1.20.7"
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.10"
+=======
+    go: "1.20.7"
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.10"
+=======
+    go: "1.20.7"
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
   gosec:
     excludes:

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -9,6 +9,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 ==== Breaking changes
 
 *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.7 {pull}36241[36241]
 
 *Auditbeat*
 

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.10
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN \
     apt-get update \

diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
+=======
+FROM golang:1.20.7 as builder
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 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
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
+=======
+FROM golang:1.20.7 as builder
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 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
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:alpine3.15 as builder
+=======
+FROM golang:1.20.7 as builder
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 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
@@ -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
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.10
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN \
     apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,10 @@
 :stack-version: 8.9.0
 :doc-branch: main
+<<<<<<< HEAD
 :go-version: 1.19.10
+=======
+:go-version: 1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.10
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN \
     apt update \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.16.5
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 COPY test/main.go main.go
 

diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
@@ -2,10 +2,17 @@ ARG NATS_VERSION=2.0.4
 FROM nats:$NATS_VERSION
 
 # build stage
+<<<<<<< HEAD
 FROM golang:1.13-alpine3.11 AS build-env
 RUN apk --no-cache add build-base git mercurial gcc
 RUN cd src && go get -d github.com/nats-io/nats.go/
 RUN cd src/github.com/nats-io/nats.go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
+=======
+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 .
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 # create an enhanced container with nc command available since nats is based
 # on scratch image making healthcheck impossible

diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile
@@ -1,5 +1,9 @@
 ARG VSPHERE_GOLANG_VERSION
+<<<<<<< HEAD
 FROM golang:${VSPHERE_GOLANG_VERSION}-alpine
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN apk add --no-cache curl git
 RUN go install github.com/vmware/govmomi/[email protected]

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.10
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN \
     apt-get update \

diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.10
+=======
+FROM golang:1.20.7
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 RUN \
     apt-get update \

diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,10 +2,17 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
+<<<<<<< HEAD
 FROM golang:1.13-alpine3.11 AS build-env
 RUN apk --no-cache add build-base git mercurial gcc
 RUN cd src && go get -d github.com/nats-io/stan.go/
 RUN cd src/github.com/nats-io/stan.go/examples/stan-bench && git checkout tags/v0.5.2 && go build .
+=======
+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 .
+>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
 
 # create an enhanced container with nc command available since nats is based
 # on scratch image making healthcheck impossible