Update to Golang 1.10.1

eric4545 · Apr 27, 2018 · c35d571 · c35d571
1 parent eccb4a3
commit c35d571
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 23 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.9.4
+1.10.1
diff --git a/Vagrantfile b/Vagrantfile
@@ -63,7 +63,7 @@ if [ ! -e "~/bin/gvm" ]; then
   chmod +x ~/bin/gvm
   echo 'export GOPATH=$HOME/go' >> ~/.bash_profile
   echo 'export PATH=$HOME/bin:$GOPATH/bin:$PATH' >> ~/.bash_profile
-  echo 'eval "$(gvm 1.9.4)"' >> ~/.bash_profile
+  echo 'eval "$(gvm 1.10.1)"' >> ~/.bash_profile
 fi
 SCRIPT
 

diff --git a/dev-tools/packer/docker/xgo-image-deb7/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image-deb7/beats-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM tudorg/xgo-deb7-1.9.4
+FROM tudorg/xgo-deb7-1.10.1
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git a/dev-tools/packer/docker/xgo-image-deb7/build.sh b/dev-tools/packer/docker/xgo-image-deb7/build.sh
@@ -2,5 +2,5 @@
 cp -r ../../../vendor/gopkg.in/yaml.v2 beats-builder/yaml.v2
 cp -r ../../../vendor/github.com/tsg/gotpl beats-builder/gotpl
 docker build --rm=true -t tudorg/xgo-deb7-base base/ && \
-    docker build --rm=true -t tudorg/xgo-deb7-1.9.4 go-1.9.4/ &&
+    docker build --rm=true -t tudorg/xgo-deb7-1.10.1 go-1.10.1/ &&
     docker build --rm=true -t tudorg/beats-builder-deb7 beats-builder
diff --git a/dev-tools/packer/docker/xgo-image-deb7/go-1.9.4/Dockerfile b/dev-tools/packer/docker/xgo-image-deb7/go-1.9.4/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.9.4 layer
+# Go cross compiler (xgo): Go 1.10.1 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="ed1bd37c356338a5a04923c183931a96687f202e" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.10.1.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="0b5b278a1d785812e864158ca0bf84056cb9303c" && \
   \
   $BOOTSTRAP_PURE
diff --git a/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM tudorg/xgo-1.9.4
+FROM tudorg/xgo-1.10.1
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/docker/xgo-image/build.sh
@@ -3,5 +3,5 @@
 cp -r ../../../vendor/gopkg.in/yaml.v2 beats-builder/yaml.v2
 cp -r ../../../vendor/github.com/tsg/gotpl beats-builder/gotpl
 docker pull tudorg/xgo-base:v20180222 && \
-    docker build --rm=true -t tudorg/xgo-1.9.4 go-1.9.4/ &&
+    docker build --rm=true -t tudorg/xgo-1.10.1 go-1.10.1/ &&
     docker build --rm=true -t tudorg/beats-builder beats-builder
diff --git a/dev-tools/packer/docker/xgo-image/go-1.9.4/Dockerfile b/dev-tools/packer/docker/xgo-image/go-1.9.4/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.9.4 layer
+# Go cross compiler (xgo): Go 1.10.1 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="ed1bd37c356338a5a04923c183931a96687f202e" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.10.1.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="0b5b278a1d785812e864158ca0bf84056cb9303c" && \
   \
   $BOOTSTRAP_PURE
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4
+FROM golang:1.10.1
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/filebeat/fileset/modules_integration_test.go b/filebeat/fileset/modules_integration_test.go
@@ -17,7 +17,7 @@ import (
 func TestLoadPipeline(t *testing.T) {
 	client := estest.GetTestingElasticsearch(t)
 	if !hasIngest(client) {
-		t.Skip("Skip tests because ingest is missing in this elasticsearch version: %s", client.GetVersion())
+		t.Skip("Skip tests because ingest is missing in this elasticsearch version: ", client.GetVersion())
 	}
 
 	client.Request("DELETE", "/_ingest/pipeline/my-pipeline-id", "", nil, nil)
@@ -68,7 +68,7 @@ func checkUploadedPipeline(t *testing.T, client *elasticsearch.Client, expectedD
 func TestSetupNginx(t *testing.T) {
 	client := estest.GetTestingElasticsearch(t)
 	if !hasIngest(client) {
-		t.Skip("Skip tests because ingest is missing in this elasticsearch version: %s", client.GetVersion())
+		t.Skip("Skip tests because ingest is missing in this elasticsearch version: ", client.GetVersion())
 	}
 
 	client.Request("DELETE", "/_ingest/pipeline/filebeat-5.2.0-nginx-access-default", "", nil, nil)
@@ -100,7 +100,7 @@ func TestSetupNginx(t *testing.T) {
 func TestAvailableProcessors(t *testing.T) {
 	client := estest.GetTestingElasticsearch(t)
 	if !hasIngest(client) {
-		t.Skip("Skip tests because ingest is missing in this elasticsearch version: %s", client.GetVersion())
+		t.Skip("Skip tests because ingest is missing in this elasticsearch version: ", client.GetVersion())
 	}
 	// these exists on our integration test setup
 	requiredProcessors := []ProcessorRequirement{

diff --git a/generator/beat/{beat}/.travis.yml b/generator/beat/{beat}/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.9.4
+  - 1.10.1
 
 os:
   - linux

diff --git a/generator/common/Makefile b/generator/common/Makefile
@@ -15,8 +15,8 @@ test: prepare-test
 	cd ${BEAT_PATH} ; \
 	$(MAKE) copy-vendor || exit 1  ; \
 	${PREPARE_COMMAND} \
-	$(MAKE) check || exit 1 ; \
 	$(MAKE) update || exit 1 ; \
+	$(MAKE) check || exit 1 ; \
 	$(MAKE) || exit 1 ; \
 	$(MAKE) unit
 

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.9.4
+FROM golang:1.10.1
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.0.0-alpha1
 :doc-branch: master
-:go-version: 1.9.4
+:go-version: 1.10.1
 :release-state: unreleased
 :python: 2.7.9
 :docker: 1.12

diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
@@ -115,7 +115,7 @@ crosscompile: $(GOFILES)
 	gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS}
 
 .PHONY: check
-check: python-env ## @build Checks project and source code if everything is according to standard
+check: python-env prepare-tests ## @build Checks project and source code if everything is according to standard
 	@go vet ${GOPACKAGES}
 	@go get $(GOIMPORTS_REPO)
 	@goimports -local ${GOIMPORTS_LOCAL_PREFIX} -l ${GOFILES_NOVENDOR} | (! grep .) || (echo "Code differs from goimports' style ^" && false)

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4
+FROM golang:1.10.1
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4
+FROM golang:1.10.1
 
 COPY test/main.go main.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: go
     go:
-      - 1.9.4
+      - 1.10.1
     os:
       - linux
@@ Expand Down @@