[Automation][7.17] Bump Golang version to 1.21.10 (#39468)

* chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update x-pack/libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update libbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * Update changelog. * Fix build in test program. --------- Co-authored-by: apmmachine <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]>
elastic · May 9, 2024 · b52aad2 · b52aad2
1 parent b7e3c7f
commit b52aad2
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 23 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.21.9
+1.21.10
diff --git a/.golangci.yml b/.golangci.yml
@@ -102,7 +102,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.9"
+    go: "1.21.10"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -120,19 +120,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.9"
+    go: "1.21.10"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.9"
+    go: "1.21.10"
     # 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.9"
+    go: "1.21.10"
 
   gosec:
     excludes:

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -64,6 +64,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
+- Upgrade to Go 1.21.10. {pull}39468[39468]
 
 *Auditbeat*
 

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.9 as builder
+FROM golang:1.21.10 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
@@ -1,4 +1,4 @@
-FROM golang:1.21.9 as builder
+FROM golang:1.21.10 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
@@ -1,4 +1,4 @@
-FROM golang:1.21.9 as builder
+FROM golang:1.21.10 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.17.21
 :doc-branch: 7.17
-:go-version: 1.21.9
+:go-version: 1.21.10
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/
 
 RUN \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 COPY test/main.go main.go
 

diff --git 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.9 AS build-env
+FROM golang:1.21.10 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
@@ -1,5 +1,5 @@
 ARG VSPHERE_GOLANG_VERSION
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN apt-get install curl git
 RUN go install github.com/vmware/govmomi/[email protected]

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go b/x-pack/elastic-agent/pkg/agent/operation/tests/scripts/serviceable-1.0-darwin-x86_64/main.go
@@ -102,7 +102,7 @@ type TestConfig struct {
 	TestFile string `config:"TestFile" yaml:"TestFile"`
 }
 
-func getCreds(port int) (*proto.ConnInfo, error) {
+func getCreds(port int) (*proto.StartUpInfo, error) {
 	c, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 	if err != nil {
 		return nil, err
@@ -113,7 +113,7 @@ func getCreds(port int) (*proto.ConnInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	var connInfo proto.ConnInfo
+	var connInfo proto.StartUpInfo
 	err = protobuf.Unmarshal(buf[:n], &connInfo)
 	if err != nil {
 		return nil, err

diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.9
+FROM golang:1.21.10
 
 RUN \
     apt-get update \

diff --git 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.9 AS build-env
+FROM golang:1.21.10 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 .