Skip to content

Update Go to 1.13.3 #14335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikemadden42 merged 8 commits into from
Nov 1, 2019
Merged

Update Go to 1.13.3 #14335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0a75c9
Update Go to 1.13.3
mikemadden42 Oct 30, 2019
cc82aa3
Register flags in the new testing.Init function for Go 1.13.
mikemadden42 Oct 30, 2019
452dacf
Add test.Init() to beat generator
mikemadden42 Oct 31, 2019
548ecf0
Add testing.Init() to libbeat
mikemadden42 Oct 31, 2019
9f23713
Update tz data
mikemadden42 Oct 31, 2019
994e751
Update NOTICE for tz
mikemadden42 Oct 31, 2019
8956ac0
Fix eventreader test
mikemadden42 Nov 1, 2019
47cd70c
Fix eventreader test on non darwin platforms
mikemadden42 Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.12
1.13.3
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Third party libraries used by the Elastic Beats project:

--------------------------------------------------------------------
Dependency: 4d63.com/tz
Revision: bd6cee76f7319745d44ff235e42124b3891e293d
Revision: acbe7ac603850b02c7bc4329a2354e389857bf18
License type (autodetected): MIT
./vendor/4d63.com/tz/LICENSE:
--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3

RUN \
apt-get update \
Expand Down
1 change: 1 addition & 0 deletions auditbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")

cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
Expand Down
7 changes: 0 additions & 7 deletions auditbeat/module/file_integrity/eventreader_fsevents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package file_integrity

import (
"flag"
"os"
"path/filepath"
"strings"
Expand All @@ -32,12 +31,6 @@ import (
"github.com/elastic/beats/libbeat/logp"
)

var underTest = false

func init() {
underTest = flag.Lookup("test.v") != nil
}

type fsreader struct {
stream *fsevents.EventStream
config Config
Expand Down
4 changes: 4 additions & 0 deletions auditbeat/module/file_integrity/eventreader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ import (
"github.com/stretchr/testify/assert"
)

func init() {
underTest = true
}

// ErrorSharingViolation is a Windows ERROR_SHARING_VIOLATION. It means "The
// process cannot access the file because it is being used by another process."
const ErrorSharingViolation syscall.Errno = 32
Expand Down
2 changes: 2 additions & 0 deletions auditbeat/module/file_integrity/metricset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ const (
namespace = "."
)

var underTest = false

func init() {
mb.Registry.MustAddMetricSet(moduleName, metricsetName, New,
mb.DefaultMetricSet(),
Expand Down
2 changes: 1 addition & 1 deletion filebeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3

RUN \
apt-get update \
Expand Down
1 change: 1 addition & 0 deletions filebeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("test.coverprofile"))
Expand Down
1 change: 1 addition & 0 deletions generator/beat/{beat}/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")

cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>

RUN set -x && \
Expand Down
1 change: 1 addition & 0 deletions heartbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("test.coverprofile"))
Expand Down
2 changes: 1 addition & 1 deletion journalbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3
MAINTAINER Noémi Ványi <noemi.vanyi@elastic.co>

RUN set -x && \
Expand Down
1 change: 1 addition & 0 deletions journalbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")

cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Beats dockerfile used for testing
FROM golang:1.12.12
FROM golang:1.13.3
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:stack-version: 8.0.0
:doc-branch: master
:go-version: 1.12.12
:go-version: 1.13.3
:release-state: unreleased
:python: 2.7.9
:docker: 1.12
Expand Down
1 change: 1 addition & 0 deletions libbeat/libbeat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")

RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3

RUN \
apt-get update \
Expand Down
1 change: 1 addition & 0 deletions metricbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("test.coverprofile"))
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.12
FROM golang:1.13.3

COPY test/main.go main.go

Expand Down
1 change: 1 addition & 0 deletions packetbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
var systemTest *bool

func init() {
testing.Init()
systemTest = flag.Bool("systemTest", false, "Set to true when running system tests")
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("systemTest"))
cmd.RootCmd.PersistentFlags().AddGoFlag(flag.CommandLine.Lookup("test.coverprofile"))
Expand Down
3 changes: 2 additions & 1 deletion vendor/4d63.com/tz/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion vendor/4d63.com/tz/go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions vendor/4d63.com/tz/tz.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading