Bump Go to 1.17.5 (release-2.2) (#3186)

* Run goimports for Go 1.17.5 (release-2.2) Run goimports for Go 1.17.5 to clean up build instructions. Signed-off-by: David Enyeart <enyeart@us.ibm.com> * Bump Go to 1.17.5 Bump Go to 1.17.5. Fix unit tests to work with Go 1.17.5. Update dependencies to work with Go 1.17. Signed-off-by: David Enyeart <enyeart@us.ibm.com> * Update docs for Go 1.17 Update docs for Go 1.17. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
hyperledger · Jan 25, 2022 · c04cd7d · c04cd7d
1 parent 4996e82
commit c04cd7d
Show file tree

Hide file tree

Showing 32 changed files with 101 additions and 79 deletions.
diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 
-GO_VER = 1.16.7
+GO_VER = 1.17.5
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)

diff --git a/bccsp/factory/nopkcs11.go b/bccsp/factory/nopkcs11.go
@@ -1,3 +1,4 @@
+//go:build !pkcs11
 // +build !pkcs11
 
 /*

diff --git a/bccsp/factory/nopkcs11_test.go b/bccsp/factory/nopkcs11_test.go
@@ -1,3 +1,4 @@
+//go:build !pkcs11
 // +build !pkcs11
 
 /*

diff --git a/bccsp/factory/pkcs11.go b/bccsp/factory/pkcs11.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/bccsp/factory/pkcs11_test.go b/bccsp/factory/pkcs11_test.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/bccsp/factory/pkcs11factory.go b/bccsp/factory/pkcs11factory.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/bccsp/factory/pkcs11factory_test.go b/bccsp/factory/pkcs11factory_test.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/bccsp/pkcs11/ecdsakey_test.go b/bccsp/pkcs11/ecdsakey_test.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/bccsp/pkcs11/pkcs11_test.go b/bccsp/pkcs11/pkcs11_test.go
@@ -1,3 +1,4 @@
+//go:build pkcs11
 // +build pkcs11
 
 /*

diff --git a/ci/azure-pipelines-merge.yml b/ci/azure-pipelines-merge.yml
@@ -11,7 +11,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.16.7
+  GOVER: 1.17.5
 
 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.16.7
+    value: 1.17.5
 
 stages:
   - stage: BuildBinaries

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -11,7 +11,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.16.7
+  GOVER: 1.17.5
 
 stages:
   - stage: VerifyBuild

diff --git a/common/crypto/expiration_test.go b/common/crypto/expiration_test.go
@@ -277,14 +277,14 @@ cRv6rqxvy5M+t0DhRtiwCen70YCUsksb
 	}{
 		{
 			description: "Bad first certificate",
-			errContains: "asn1:",
+			errContains: "malformed certificate",
 			first:       []byte{1, 2, 3},
 			second:      bob,
 		},
 
 		{
 			description: "Bad second certificate",
-			errContains: "asn1:",
+			errContains: "malformed certificate",
 			first:       alice,
 			second:      []byte{1, 2, 3},
 		},

diff --git a/core/handlers/library/race_test.go b/core/handlers/library/race_test.go
@@ -1,3 +1,4 @@
+//go:build race
 // +build race
 
 /*

diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst
@@ -5,7 +5,7 @@ Prerequisites
 ~~~~~~~~~~~~~
 
 -  `Git client <https://git-scm.com/downloads>`__
--  `Go <https://golang.org/dl/>`__ version 1.15.x
+-  `Go <https://golang.org/dl/>`__ version 1.17.x
 -  `Docker <https://docs.docker.com/get-docker/>`__ version 18.03 or later
 -  (macOS) `Xcode Command Line Tools <https://developer.apple.com/downloads/>`__
 -  `SoftHSM <https://github.com/opendnssec/SoftHSMv2>`__

diff --git a/go.mod b/go.mod
@@ -73,3 +73,5 @@ require (
 )
 
 replace github.com/onsi/gomega => github.com/onsi/gomega v1.9.0
+
+replace github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.2 // fix for Go 1.17 in github.com/prometheus/client_golang dependency without updating protobuf
diff --git a/go.sum b/go.sum
@@ -33,8 +33,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=

diff --git a/integration/ledger/ledger_generate_test.go b/integration/ledger/ledger_generate_test.go
@@ -1,3 +1,4 @@
+//go:build generate
 // +build generate
 
 /*

diff --git a/internal/peer/node/signals.go b/internal/peer/node/signals.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/internal/peer/node/signals_windows.go b/internal/peer/node/signals_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/internal/pkg/comm/server_test.go b/internal/pkg/comm/server_test.go
@@ -496,7 +496,7 @@ func TestNewGRPCServerInvalidParameters(t *testing.T) {
 
 	badRootCAs := [][]byte{[]byte(badPEM)}
 	err = srv.SetClientRootCAs(badRootCAs)
-	assert.EqualError(t, err, "failed to set client root certificate(s): asn1: syntax error: data truncated")
+	assert.EqualError(t, err, "failed to set client root certificate(s): x509: malformed certificate")
 }
 
 func TestNewGRPCServer(t *testing.T) {

diff --git a/internal/pkg/comm/testdata/certs/generate.go b/internal/pkg/comm/testdata/certs/generate.go
@@ -1,11 +1,12 @@
+//go:build ignore
+// +build ignore
+
 /*
 Copyright IBM Corp. All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 */
 
-// +build ignore
-
 //go:generate -command gencerts go run ./generate.go
 //go:generate gencerts -orgs 2 -child-orgs 2 -servers 2 -clients 2
 

diff --git a/orderer/common/cluster/util_test.go b/orderer/common/cluster/util_test.go
@@ -157,7 +157,7 @@ func TestDialerBadConfig(t *testing.T) {
 	_, err := dialer.Dial("127.0.0.1:8080", func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
 		return nil
 	})
-	assert.EqualError(t, err, "error adding root certificate: asn1: syntax error: sequence truncated")
+	assert.EqualError(t, err, "error adding root certificate: x509: malformed certificate")
 }
 
 func TestDERtoPEM(t *testing.T) {
@@ -178,7 +178,7 @@ func TestStandardDialer(t *testing.T) {
 	_, err := standardDialer.Dial(cluster.EndpointCriteria{Endpoint: "127.0.0.1:8080", TLSRootCAs: certPool})
 	assert.EqualError(t,
 		err,
-		"failed creating gRPC client: error adding root certificate: asn1: syntax error: sequence truncated",
+		"failed creating gRPC client: error adding root certificate: x509: malformed certificate",
 	)
 }
 

diff --git a/orderer/common/server/signals.go b/orderer/common/server/signals.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/orderer/common/server/signals_windows.go b/orderer/common/server/signals_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/vagrant/golang.sh b/vagrant/golang.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 GOROOT='/opt/go'
-GO_VERSION=1.16.7
+GO_VERSION=1.17.5
 
 # ----------------------------------------------------------------
 # Install Golang

diff --git a/vendor/github.com/cespare/xxhash/v2/.travis.yml b/vendor/github.com/cespare/xxhash/v2/.travis.yml
diff --git a/vendor/github.com/cespare/xxhash/v2/README.md b/vendor/github.com/cespare/xxhash/v2/README.md
diff --git a/vendor/github.com/cespare/xxhash/v2/xxhash.go b/vendor/github.com/cespare/xxhash/v2/xxhash.go