Skip to content
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.

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

Upgrade to Go 1.7.6 #4400

Merged
merged 2 commits into from
May 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ os: Windows Server 2012 R2

# Environment variables
environment:
GOROOT: c:\go1.7.4
GOROOT: c:\go1.7.6
GOPATH: c:\gopath
PYWIN_DL: https://beats-files.s3.amazonaws.com/deps/pywin32-220.win32-py2.7.exe
matrix:
Expand All @@ -24,13 +24,13 @@ clone_folder: c:\gopath\src\github.com\elastic\beats
cache:
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
- C:\go1.7.4 -> .appveyor.yml
- C:\go1.7.6 -> .appveyor.yml
- C:\tools\mingw64 -> .appveyor.yml
- C:\pywin_inst.exe -> .appveyor.yml

# Scripts that run after cloning repository
install:
- ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.7.4
- ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.7.6
- set PATH=%GOROOT%\bin;%PATH%
# AppVeyor installed mingw is 32-bit only.
- ps: >-
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
# Cross-compile for amd64 only to speed up testing.
- GOX_FLAGS="-arch amd64"
- DOCKER_COMPOSE_VERSION: 1.9.0
- &go_version 1.7.4
- &go_version 1.7.6

matrix:
include:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ https://github.com/elastic/beats/compare/v5.4.0...v5.4.1[View commits]

==== Added

*Affecting all Beats*

- Binaries upgraded to Go 1.7.6 which contains security fixes. {pull}4400[4400]

*Winlogbeat*

- Add the ability to use LevelRaw if Level isn't populated in the event XML. {pull}4257[4257]
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.

The Beats are Go programs, so install the latest version of
[golang](http://golang.org/) if you don't have it already. The current Go version
used for development is Golang 1.7.4.
used for development is Golang 1.7.6.

The location where you clone is important. Please clone under the source
directory of your `GOPATH`. If you don't have `GOPATH` already set, you can
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.7.4
FROM golang:1.7.6
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tudorg/xgo-deb6-1.7.4
FROM tudorg/xgo-deb6-1.7.6

MAINTAINER Tudor Golubenco <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packer/docker/xgo-image-deb6/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

docker build --rm=true -t tudorg/xgo-deb6-base base/ && \
docker build --rm=true -t tudorg/xgo-deb6-1.7.4 go-1.7.4/ &&
docker build --rm=true -t tudorg/xgo-deb6-1.7.6 go-1.7.6/ &&
docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Go cross compiler (xgo): Go 1.7.4 layer
# Go cross compiler (xgo): Go 1.7.6 layer
# Copyright (c) 2014 Péter Szilágyi. All rights reserved.
#
# Released under the MIT license.
Expand All @@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <[email protected]>

# Configure the root Go distribution and bootstrap based on it
RUN \
export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz" && \
export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \
export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.6.linux-amd64.tar.gz" && \
export ROOT_DIST_SHA1="6a7014f34048d95ab60247814a1b8b98018810ff" && \
\
$BOOTSTRAP_PURE
2 changes: 1 addition & 1 deletion dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tudorg/xgo-1.7.4
FROM tudorg/xgo-1.7.6

MAINTAINER Tudor Golubenco <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packer/docker/xgo-image/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

docker build --rm=true -t tudorg/xgo-base base/ && \
docker build --rm=true -t tudorg/xgo-1.7.4 go-1.7.4/ &&
docker build --rm=true -t tudorg/xgo-1.7.6 go-1.7.6/ &&
docker build --rm=true -t tudorg/beats-builder beats-builder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Go cross compiler (xgo): Go 1.7.4 layer
# Go cross compiler (xgo): Go 1.7.6 layer
# Copyright (c) 2014 Péter Szilágyi. All rights reserved.
#
# Released under the MIT license.
Expand All @@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <[email protected]>

# Configure the root Go distribution and bootstrap based on it
RUN \
export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz" && \
export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \
export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.6.linux-amd64.tar.gz" && \
export ROOT_DIST_SHA1="6a7014f34048d95ab60247814a1b8b98018810ff" && \
\
$BOOTSTRAP_PURE
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.7.4
FROM golang:1.7.6
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Beats dockerfile used for testing
FROM golang:1.7.4
FROM golang:1.7.6
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:stack-version: 5.4.0
:doc-branch: 5.4
:go-version: 1.7.4
:go-version: 1.7.6
:release-state: released
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.7.4
FROM golang:1.7.6
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/mb/mb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package mb

import (
"fmt"
"testing"
"time"

Expand Down Expand Up @@ -95,7 +96,7 @@ func TestModuleConfig(t *testing.T) {
continue
}
if test.err != "" &&
assert.Error(t, err, "expected '%v' in testcase %d", test.err, i) {
assert.Error(t, err, fmt.Sprintf("expected '%v' in testcase %d", test.err, i)) {
assert.Contains(t, err.Error(), test.err, "testcase %d", i)
continue
}
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/module/mysql/status/status_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package status

import (
"fmt"
"testing"

"github.com/elastic/beats/libbeat/common"
Expand Down Expand Up @@ -72,7 +73,7 @@ func TestConfigValidation(t *testing.T) {
t.Errorf("unexpected error in testcase %d: %v", i, err)
continue
}
if test.err != "" && assert.Error(t, err, "expected '%v' in testcase %d", test.err, i) {
if test.err != "" && assert.Error(t, err, fmt.Sprintf("expected '%v' in testcase %d", test.err, i)) {
assert.Contains(t, err.Error(), test.err, "testcase %d", i)
continue
}
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Beats dockerfile used for testing
FROM golang:1.7.4
FROM golang:1.7.6
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
3 changes: 2 additions & 1 deletion winlogbeat/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package config

import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -18,7 +19,7 @@ func (v validationTestCase) run(t *testing.T) {
assert.NoError(t, v.config.Validate())
} else {
err := v.config.Validate()
if assert.Error(t, err, "expected '%s'", v.errMsg) {
if assert.Error(t, err, fmt.Sprintf("expected '%s'", v.errMsg)) {
assert.Contains(t, err.Error(), v.errMsg)
}
}
Expand Down