diff --git a/GNUmakefile b/GNUmakefile index a570e9d98634..bbf26b58896f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -138,7 +138,7 @@ deps: ## Install build and development dependencies go install gotest.tools/gotestsum@v1.8.2 go install github.com/hashicorp/hcl/v2/cmd/hclfmt@d0c4fa8b0bbc2e4eeccd1ed2a32c2089ed8c5cf1 go install github.com/golang/protobuf/protoc-gen-go@v1.3.4 - go install github.com/hashicorp/go-msgpack/codec/codecgen@v1.1.5 + go install github.com/hashicorp/go-msgpack/v2/codec/codecgen@v2.0.0 go install github.com/bufbuild/buf/cmd/buf@v0.36.0 go install github.com/hashicorp/go-changelog/cmd/changelog-build@latest go install golang.org/x/tools/cmd/stringer@v0.1.12 diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go index 6508fbebe1c7..4e5f7e542c8f 100644 --- a/client/agent_endpoint.go +++ b/client/agent_endpoint.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/command/agent/host" "github.com/hashicorp/nomad/command/agent/monitor" diff --git a/client/agent_endpoint_test.go b/client/agent_endpoint_test.go index 501f80dd7f5b..d8c286f44398 100644 --- a/client/agent_endpoint_test.go +++ b/client/agent_endpoint_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client/config" diff --git a/client/alloc_endpoint.go b/client/alloc_endpoint.go index 4c8dffd71ea0..b1f8983d230c 100644 --- a/client/alloc_endpoint.go +++ b/client/alloc_endpoint.go @@ -9,7 +9,7 @@ import ( "time" "github.com/armon/go-metrics" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/helper/pointer" diff --git a/client/alloc_endpoint_test.go b/client/alloc_endpoint_test.go index 99a818befa59..25fcd452708c 100644 --- a/client/alloc_endpoint_test.go +++ b/client/alloc_endpoint_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client/config" diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go index 3d988520ac4e..d1e800c71a71 100644 --- a/client/fs_endpoint.go +++ b/client/fs_endpoint.go @@ -16,7 +16,7 @@ import ( "time" metrics "github.com/armon/go-metrics" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hpcloud/tail/watch" "github.com/hashicorp/nomad/acl" diff --git a/client/fs_endpoint_test.go b/client/fs_endpoint_test.go index 63c04d91d72d..0526c602271c 100644 --- a/client/fs_endpoint_test.go +++ b/client/fs_endpoint_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client/allocdir" diff --git a/client/rpc.go b/client/rpc.go index 8a5b9a61c13f..6562f3956ef9 100644 --- a/client/rpc.go +++ b/client/rpc.go @@ -9,7 +9,7 @@ import ( "time" metrics "github.com/armon/go-metrics" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/client/servers" "github.com/hashicorp/nomad/helper" inmem "github.com/hashicorp/nomad/helper/codec" diff --git a/client/state/upgrade.go b/client/state/upgrade.go index b2a1394e114c..80f89326cc86 100644 --- a/client/state/upgrade.go +++ b/client/state/upgrade.go @@ -7,7 +7,7 @@ import ( "os" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/client/dynamicplugins" "github.com/hashicorp/nomad/helper/boltdd" "github.com/hashicorp/nomad/nomad/structs" diff --git a/client/structs/structs.go b/client/structs/structs.go index d3b2ab8d09f4..382e881e6069 100644 --- a/client/structs/structs.go +++ b/client/structs/structs.go @@ -1,6 +1,6 @@ package structs -//go:generate codecgen -c github.com/hashicorp/go-msgpack/codec -st codec -d 102 -t codegen_generated -o structs.generated.go structs.go +//go:generate codecgen -c github.com/hashicorp/go-msgpack/v2/codec -st codec -d 102 -t codegen_generated -o structs.generated.go structs.go import ( "errors" diff --git a/client/testutil/rpc.go b/client/testutil/rpc.go index b6d4c66b776a..883ddc1f3258 100644 --- a/client/testutil/rpc.go +++ b/client/testutil/rpc.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/nomad/structs" "github.com/stretchr/testify/require" diff --git a/command/agent/agent_endpoint.go b/command/agent/agent_endpoint.go index 21df7c3b3b2b..6aa4b2047532 100644 --- a/command/agent/agent_endpoint.go +++ b/command/agent/agent_endpoint.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/ioutils" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/api" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/command/agent/host" diff --git a/command/agent/agent_endpoint_test.go b/command/agent/agent_endpoint_test.go index 891ce0148c54..341aff2eb330 100644 --- a/command/agent/agent_endpoint_test.go +++ b/command/agent/agent_endpoint_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" diff --git a/command/agent/alloc_endpoint.go b/command/agent/alloc_endpoint.go index 15b384288833..1488ba0cb60b 100644 --- a/command/agent/alloc_endpoint.go +++ b/command/agent/alloc_endpoint.go @@ -12,7 +12,7 @@ import ( "github.com/golang/snappy" "github.com/gorilla/websocket" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/drivers" diff --git a/command/agent/event_endpoint.go b/command/agent/event_endpoint.go index 94ef925550ed..ebb419e15241 100644 --- a/command/agent/event_endpoint.go +++ b/command/agent/event_endpoint.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/docker/docker/pkg/ioutils" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" "golang.org/x/sync/errgroup" ) diff --git a/command/agent/fs_endpoint.go b/command/agent/fs_endpoint.go index 22be22541732..efbcdb58c177 100644 --- a/command/agent/fs_endpoint.go +++ b/command/agent/fs_endpoint.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/docker/docker/pkg/ioutils" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/command/agent/http.go b/command/agent/http.go index 9c062a53cff9..b75b8abc593e 100644 --- a/command/agent/http.go +++ b/command/agent/http.go @@ -22,7 +22,7 @@ import ( "github.com/gorilla/websocket" "github.com/hashicorp/go-connlimit" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" multierror "github.com/hashicorp/go-multierror" "github.com/rs/cors" "golang.org/x/time/rate" diff --git a/command/agent/http_test.go b/command/agent/http_test.go index 9f31caf51ad1..9f423314192d 100644 --- a/command/agent/http_test.go +++ b/command/agent/http_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" diff --git a/command/agent/operator_endpoint.go b/command/agent/operator_endpoint.go index 4c8d278cd1d6..67c85521ec0d 100644 --- a/command/agent/operator_endpoint.go +++ b/command/agent/operator_endpoint.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/raft" "github.com/hashicorp/nomad/api" diff --git a/command/data_format.go b/command/data_format.go index 9a6141b815fa..2e96c833431d 100644 --- a/command/data_format.go +++ b/command/data_format.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/Masterminds/sprig/v3" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) var ( diff --git a/go.mod b/go.mod index 88917715a1c2..54dc21bab248 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/hashicorp/go-immutable-radix/v2 v2.0.0 github.com/hashicorp/go-kms-wrapping/v2 v2.0.5 github.com/hashicorp/go-memdb v1.3.4 - github.com/hashicorp/go-msgpack v1.1.5 + github.com/hashicorp/go-msgpack/v2 v2.0.0 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-plugin v1.4.9 github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.4 @@ -71,7 +71,7 @@ require ( github.com/hashicorp/hil v0.0.0-20210521165536-27a72121fd40 github.com/hashicorp/logutils v1.0.0 github.com/hashicorp/memberlist v0.5.0 - github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 + github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 github.com/hashicorp/nomad/api v0.0.0-20221006174558-2aa7e66bdb52 github.com/hashicorp/raft v1.3.11 github.com/hashicorp/raft-autopilot v0.1.6 @@ -205,6 +205,7 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-retryablehttp v0.7.0 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect diff --git a/go.sum b/go.sum index 44cb0563478f..3496e174b15b 100644 --- a/go.sum +++ b/go.sum @@ -853,9 +853,10 @@ github.com/hashicorp/go-kms-wrapping/v2 v2.0.5/go.mod h1:sDQAfwJGv25uGPZA04x87ER github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= -github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= +github.com/hashicorp/go-msgpack/v2 v2.0.0 h1:c1fiLq1LNghmLOry1ipGhvLDi+/zEoaEP2JrE1oFJ9s= +github.com/hashicorp/go-msgpack/v2 v2.0.0/go.mod h1:JIxYkkFJRDDRSoWQBSh7s9QAVThq+82iWmUpmE4jKak= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= @@ -925,8 +926,8 @@ github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= -github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 h1:lc3c72qGlIMDqQpQH82Y4vaglRMMFdJbziYWriR4UcE= -github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod h1:/z+jUGRBlwVpUZfjute9jWaF6/HuhjuFQuL1YXzVD1Q= +github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 h1:kBpVVl1sl3MaSrs97e0+pDQhSrqJv9gVbSUrPpVfl1w= +github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo= github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= github.com/hashicorp/raft v1.3.11 h1:p3v6gf6l3S797NnK5av3HcczOC1T5CLoaRvg0g9ys4A= diff --git a/helper/boltdd/boltdd.go b/helper/boltdd/boltdd.go index 5b492e097764..e7af787aa5b9 100644 --- a/helper/boltdd/boltdd.go +++ b/helper/boltdd/boltdd.go @@ -8,7 +8,7 @@ import ( "os" "sync" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" "go.etcd.io/bbolt" "golang.org/x/crypto/blake2b" diff --git a/helper/boltdd/boltdd_test.go b/helper/boltdd/boltdd_test.go index 18b057f700b7..f3e1b19a2945 100644 --- a/helper/boltdd/boltdd_test.go +++ b/helper/boltdd/boltdd_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" diff --git a/helper/pluginutils/hclutils/testing.go b/helper/pluginutils/hclutils/testing.go index 49211f010f1b..9612900ad797 100644 --- a/helper/pluginutils/hclutils/testing.go +++ b/helper/pluginutils/hclutils/testing.go @@ -3,7 +3,7 @@ package hclutils import ( "testing" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" diff --git a/helper/pluginutils/hclutils/types.go b/helper/pluginutils/hclutils/types.go index 22593fe46571..0412be08914d 100644 --- a/helper/pluginutils/hclutils/types.go +++ b/helper/pluginutils/hclutils/types.go @@ -1,7 +1,7 @@ package hclutils import ( - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) // MapStrInt is a wrapper for map[string]int that handles diff --git a/helper/pluginutils/hclutils/util.go b/helper/pluginutils/hclutils/util.go index 7cb0ee3e0603..4cd7e69b5666 100644 --- a/helper/pluginutils/hclutils/util.go +++ b/helper/pluginutils/hclutils/util.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" hcl "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" hjson "github.com/hashicorp/hcl/v2/json" diff --git a/helper/pool/pool.go b/helper/pool/pool.go index 8f111b92d710..a399d687a0f7 100644 --- a/helper/pool/pool.go +++ b/helper/pool/pool.go @@ -12,7 +12,7 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/tlsutil" "github.com/hashicorp/nomad/nomad/structs" diff --git a/helper/raftutil/msgpack.go b/helper/raftutil/msgpack.go index f5663dd87099..cd3214530c52 100644 --- a/helper/raftutil/msgpack.go +++ b/helper/raftutil/msgpack.go @@ -6,7 +6,7 @@ import ( "time" "unicode" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/helper/raftutil/msgpack_test.go b/helper/raftutil/msgpack_test.go index 111e08146128..72fc649d107e 100644 --- a/helper/raftutil/msgpack_test.go +++ b/helper/raftutil/msgpack_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/structs" "github.com/stretchr/testify/require" diff --git a/helper/raftutil/state.go b/helper/raftutil/state.go index 4ed6381b3362..953869af422f 100644 --- a/helper/raftutil/state.go +++ b/helper/raftutil/state.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/raft" raftboltdb "github.com/hashicorp/raft-boltdb/v2" diff --git a/helper/snapshot/snapshot_test.go b/helper/snapshot/snapshot_test.go index 98dc6c14a668..2144d3db28c9 100644 --- a/helper/snapshot/snapshot_test.go +++ b/helper/snapshot/snapshot_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/hashicorp/consul/sdk/testutil" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/raft" "github.com/stretchr/testify/require" diff --git a/nomad/acl_endpoint_test.go b/nomad/acl_endpoint_test.go index b806c619295c..e3bc1a2523fb 100644 --- a/nomad/acl_endpoint_test.go +++ b/nomad/acl_endpoint_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang-jwt/jwt/v4" capOIDC "github.com/hashicorp/cap/oidc" "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/mock" diff --git a/nomad/acl_test.go b/nomad/acl_test.go index a350bc2bd921..6436070c5fca 100644 --- a/nomad/acl_test.go +++ b/nomad/acl_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/alloc_endpoint_test.go b/nomad/alloc_endpoint_test.go index 2b48c06b35e7..337d6911a789 100644 --- a/nomad/alloc_endpoint_test.go +++ b/nomad/alloc_endpoint_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/client_agent_endpoint.go b/nomad/client_agent_endpoint.go index 5fb0201e895e..7046f95b2614 100644 --- a/nomad/client_agent_endpoint.go +++ b/nomad/client_agent_endpoint.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) type Agent struct { diff --git a/nomad/client_agent_endpoint_test.go b/nomad/client_agent_endpoint_test.go index 1a7eb75de6a3..2239d1667e0f 100644 --- a/nomad/client_agent_endpoint_test.go +++ b/nomad/client_agent_endpoint_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client" diff --git a/nomad/client_alloc_endpoint.go b/nomad/client_alloc_endpoint.go index 1dbeefe3a3be..c894d103f58e 100644 --- a/nomad/client_alloc_endpoint.go +++ b/nomad/client_alloc_endpoint.go @@ -9,7 +9,7 @@ import ( "github.com/armon/go-metrics" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" cstructs "github.com/hashicorp/nomad/client/structs" diff --git a/nomad/client_alloc_endpoint_test.go b/nomad/client_alloc_endpoint_test.go index 5bd2e2a40ac1..721731c5ec75 100644 --- a/nomad/client_alloc_endpoint_test.go +++ b/nomad/client_alloc_endpoint_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + "github.com/hashicorp/go-msgpack/v2/codec" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client" diff --git a/nomad/client_csi_endpoint_test.go b/nomad/client_csi_endpoint_test.go index 81e8d4e0a504..c0a09e45b31c 100644 --- a/nomad/client_csi_endpoint_test.go +++ b/nomad/client_csi_endpoint_test.go @@ -7,7 +7,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client" "github.com/hashicorp/nomad/client/config" diff --git a/nomad/client_fs_endpoint.go b/nomad/client_fs_endpoint.go index 30f8a5e7297f..1682c58c1e52 100644 --- a/nomad/client_fs_endpoint.go +++ b/nomad/client_fs_endpoint.go @@ -13,7 +13,7 @@ import ( cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/client_fs_endpoint_test.go b/nomad/client_fs_endpoint_test.go index 709e0d77b13a..d870bfb02e2d 100644 --- a/nomad/client_fs_endpoint_test.go +++ b/nomad/client_fs_endpoint_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - codec "github.com/hashicorp/go-msgpack/codec" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + codec "github.com/hashicorp/go-msgpack/v2/codec" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client" diff --git a/nomad/client_rpc.go b/nomad/client_rpc.go index 7c80f801b128..fd0d5a3bf817 100644 --- a/nomad/client_rpc.go +++ b/nomad/client_rpc.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" multierror "github.com/hashicorp/go-multierror" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/helper/pool" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/yamux" diff --git a/nomad/client_stats_endpoint_test.go b/nomad/client_stats_endpoint_test.go index de6da4bece81..85845433771e 100644 --- a/nomad/client_stats_endpoint_test.go +++ b/nomad/client_stats_endpoint_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client" diff --git a/nomad/core_sched_test.go b/nomad/core_sched_test.go index 6eb499df08d8..d478ef9c6546 100644 --- a/nomad/core_sched_test.go +++ b/nomad/core_sched_test.go @@ -6,7 +6,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/csi_endpoint_test.go b/nomad/csi_endpoint_test.go index 60b7368a04e8..ee168a16c552 100644 --- a/nomad/csi_endpoint_test.go +++ b/nomad/csi_endpoint_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/nomad/deployment_endpoint_test.go b/nomad/deployment_endpoint_test.go index b6a0727c58eb..f364587551c3 100644 --- a/nomad/deployment_endpoint_test.go +++ b/nomad/deployment_endpoint_test.go @@ -5,7 +5,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/drainer_int_test.go b/nomad/drainer_int_test.go index 2b3f060438c3..dd65e6d7b925 100644 --- a/nomad/drainer_int_test.go +++ b/nomad/drainer_int_test.go @@ -8,10 +8,7 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" - "github.com/shoenig/test/must" - "github.com/shoenig/test/wait" - + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/helper/uuid" @@ -20,6 +17,8 @@ import ( "github.com/hashicorp/nomad/nomad/state" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" + "github.com/shoenig/test/must" + "github.com/shoenig/test/wait" ) // allocClientStateSimulator simulates the updates in state from the diff --git a/nomad/encrypter_test.go b/nomad/encrypter_test.go index b16e4eae67b6..26cfedc86238 100644 --- a/nomad/encrypter_test.go +++ b/nomad/encrypter_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/nomad/eval_broker_test.go b/nomad/eval_broker_test.go index 2b93e498dd24..68b611dd7078 100644 --- a/nomad/eval_broker_test.go +++ b/nomad/eval_broker_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/nomad/eval_endpoint_test.go b/nomad/eval_endpoint_test.go index 91eff63f72f1..0ba3d05bfac9 100644 --- a/nomad/eval_endpoint_test.go +++ b/nomad/eval_endpoint_test.go @@ -9,7 +9,7 @@ import ( memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-set" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/event_endpoint.go b/nomad/event_endpoint.go index 33c0405f029a..f2cc9835ecc2 100644 --- a/nomad/event_endpoint.go +++ b/nomad/event_endpoint.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/stream" diff --git a/nomad/event_endpoint_test.go b/nomad/event_endpoint_test.go index b0231a485c56..e7b917c7b687 100644 --- a/nomad/event_endpoint_test.go +++ b/nomad/event_endpoint_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + "github.com/hashicorp/go-msgpack/v2/codec" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/fsm.go b/nomad/fsm.go index 03a76b633003..0440e50fe3b6 100644 --- a/nomad/fsm.go +++ b/nomad/fsm.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-bexpr" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/fsm_registry_oss.go b/nomad/fsm_registry_oss.go index c1a18750fdf8..e17c24fb8b85 100644 --- a/nomad/fsm_registry_oss.go +++ b/nomad/fsm_registry_oss.go @@ -4,7 +4,7 @@ package nomad import ( - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/raft" ) diff --git a/nomad/heartbeat_test.go b/nomad/heartbeat_test.go index 58879cf9a142..66a3182e8aba 100644 --- a/nomad/heartbeat_test.go +++ b/nomad/heartbeat_test.go @@ -6,7 +6,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/mock" diff --git a/nomad/job_endpoint_oss_test.go b/nomad/job_endpoint_oss_test.go index 446abe5d1910..72ce57401f83 100644 --- a/nomad/job_endpoint_oss_test.go +++ b/nomad/job_endpoint_oss_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent/consul" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/job_endpoint_test.go b/nomad/job_endpoint_test.go index d8eef6b105f3..a9cd91f53c77 100644 --- a/nomad/job_endpoint_test.go +++ b/nomad/job_endpoint_test.go @@ -9,7 +9,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" diff --git a/nomad/keyring_endpoint_test.go b/nomad/keyring_endpoint_test.go index 88d55bb8f43a..8294e0729777 100644 --- a/nomad/keyring_endpoint_test.go +++ b/nomad/keyring_endpoint_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/stretchr/testify/require" "github.com/hashicorp/nomad/ci" diff --git a/nomad/namespace_endpoint_test.go b/nomad/namespace_endpoint_test.go index 23645492a9f1..456cd191577e 100644 --- a/nomad/namespace_endpoint_test.go +++ b/nomad/namespace_endpoint_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/node_endpoint_test.go b/nomad/node_endpoint_test.go index 2793f83c9d7f..ffa8781be132 100644 --- a/nomad/node_endpoint_test.go +++ b/nomad/node_endpoint_test.go @@ -11,7 +11,7 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent/consul" diff --git a/nomad/operator_endpoint.go b/nomad/operator_endpoint.go index 0aa66b2981b1..726cd5d7bf9f 100644 --- a/nomad/operator_endpoint.go +++ b/nomad/operator_endpoint.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" diff --git a/nomad/operator_endpoint_test.go b/nomad/operator_endpoint_test.go index f4a4d17af15c..7cb8bb42bd3d 100644 --- a/nomad/operator_endpoint_test.go +++ b/nomad/operator_endpoint_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + "github.com/hashicorp/go-msgpack/v2/codec" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" cstructs "github.com/hashicorp/nomad/client/structs" diff --git a/nomad/periodic_endpoint_test.go b/nomad/periodic_endpoint_test.go index 2fb2a38cb792..a7fac2b4514b 100644 --- a/nomad/periodic_endpoint_test.go +++ b/nomad/periodic_endpoint_test.go @@ -4,7 +4,7 @@ import ( "testing" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" diff --git a/nomad/plan_endpoint_test.go b/nomad/plan_endpoint_test.go index c36cb4f1989d..e06ef2c9369d 100644 --- a/nomad/plan_endpoint_test.go +++ b/nomad/plan_endpoint_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/plan_normalization_test.go b/nomad/plan_normalization_test.go index 6dbe18b22bf7..44710b6c010e 100644 --- a/nomad/plan_normalization_test.go +++ b/nomad/plan_normalization_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" diff --git a/nomad/regions_endpoint_test.go b/nomad/regions_endpoint_test.go index 97c7d1b04b8e..2938a045f8cf 100644 --- a/nomad/regions_endpoint_test.go +++ b/nomad/regions_endpoint_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" diff --git a/nomad/rpc.go b/nomad/rpc.go index 500c4d72ba56..da02d6a2701c 100644 --- a/nomad/rpc.go +++ b/nomad/rpc.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/go-connlimit" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/pool" "github.com/hashicorp/nomad/nomad/state" diff --git a/nomad/rpc_test.go b/nomad/rpc_test.go index a4548ada1cbd..bc48e28c3b84 100644 --- a/nomad/rpc_test.go +++ b/nomad/rpc_test.go @@ -16,9 +16,9 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/go-sockaddr" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/helper/pool" diff --git a/nomad/scaling_endpoint_test.go b/nomad/scaling_endpoint_test.go index 673d3be14355..9b67165f4719 100644 --- a/nomad/scaling_endpoint_test.go +++ b/nomad/scaling_endpoint_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/search_endpoint_test.go b/nomad/search_endpoint_test.go index 071520ca5298..6bd575a9de9f 100644 --- a/nomad/search_endpoint_test.go +++ b/nomad/search_endpoint_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/server_test.go b/nomad/server_test.go index 429aac4153e9..a874a95cdd3a 100644 --- a/nomad/server_test.go +++ b/nomad/server_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/service_registration_endpoint_test.go b/nomad/service_registration_endpoint_test.go index 448e68377668..515e2272788c 100644 --- a/nomad/service_registration_endpoint_test.go +++ b/nomad/service_registration_endpoint_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" diff --git a/nomad/status_endpoint_test.go b/nomad/status_endpoint_test.go index e7eb6901c645..4973268606b3 100644 --- a/nomad/status_endpoint_test.go +++ b/nomad/status_endpoint_test.go @@ -3,7 +3,7 @@ package nomad import ( "testing" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" diff --git a/nomad/stream/ndjson.go b/nomad/stream/ndjson.go index c3ea3e7ddb00..b3af6e8e5421 100644 --- a/nomad/stream/ndjson.go +++ b/nomad/stream/ndjson.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/structs/encoding.go b/nomad/structs/encoding.go index e8c4c32c0ac0..06d46145b8e7 100644 --- a/nomad/structs/encoding.go +++ b/nomad/structs/encoding.go @@ -3,7 +3,7 @@ package structs import ( "reflect" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) // extendFunc is a mapping from one struct to another, to change the shape of the encoded JSON diff --git a/nomad/structs/generate.sh b/nomad/structs/generate.sh index 8e253fd92f6f..fbbcd40588cc 100755 --- a/nomad/structs/generate.sh +++ b/nomad/structs/generate.sh @@ -3,7 +3,7 @@ set -e FILES="$(ls ./*.go | grep -v -e _test.go -e .generated.go | tr '\n' ' ')" codecgen \ - -c github.com/hashicorp/go-msgpack/codec \ + -c github.com/hashicorp/go-msgpack/v2/codec \ -st codec \ -d 100 \ -t codegen_generated \ diff --git a/nomad/structs/handlers.go b/nomad/structs/handlers.go index 5ef0a9689d58..db478ba7d8b4 100644 --- a/nomad/structs/handlers.go +++ b/nomad/structs/handlers.go @@ -1,7 +1,7 @@ package structs import ( - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) var ( diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index 237a6f104ea5..de080afeeb0f 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -26,7 +26,7 @@ import ( jwt "github.com/golang-jwt/jwt/v4" "github.com/hashicorp/cronexpr" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set" "github.com/hashicorp/go-version" diff --git a/nomad/system_endpoint_test.go b/nomad/system_endpoint_test.go index d0651a121227..2117d4826cb6 100644 --- a/nomad/system_endpoint_test.go +++ b/nomad/system_endpoint_test.go @@ -6,7 +6,7 @@ import ( "testing" memdb "github.com/hashicorp/go-memdb" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" diff --git a/nomad/timetable.go b/nomad/timetable.go index 36076ce4adb5..672dfc2a8687 100644 --- a/nomad/timetable.go +++ b/nomad/timetable.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" ) // TimeTable is used to associate a Raft index with a timestamp. diff --git a/nomad/timetable_test.go b/nomad/timetable_test.go index eeacd08f06d5..c3e00b314213 100644 --- a/nomad/timetable_test.go +++ b/nomad/timetable_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/nomad/variables_endpoint_test.go b/nomad/variables_endpoint_test.go index 15d45d822211..529989fe970a 100644 --- a/nomad/variables_endpoint_test.go +++ b/nomad/variables_endpoint_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" + msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/shoenig/test/must" "github.com/hashicorp/nomad/acl" diff --git a/plugins/base/plugin.go b/plugins/base/plugin.go index 735dfd43f7ed..f9549b7cc8e3 100644 --- a/plugins/base/plugin.go +++ b/plugins/base/plugin.go @@ -5,7 +5,7 @@ import ( "context" "reflect" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/plugins/base/proto" "google.golang.org/grpc" diff --git a/plugins/drivers/testutils/testing_test.go b/plugins/drivers/testutils/testing_test.go index cd368a3bd2a1..9d6e22ea5a6a 100644 --- a/plugins/drivers/testutils/testing_test.go +++ b/plugins/drivers/testutils/testing_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/go-msgpack/codec" + "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/drivers"