Update to go 1.13

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
hyperledger · Apr 9, 2020 · 5c2a996 · 5c2a996
1 parent 3b5b58b
commit 5c2a996
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/ci/azure-pipelines-merge.yml b/ci/azure-pipelines-merge.yml
@@ -10,7 +10,7 @@ pr: none
 variables:
   GOPATH: $(Agent.BuildDirectory)/go
   PATH: $(Agent.BuildDirectory)/go/bin:/usr/local/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GOVER: 1.12.12
+  GOVER: 1.13.9
 
 jobs:
   - job: UnitTests

diff --git a/ci/azure-pipelines-release.yml b/ci/azure-pipelines-release.yml
@@ -11,7 +11,7 @@ variables:
   - name: GOPATH
     value: $(Agent.BuildDirectory)/go
   - name: GOVER
-    value: 1.12.12
+    value: 1.13.9
 
 stages:
   - stage: BuildBinaries

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -10,7 +10,7 @@ pr:
 variables:
   GOPATH: $(Agent.BuildDirectory)/go
   PATH: $(Agent.BuildDirectory)/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GOVER: 1.12.12
+  GOVER: 1.13.9
 
 jobs:
   - job: VerifyBuild

diff --git a/common/crypto/tlsgen/ca_test.go b/common/crypto/tlsgen/ca_test.go
@@ -63,6 +63,7 @@ func TestTLSCA(t *testing.T) {
 		tlsCfg := &tls.Config{
 			RootCAs:      x509.NewCertPool(),
 			Certificates: []tls.Certificate{cert},
+			MaxVersion:   tls.VersionTLS12,
 		}
 		tlsCfg.RootCAs.AppendCertsFromPEM(ca.CertBytes())
 		tlsOpts := grpc.WithTransportCredentials(credentials.NewTLS(tlsCfg))

diff --git a/core/chaincode/accesscontrol/access_test.go b/core/chaincode/accesscontrol/access_test.go
@@ -105,7 +105,8 @@ type ccClient struct {
 
 func newClient(t *testing.T, port int, cert *tls.Certificate, peerCACert []byte) (*ccClient, error) {
 	tlsCfg := &tls.Config{
-		RootCAs: x509.NewCertPool(),
+		RootCAs:    x509.NewCertPool(),
+		MaxVersion: tls.VersionTLS12,
 	}
 
 	tlsCfg.RootCAs.AppendCertsFromPEM(peerCACert)

diff --git a/core/testutil/config.go b/core/testutil/config.go
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package testutil
 
 import (
-	"flag"
 	"fmt"
 	"io/ioutil"
 	"runtime"
@@ -24,8 +23,6 @@ var configLogger = flogging.MustGetLogger("config")
 
 // SetupTestConfig setup the config during test execution
 func SetupTestConfig() {
-	flag.Parse()
-
 	// Now set the configuration file
 	viper.SetEnvPrefix("CORE")
 	viper.AutomaticEnv()

diff --git a/devenv/setup.sh b/devenv/setup.sh
@@ -60,7 +60,7 @@ docker run --rm busybox echo All good
 # ----------------------------------------------------------------
 # Install Golang
 # ----------------------------------------------------------------
-GO_VER=1.12.12
+GO_VER=1.13.9
 GO_URL=https://storage.googleapis.com/golang/go${GO_VER}.linux-amd64.tar.gz
 
 # Set Go environment variables needed by other scripts

diff --git a/images/testenv/Dockerfile.alpine b/images/testenv/Dockerfile.alpine
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-FROM golang:1.12-alpine as builder
+FROM golang:1.13.9-alpine as builder
 
 RUN apk add --no-cache \
 	alpine-sdk \
@@ -35,7 +35,7 @@ USER root
 WORKDIR $GOPATH/src/github.com/hyperledger/fabric
 RUN EXECUTABLES= make gotools
 
-FROM golang:1.12-alpine
+FROM golang:1.13.9-alpine
 RUN apk add --no-cache \
 	gcc \
 	bash \