Update to Go 1.22.5 (#40082) (#40323)

* Update to go 1.22.4. * Link to PR. * Fix bad merge. * Fix some regex. * Fix config_test.go * Comment out ping. * Update to go 1.22.5. * Un-comment code. * Update go.mod. * Add encrypt=false to mssql py test. * Make CI happy * Fix NOTICE.txt. --------- Co-authored-by: subham sarkar <[email protected]> Co-authored-by: Julien Lind <[email protected]> (cherry picked from commit c0f8ae3) Co-authored-by: Blake Rouse <[email protected]>
elastic · Jul 24, 2024 · c6e076e · c6e076e
1 parent bce3b66
commit c6e076e
Show file tree

Hide file tree

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

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -10,6 +10,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
+- Update Go version to 1.22.5. {pull}40082[40082]
+
 *Auditbeat*
 
 

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

diff --git a/auditbeat/module/file_integrity/config_test.go b/auditbeat/module/file_integrity/config_test.go
@@ -54,10 +54,10 @@ func TestConfig(t *testing.T) {
 	assert.EqualValues(t, 1024*1024*1024, c.MaxFileSizeBytes)
 	assert.EqualValues(t, 1024*1024*10, c.ScanRateBytesPerSec)
 	assert.Len(t, c.ExcludeFiles, 2)
-	assert.EqualValues(t, `\.DS_Store(?-m:$)`, c.ExcludeFiles[0].String())
-	assert.EqualValues(t, `\.swp(?-m:$)`, c.ExcludeFiles[1].String())
+	assert.EqualValues(t, `(?-m:\.DS_Store$)`, c.ExcludeFiles[0].String())
+	assert.EqualValues(t, `(?-m:\.swp$)`, c.ExcludeFiles[1].String())
 	assert.Len(t, c.IncludeFiles, 1)
-	assert.EqualValues(t, `\.ssh/(?-m:$)`, c.IncludeFiles[0].String())
+	assert.EqualValues(t, `(?-m:\.ssh/$)`, c.IncludeFiles[0].String())
 	assert.Len(t, c.FileParsers, 2)
 }
 

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

diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go
@@ -337,7 +337,7 @@ func (b GolangCrossBuilder) Build() error {
 
 	// Ensure the proper platform is passed
 	// This fixes an issue where during arm64 linux build for the currently used docker image
-	// docker.elastic.co/beats-dev/golang-crossbuild:1.21.9-arm the image for amd64 arch is pulled
+	// docker.elastic.co/beats-dev/golang-crossbuild:1.22.5-arm the image for amd64 arch is pulled
 	// and causes problems when using native arch tools on the binaries that are built for arm64 arch.
 	if strings.HasPrefix(b.Platform, "linux/") {
 		args = append(args,

diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/elastic/beats/v7
 
-go 1.21.0
-
-toolchain go1.21.12
+go 1.22.5
 
 require (
 	cloud.google.com/go/bigquery v1.55.0

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

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 8.15.0
 :doc-branch: main
-:go-version: 1.21.12
+:go-version: 1.22.5
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/libbeat/processors/actions/drop_fields_test.go b/libbeat/processors/actions/drop_fields_test.go
@@ -107,7 +107,7 @@ func TestNewDropFields(t *testing.T) {
 		assert.True(t, ok)
 		assert.Equal(t, []string{"third"}, processor.Fields)
 		assert.Equal(t, "<substring 'second'>", processor.RegexpFields[0].String())
-		assert.Equal(t, "field_(?-s:.)*1", processor.RegexpFields[1].String())
+		assert.Equal(t, "(?-s:field_.*1)", processor.RegexpFields[1].String())
 	})
 
 	t.Run("returns error when regexp field is badly written", func(t *testing.T) {

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.12
+FROM golang:1.22.5
 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.12
+FROM golang:1.22.5
 
 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.12 AS build-env
+FROM golang:1.22.5 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.12
+FROM golang:1.22.5
 
 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.12
+FROM golang:1.22.5
 
 RUN \
     apt-get update \

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

diff --git a/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml b/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
@@ -1,2 +1,2 @@
 variants:
-  - MSSQL_VERSION: 2017-GA-ubuntu
+  - MSSQL_VERSION: 2017-CU31-GDR2-ubuntu-18.04
diff --git a/x-pack/metricbeat/module/mssql/docker-compose.yml b/x-pack/metricbeat/module/mssql/docker-compose.yml
@@ -2,10 +2,10 @@ version: '2.3'
 
 services:
   mssql:
-    image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-GA-ubuntu}-1
+    image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}-1
     build:
       context: ./_meta
       args:
-        MSSQL_VERSION: ${MSSQL_VERSION:-2017-GA-ubuntu}
+        MSSQL_VERSION: ${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}
     ports:
       - 1433
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.12 AS build-env
+FROM golang:1.22.5 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 .
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

		Affecting all Beats

		- Update Go version to 1.22.5. {pull}40082[40082]

		Auditbeat


Expand Down