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.

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

Bump Go to 1.17.5 (release-2.2) #3186

Merged
merged 3 commits into from
Jan 25, 2022
Merged

Bump Go to 1.17.5 (release-2.2) #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d78dd
Run goimports for Go 1.17.5 (release-2.2)
denyeart Jan 24, 2022
36fb735
Bump Go to 1.17.5
denyeart Jan 24, 2022
41308a0
Update docs for Go 1.17
denyeart Jan 24, 2022
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/nopkcs11.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !pkcs11
// +build !pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/nopkcs11_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !pkcs11
// +build !pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/pkcs11.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/pkcs11_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/pkcs11factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/factory/pkcs11factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/pkcs11/ecdsakey_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
1 change: 1 addition & 0 deletions bccsp/pkcs11/pkcs11_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build pkcs11
// +build pkcs11

/*
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
- name: GOPATH
value: $(Agent.BuildDirectory)/go
- name: GOVER
value: 1.16.7
value: 1.17.5

stages:
- stage: BuildBinaries
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/crypto/expiration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
},
Expand Down
1 change: 1 addition & 0 deletions core/handlers/library/race_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build race
// +build race

/*
Expand Down
2 changes: 1 addition & 1 deletion docs/source/dev-setup/devenv.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`__
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
1 change: 1 addition & 0 deletions integration/ledger/ledger_generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build generate
// +build generate

/*
Expand Down
1 change: 1 addition & 0 deletions internal/peer/node/signals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions internal/peer/node/signals_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/comm/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions internal/pkg/comm/testdata/certs/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions orderer/common/cluster/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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",
)
}

Expand Down
1 change: 1 addition & 0 deletions orderer/common/server/signals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions orderer/common/server/signals_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
2 changes: 1 addition & 1 deletion vagrant/golang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions vendor/github.com/cespare/xxhash/v2/.travis.yml
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions vendor/github.com/cespare/xxhash/v2/README.md
View file
Open in desktop

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

1 change: 0 additions & 1 deletion vendor/github.com/cespare/xxhash/v2/xxhash.go
View file
Open in desktop

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

Loading