[7.x](backport #27543) [automation] Update go release version 1.17.1 (#…

…28335) * Update go release version 1.17.1 (#27543) * format of conditional build tags has changed * matching of * in regexes was fixed, thus breaking some of our code: golang/go#46123 * iproute package was missing from the new Golang Docker image, thus, we had to add it for our tests * go.mod file contains separate require directive for transitive dependencies (cherry picked from commit e6839ab) * Fix build tags for Go 1.17 (#28338) * additional fixes * Disable generator tests temporarily (#28362) * Fix docker import generator for 1.17.1 (#28374) * Fix liblogparser * Update go.mod * update notice Co-authored-by: apmmachine <[email protected]> Co-authored-by: Aleksandr Maus <[email protected]> Co-authored-by: Noémi Ványi <[email protected]> Co-authored-by: Noémi Ványi <[email protected]> Co-authored-by: Alex K <[email protected]> Co-authored-by: Marc Guasch <[email protected]>
elastic · Oct 14, 2021 · 83e3223 · 83e3223
1 parent f441b50
commit 83e3223
Show file tree

Hide file tree

Showing 825 changed files with 6,523 additions and 129,213 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.16.6
+1.17.1
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -262,6 +262,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix `logstash` module when `xpack.enabled: true` is set from emitting redundant events. {pull}22808[22808]
 - Change vsphere.datastore.capacity.used.pct value to betweeen 0 and 1. {pull}23148[23148]
 - `beat` module respects `basepath` config option. {pull}28162[28162]
+- Fix list_docker.go {pull}28374[28374]
 
 *Packetbeat*
 

diff --git a/Jenkinsfile.yml b/Jenkinsfile.yml
@@ -2,7 +2,8 @@ projects:
     - "auditbeat"
     - "deploy/kubernetes"
     - "filebeat"
-    - "generator"
+# temporarly disable generator tests: https://github.com/elastic/beats/issues/28361
+#    - "generator"
     - "heartbeat"
     - "journalbeat"
     - "libbeat"

diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.6
+FROM golang:1.17.1
 
 RUN \
     apt-get update \
@@ -7,6 +7,7 @@ RUN \
          python3-pip \
          python3-venv \
          librpm-dev \
+         iproute2 \
       && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install --upgrade pip==20.1.1

diff --git a/auditbeat/magefile.go b/auditbeat/magefile.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build mage
 // +build mage
 
 package main

diff --git a/auditbeat/module/auditd/audit_unsupported.go b/auditbeat/module/auditd/audit_unsupported.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !linux
 // +build !linux
 
 package auditd

diff --git a/auditbeat/module/auditd/golden_files_test.go b/auditbeat/module/auditd/golden_files_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build linux
 // +build linux
 
 package auditd

diff --git a/auditbeat/module/file_integrity/eventreader_fsevents.go b/auditbeat/module/file_integrity/eventreader_fsevents.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build darwin
 // +build darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/eventreader_fsnotify.go b/auditbeat/module/file_integrity/eventreader_fsnotify.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build linux || freebsd || openbsd || netbsd || windows
 // +build linux freebsd openbsd netbsd windows
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/eventreader_unsupported.go b/auditbeat/module/file_integrity/eventreader_unsupported.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !linux && !freebsd && !openbsd && !netbsd && !windows && !darwin
 // +build !linux,!freebsd,!openbsd,!netbsd,!windows,!darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileinfo_bsd.go b/auditbeat/module/file_integrity/fileinfo_bsd.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build freebsd || openbsd || netbsd || darwin
 // +build freebsd openbsd netbsd darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileinfo_linux.go b/auditbeat/module/file_integrity/fileinfo_linux.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build linux
 // +build linux
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileinfo_other_test.go b/auditbeat/module/file_integrity/fileinfo_other_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileinfo_posix.go b/auditbeat/module/file_integrity/fileinfo_posix.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build linux || freebsd || openbsd || netbsd || darwin
 // +build linux freebsd openbsd netbsd darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileinfo_windows.go b/auditbeat/module/file_integrity/fileinfo_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build windows
 // +build windows
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileorigin_darwin.go b/auditbeat/module/file_integrity/fileorigin_darwin.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build darwin
 // +build darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileorigin_other.go b/auditbeat/module/file_integrity/fileorigin_other.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !darwin
 // +build !darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/fileorigin_test.go b/auditbeat/module/file_integrity/fileorigin_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build darwin
 // +build darwin
 
 package file_integrity

diff --git a/auditbeat/module/file_integrity/monitor/filetree_test.go b/auditbeat/module/file_integrity/monitor/filetree_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package monitor

diff --git a/auditbeat/module/file_integrity/monitor/monitor_test.go b/auditbeat/module/file_integrity/monitor/monitor_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package monitor

diff --git a/dev-tools/cmd/asset/asset.go b/dev-tools/cmd/asset/asset.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/dev-tools/mage/keychain_test.go b/dev-tools/mage/keychain_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build darwin
 // +build darwin
 
 package mage

diff --git a/dev-tools/magefile.go b/dev-tools/magefile.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build mage
 // +build mage
 
 package main

diff --git a/dev-tools/packaging/preference-pane/magefile.go b/dev-tools/packaging/preference-pane/magefile.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build mage
 // +build mage
 
 package main

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

diff --git a/filebeat/config/config_test.go b/filebeat/config/config_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package config

diff --git a/filebeat/fileset/compatibility_test.go b/filebeat/fileset/compatibility_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package fileset

diff --git a/filebeat/fileset/fileset_test.go b/filebeat/fileset/fileset_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package fileset

diff --git a/filebeat/fileset/modules_integration_test.go b/filebeat/fileset/modules_integration_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build integration
 // +build integration
 
 package fileset

diff --git a/filebeat/fileset/modules_test.go b/filebeat/fileset/modules_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package fileset

diff --git a/filebeat/fileset/pipelines_test.go b/filebeat/fileset/pipelines_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package fileset

diff --git a/filebeat/harvester/util_test.go b/filebeat/harvester/util_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package harvester

diff --git a/filebeat/input/container/input_test.go b/filebeat/input/container/input_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package container

diff --git a/filebeat/input/default-inputs/inputs_other.go b/filebeat/input/default-inputs/inputs_other.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows && !linux
 // +build !windows,!linux
 
 package inputs

diff --git a/filebeat/input/docker/input_test.go b/filebeat/input/docker/input_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package docker

diff --git a/filebeat/input/file/glob_other_test.go b/filebeat/input/file/glob_other_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package file

diff --git a/filebeat/input/file/glob_windows_test.go b/filebeat/input/file/glob_windows_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build windows
 // +build windows
 
 package file

diff --git a/filebeat/input/file/identifier_inode_deviceid.go b/filebeat/input/file/identifier_inode_deviceid.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package file

diff --git a/filebeat/input/file/identifier_inode_deviceid_windows.go b/filebeat/input/file/identifier_inode_deviceid_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build windows
 // +build windows
 
 package file

diff --git a/filebeat/input/file/identifier_test.go b/filebeat/input/file/identifier_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package file

diff --git a/filebeat/input/file/identifier_test_windows.go b/filebeat/input/file/identifier_test_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build windows
 // +build windows
 
 package file

diff --git a/filebeat/input/file/states_test.go b/filebeat/input/file/states_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !integration
 // +build !integration
 
 package file

diff --git a/filebeat/input/filestream/example_inputs_integration_test.go b/filebeat/input/filestream/example_inputs_integration_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build integration
 // +build integration
 
 package filestream

diff --git a/filebeat/input/filestream/filestream_test_non_windows.go b/filebeat/input/filestream/filestream_test_non_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package filestream

diff --git a/filebeat/input/filestream/fswatch_test_non_windows.go b/filebeat/input/filestream/fswatch_test_non_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package filestream

diff --git a/filebeat/input/filestream/identifier_inode_deviceid.go b/filebeat/input/filestream/identifier_inode_deviceid.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package filestream

diff --git a/filebeat/input/filestream/identifier_inode_deviceid_windows.go b/filebeat/input/filestream/identifier_inode_deviceid_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build windows
 // +build windows
 
 package filestream

diff --git a/filebeat/input/filestream/identifier_test_non_windows.go b/filebeat/input/filestream/identifier_test_non_windows.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build !windows
 // +build !windows
 
 package filestream

diff --git a/filebeat/input/filestream/input_integration_test.go b/filebeat/input/filestream/input_integration_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build integration
 // +build integration
 
 package filestream