From 8c1c256cc2c0d4405495a181deb5d134b7d90525 Mon Sep 17 00:00:00 2001 From: Fedor Partanskiy Date: Tue, 11 Feb 2025 23:30:01 +0300 Subject: [PATCH] bump go 1.24.0 Signed-off-by: Fedor Partanskiy --- .github/workflows/broken-link-checker.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verify-build.yml | 2 +- .github/workflows/vulnerability-scan.yml | 2 +- Makefile | 2 +- common/policies/implicitmeta.go | 4 +- .../txvalidator/v14/vscc_validator.go | 3 +- .../v20/plugindispatcher/dispatcher.go | 3 +- .../statebased/validator_keylevel.go | 2 +- .../validation/statebased/vpmanagerimpl.go | 8 ++-- core/handlers/library/plugin.go | 5 +-- core/handlers/library/registry.go | 3 +- core/ledger/kvledger/kv_ledger_provider.go | 2 +- .../statedb/statecouchdb/commit_handling.go | 2 +- .../txmgmt/statedb/statecouchdb/couchdb.go | 2 +- core/peer/deliverevents.go | 2 +- docs/source/dev-setup/devenv.rst | 2 +- docs/source/prereqs.md | 4 +- go.mod | 2 +- gotools.mk | 2 +- integration/chaincode/module/go.mod | 2 +- msp/mgmt/mgmt.go | 2 +- orderer/consensus/etcdraft/chain.go | 2 +- tools/go.mod | 22 +++++----- tools/go.sum | 40 +++++++++---------- vagrant/golang.sh | 2 +- 26 files changed, 61 insertions(+), 65 deletions(-) diff --git a/.github/workflows/broken-link-checker.yml b/.github/workflows/broken-link-checker.yml index 31da51fb996..533d07d7c85 100644 --- a/.github/workflows/broken-link-checker.yml +++ b/.github/workflows/broken-link-checker.yml @@ -13,7 +13,7 @@ on: - .github/workflows/broken-link-checker.yml env: - GO_VER: 1.23.6 + GO_VER: 1.24.0 permissions: contents: read diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d1fc898f04..2246b00466d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: - v3.* env: - GO_VER: 1.23.6 + GO_VER: 1.24.0 UBUNTU_VER: 22.04 FABRIC_VER: ${{ github.ref_name }} diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index 30754c6c458..5a6400c147b 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -13,7 +13,7 @@ on: env: GOPATH: /opt/go PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin - GO_VER: 1.23.6 + GO_VER: 1.24.0 permissions: contents: read # to fetch code (actions/checkout) diff --git a/.github/workflows/vulnerability-scan.yml b/.github/workflows/vulnerability-scan.yml index fd325663c3d..d506182dc51 100644 --- a/.github/workflows/vulnerability-scan.yml +++ b/.github/workflows/vulnerability-scan.yml @@ -30,6 +30,6 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.6 + go-version: 1.24.0 - name: Scan run: make scan diff --git a/Makefile b/Makefile index 1c4d0dcc0d1..862471612d7 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION) METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL) METADATA_VAR += DockerNamespace=$(DOCKER_NS) -GO_VER = 1.23.6 +GO_VER = 1.24.0 GO_TAGS ?= RELEASE_EXES = orderer $(TOOLS_EXES) diff --git a/common/policies/implicitmeta.go b/common/policies/implicitmeta.go index 7787c1c8511..20488e9cbfc 100644 --- a/common/policies/implicitmeta.go +++ b/common/policies/implicitmeta.go @@ -83,7 +83,7 @@ func (imp *ImplicitMetaPolicy) EvaluateSignedData(signatureSet []*protoutil.Sign b.WriteString(" ") } b.WriteString("]") - logger.Debugf(b.String()) + logger.Debug(b.String()) } } }() @@ -126,7 +126,7 @@ func (imp *ImplicitMetaPolicy) EvaluateIdentities(identities []msp.Identity) err b.WriteString(" ") } b.WriteString("]") - logger.Debugf(b.String()) + logger.Debug(b.String()) }() for _, policy := range imp.SubPolicies { diff --git a/core/committer/txvalidator/v14/vscc_validator.go b/core/committer/txvalidator/v14/vscc_validator.go index 073998e91ee..b6c3f933dfb 100644 --- a/core/committer/txvalidator/v14/vscc_validator.go +++ b/core/committer/txvalidator/v14/vscc_validator.go @@ -345,8 +345,7 @@ func (v *VsccValidatorImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID // obtain name of the VSCC and the policy cd, err := v.getCDataForCC(chdr.ChannelId, ccID) if err != nil { - msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err) - logger.Errorf(msg) + logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err) return nil, nil, nil, err } cc.ChaincodeName = cd.Name diff --git a/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go b/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go index c7cce7602a8..1138a8db0ba 100644 --- a/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go +++ b/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go @@ -267,8 +267,7 @@ func (v *dispatcherImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID str // obtain name of the validation plugin and the policy plugin, args, err := v.getCDataForCC(chdr.ChannelId, ccID) if err != nil { - msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err) - logger.Errorf(msg) + logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err) return "", nil, err } return plugin, args, nil diff --git a/core/common/validation/statebased/validator_keylevel.go b/core/common/validation/statebased/validator_keylevel.go index 9dd7b8504c3..5d9ac72de50 100644 --- a/core/common/validation/statebased/validator_keylevel.go +++ b/core/common/validation/statebased/validator_keylevel.go @@ -52,7 +52,7 @@ func (p *baseEvaluator) checkSBAndCCEP(cc, coll, key string, blockNum, txNum uin // logged and ignored. The ledger will take the most appropriate action // when performing its side of the validation. case *ledger.CollConfigNotDefinedError, *ledger.InvalidCollNameError: - logger.Warningf(errors.WithMessage(err, "skipping key-level validation").Error()) + logger.Warning(errors.WithMessage(err, "skipping key-level validation").Error()) // 3) any other type of error should return an execution failure which will // lead to halting the processing on this channel. Note that any non-categorized // deterministic error would be caught by the default and would lead to diff --git a/core/common/validation/statebased/vpmanagerimpl.go b/core/common/validation/statebased/vpmanagerimpl.go index ff1c84e348e..69af6b7958f 100644 --- a/core/common/validation/statebased/vpmanagerimpl.go +++ b/core/common/validation/statebased/vpmanagerimpl.go @@ -306,7 +306,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc // bail, if the validation parameter has been updated in the meantime err := vCtx.waitForValidationResults(newLedgerKeyID(cc, coll, key), blockNum, txNum) if err != nil { - logger.Errorf(err.Error()) + logger.Error(err.Error()) return nil, err } @@ -316,7 +316,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc state, err := m.StateFetcher.FetchState() if err != nil { err = errors.WithMessage(err, "could not retrieve ledger") - logger.Errorf(err.Error()) + logger.Error(err.Error()) return nil, err } defer state.Done() @@ -326,14 +326,14 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc mdMap, err = state.GetStateMetadata(cc, key) if err != nil { err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s", cc, key) - logger.Errorf(err.Error()) + logger.Error(err.Error()) return nil, err } } else { mdMap, err = state.GetPrivateDataMetadataByHash(cc, coll, []byte(key)) if err != nil { err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s:%x", cc, coll, []byte(key)) - logger.Errorf(err.Error()) + logger.Error(err.Error()) return nil, err } } diff --git a/core/handlers/library/plugin.go b/core/handlers/library/plugin.go index 39b04eb3fe2..2e6646ae0d8 100644 --- a/core/handlers/library/plugin.go +++ b/core/handlers/library/plugin.go @@ -10,7 +10,6 @@ package library import ( - "fmt" "os" "plugin" @@ -23,11 +22,11 @@ import ( // loadPlugin loads a pluggable handler func (r *registry) loadPlugin(pluginPath string, handlerType HandlerType, extraArgs ...string) { if _, err := os.Stat(pluginPath); err != nil { - logger.Panicf(fmt.Sprintf("Could not find plugin at path %s: %s", pluginPath, err)) + logger.Panicf("Could not find plugin at path %s: %s", pluginPath, err) } p, err := plugin.Open(pluginPath) if err != nil { - logger.Panicf(fmt.Sprintf("Error opening plugin at path %s: %s", pluginPath, err)) + logger.Panicf("Error opening plugin at path %s: %s", pluginPath, err) } if handlerType == Auth { diff --git a/core/handlers/library/registry.go b/core/handlers/library/registry.go index 5ae76baf3a3..abc85e90895 100644 --- a/core/handlers/library/registry.go +++ b/core/handlers/library/registry.go @@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0 package library import ( - "fmt" "reflect" "sync" "time" @@ -109,7 +108,7 @@ func (r *registry) loadCompiled(handlerFactory string, handlerType HandlerType, o := registryMD.MethodByName(handlerFactory) if !o.IsValid() { - logger.Panicf(fmt.Sprintf("Method %s isn't a method of HandlerLibrary", handlerFactory)) + logger.Panicf("Method %s isn't a method of HandlerLibrary", handlerFactory) } inst := o.Call(nil)[0].Interface() diff --git a/core/ledger/kvledger/kv_ledger_provider.go b/core/ledger/kvledger/kv_ledger_provider.go index a5ab8b5039a..7f803ec6a79 100644 --- a/core/ledger/kvledger/kv_ledger_provider.go +++ b/core/ledger/kvledger/kv_ledger_provider.go @@ -312,7 +312,7 @@ func (p *Provider) deleteUnderConstructionLedger(ledger ledger.PeerLedger, ledge if cleanupErr == nil { return creationErr } - return errors.WithMessagef(cleanupErr, creationErr.Error()) + return errors.WithMessage(cleanupErr, creationErr.Error()) } // Open implements the corresponding method from interface ledger.PeerLedgerProvider diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go index 81abab9af53..54d4fe48b9f 100644 --- a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go +++ b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go @@ -224,7 +224,7 @@ func (c *committer) commitUpdates() error { errorString := fmt.Sprintf("error saving document ID: %v. Error: %s, Reason: %s", resp.ID, resp.Error, resp.Reason) - logger.Errorf(errorString) + logger.Error(errorString) return errors.WithMessage(err, errorString) } } diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go index d2708ce4a6e..ade7495f108 100644 --- a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go +++ b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go @@ -645,7 +645,7 @@ func createAttachmentPart(couchDoc *couchDoc) (bytes.Buffer, string, error) { return *writeBuffer, "", errors.Wrap(err, "error marshalling json data") } - couchdbLogger.Debugf(string(filesForUpload)) + couchdbLogger.Debug(string(filesForUpload)) // create the header for the JSON header := make(textproto.MIMEHeader) diff --git a/core/peer/deliverevents.go b/core/peer/deliverevents.go index dc4eb654e9a..4d9d2c21b37 100644 --- a/core/peer/deliverevents.go +++ b/core/peer/deliverevents.go @@ -336,7 +336,7 @@ func toFilteredBlock(block *common.Block) (*peer.FilteredBlock, error) { filteredTransaction.Data, err = transactionActions(tx.Actions).toFilteredActions() if err != nil { - logger.Errorf(err.Error()) + logger.Error(err.Error()) return nil, err } } diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst index 8c647d7efba..7de16ca926c 100644 --- a/docs/source/dev-setup/devenv.rst +++ b/docs/source/dev-setup/devenv.rst @@ -47,7 +47,7 @@ Go and SoftHSM are also available from Homebrew, but make sure you install the a :: - brew install go@1.23 + brew install go@1.24 brew install softhsm Docker Desktop must be launched to complete the installation, so be sure to open diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md index 4f1d6f9a04a..04d8459b2dd 100644 --- a/docs/source/prereqs.md +++ b/docs/source/prereqs.md @@ -73,8 +73,8 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org installed (only required if you will be writing Go chaincode or SDK applications). ```shell -brew install go@1.23.6 -go version # => go1.23.6 darwin/amd64 +brew install go@1.24.0 +go version # => go1.24.0 darwin/amd64 ``` ### JQ diff --git a/go.mod b/go.mod index 9f3ef52417e..892bce794d8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric -go 1.23.6 +go 1.24.0 require ( code.cloudfoundry.org/clock v1.15.0 diff --git a/gotools.mk b/gotools.mk index 447c4b31915..9cf5fe438f6 100644 --- a/gotools.mk +++ b/gotools.mk @@ -21,7 +21,7 @@ go.fqp.misspell := github.com/client9/misspell/cmd/misspell go.fqp.mockery := github.com/vektra/mockery/v2 go.fqp.protoc-gen-go := google.golang.org/protobuf/cmd/protoc-gen-go go.fqp.protoc-gen-go-grpc := google.golang.org/grpc/cmd/protoc-gen-go-grpc -go.fqp.staticcheck := honnef.co/go/tools/cmd/staticcheck@2024.1.1 +go.fqp.staticcheck := honnef.co/go/tools/cmd/staticcheck@2025.1 go.fqp.swagger := github.com/go-swagger/go-swagger/cmd/swagger .PHONY: gotools-install diff --git a/integration/chaincode/module/go.mod b/integration/chaincode/module/go.mod index 18485df454e..2148215d460 100644 --- a/integration/chaincode/module/go.mod +++ b/integration/chaincode/module/go.mod @@ -1,6 +1,6 @@ module module -go 1.23 +go 1.24 require ( github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0-20240802023949-a356b32676fd diff --git a/msp/mgmt/mgmt.go b/msp/mgmt/mgmt.go index cec0a3667a6..160cbfc307b 100644 --- a/msp/mgmt/mgmt.go +++ b/msp/mgmt/mgmt.go @@ -98,7 +98,7 @@ func loadLocalMSP(bccsp bccsp.BCCSP) msp.MSP { newOpts, found := msp.Options[mspType] if !found { - mspLogger.Panicf("msp type " + mspType + " unknown") + mspLogger.Panicf("msp type %s unknown", mspType) } mspInst, err := msp.New(newOpts, bccsp) diff --git a/orderer/consensus/etcdraft/chain.go b/orderer/consensus/etcdraft/chain.go index 3d4bef1e1d1..8235fff3545 100644 --- a/orderer/consensus/etcdraft/chain.go +++ b/orderer/consensus/etcdraft/chain.go @@ -599,7 +599,7 @@ func (c *Chain) forwardToLeader(lead uint64, req *orderer.SubmitRequest) error { } if atomicErr.Load() != nil { - return errors.Errorf(atomicErr.Load().(string)) + return errors.New(atomicErr.Load().(string)) } return nil } diff --git a/tools/go.mod b/tools/go.mod index 6e8e44841b8..a9912964484 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.23.6 +go 1.24.0 require ( github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737 @@ -12,15 +12,15 @@ require ( github.com/onsi/ginkgo/v2 v2.20.2 github.com/vektra/mockery/v2 v2.45.0 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.24.0 + golang.org/x/tools v0.30.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 google.golang.org/protobuf v1.34.2 - honnef.co/go/tools v0.4.7 + honnef.co/go/tools v0.6.0 mvdan.cc/gofumpt v0.1.0 ) require ( - github.com/BurntSushi/toml v1.2.1 // indirect + github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect @@ -71,13 +71,13 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/toqueteos/webbrowser v1.2.0 // indirect go.mongodb.org/mongo-driver v1.5.1 // indirect - golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect + golang.org/x/mod v0.23.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/term v0.29.0 // indirect + golang.org/x/text v0.22.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/go.sum b/tools/go.sum index 12e850e0613..5a15682f64f 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -14,8 +14,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737 h1:JZHBkt0GhM+ARQykshqpI49yaWCHQbJonH3XpDTwMZQ= github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737/go.mod h1:w1KSuh2JgIL3nyRiZijboSUwbbxOrTzWwyWVFUHtXBQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -481,8 +481,8 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= -golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ= +golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -501,8 +501,8 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -527,8 +527,8 @@ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -542,8 +542,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -570,17 +570,17 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -612,8 +612,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -693,8 +693,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= -honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.6.0 h1:TAODvD3knlq75WCp2nyGJtT4LeRV/o7NN9nYPeVJXf8= +honnef.co/go/tools v0.6.0/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4= mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vagrant/golang.sh b/vagrant/golang.sh index 3e028996db4..101b0b71637 100644 --- a/vagrant/golang.sh +++ b/vagrant/golang.sh @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 GOROOT='/opt/go' -GO_VERSION=1.23.6 +GO_VERSION=1.24.0 # ---------------------------------------------------------------- # Install Golang