Skip to content

Commit

Permalink
Update go release version 1.17.1 (#27543)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
apmmachine authored Oct 11, 2021
1 parent 4acdaa7 commit e6839ab
Show file tree
Hide file tree
Showing 808 changed files with 6,549 additions and 129,356 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.6
1.17.1
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Update to go-concert 0.2.0 {pull}27162[27162]
- Update Go version to 1.16.5. {issue}26182[26182] {pull}26186[26186]
- Introduce `libbeat/beat.Beat.OutputConfigReloader` {pull}28048[28048]
- Update Go version to 1.17.1. {pull}27543[27543]

==== Deprecated

Expand Down
134,639 changes: 5,477 additions & 129,162 deletions NOTICE.txt

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion auditbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.6
FROM golang:1.17.1

RUN \
apt-get update \
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions auditbeat/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build mage
// +build mage

package main
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/auditd/audit_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !linux
// +build !linux

package auditd
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/auditd/golden_files_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux
// +build linux

package auditd
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/eventreader_fsevents.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build darwin
// +build darwin

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/eventreader_fsnotify.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/eventreader_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileinfo_bsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileinfo_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux
// +build linux

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileinfo_other_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileinfo_posix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileinfo_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build windows
// +build windows

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileorigin_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build darwin
// +build darwin

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileorigin_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !darwin
// +build !darwin

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/fileorigin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build darwin
// +build darwin

package file_integrity
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/monitor/filetree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package monitor
Expand Down
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/monitor/monitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package monitor
Expand Down
2 changes: 1 addition & 1 deletion filebeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.6
FROM golang:1.17.1

RUN \
apt-get update \
Expand Down
1 change: 1 addition & 0 deletions filebeat/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package config
Expand Down
1 change: 1 addition & 0 deletions filebeat/fileset/compatibility_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package fileset
Expand Down
1 change: 1 addition & 0 deletions filebeat/fileset/fileset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package fileset
Expand Down
1 change: 1 addition & 0 deletions filebeat/fileset/modules_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build integration
// +build integration

package fileset
Expand Down
1 change: 1 addition & 0 deletions filebeat/fileset/modules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package fileset
Expand Down
1 change: 1 addition & 0 deletions filebeat/fileset/pipelines_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package fileset
Expand Down
1 change: 1 addition & 0 deletions filebeat/harvester/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package harvester
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/container/input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package container
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/default-inputs/inputs_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows && !linux
// +build !windows,!linux

package inputs
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/docker/input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package docker
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/glob_other_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/glob_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build windows
// +build windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/identifier_inode_deviceid.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/identifier_inode_deviceid_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build windows
// +build windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/identifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/identifier_test_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build windows
// +build windows

package file
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/file/states_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build integration
// +build integration

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/filestream_test_non_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/fswatch_test_non_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/identifier_inode_deviceid.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package filestream
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build windows
// +build windows

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/identifier_test_non_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !windows
// +build !windows

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/input_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build integration
// +build integration

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/filestream/parsers_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build integration
// +build integration

package filestream
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !integration
// +build !integration

package input
1 change: 1 addition & 0 deletions filebeat/input/journald/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux && cgo && withjournald
// +build linux,cgo,withjournald

package journald
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/journald/conv.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux && cgo && withjournald
// +build linux,cgo,withjournald

package journald
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/journald/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build linux && cgo && withjournald
// +build linux,cgo,withjournald

package journald
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/journald/input_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.

//go:build !linux || !cgo || !withjournald
// +build !linux !cgo !withjournald

package journald
Expand Down
Loading

0 comments on commit e6839ab

Please sign in to comment.