luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "hashicorp/go-msgpack v2 (#16810)" (#17047) 

This reverts commit 8a98520d56eed3848096734487d8bd3eb9162a65.
This commit is contained in:
Luiz Aoqui 2023-05-01 17:18:34 -04:00 committed by GitHub
parent 86f6a38867
commit 7b5a8f1fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 98 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -138,7 +138,7 @@ deps: ## Install build and development dependencies
go install gotest.tools/gotestsum@v1.10.0
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/v2/codec/codecgen@v2.0.0
go install github.com/hashicorp/go-msgpack/codec/codecgen@v1.1.5
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

2
client/agent_endpoint.go
View File

@ -10,7 +10,7 @@ import (
"io"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/command/agent/host"
"github.com/hashicorp/nomad/command/agent/monitor"

2
client/agent_endpoint_test.go
View File

@ -12,7 +12,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client/config"

2
client/alloc_endpoint.go
View File

@ -12,7 +12,7 @@ import (
"time"
"github.com/armon/go-metrics"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/helper/pointer"

2
client/alloc_endpoint_test.go
View File

@ -13,7 +13,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client/config"

2
client/fs_endpoint.go
View File

@ -19,7 +19,7 @@ import (
"time"
metrics "github.com/armon/go-metrics"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hpcloud/tail/watch"
"github.com/hashicorp/nomad/acl"

2
client/fs_endpoint_test.go
View File

@ -18,7 +18,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client/allocdir"

2
client/rpc.go
View File

@ -12,7 +12,7 @@ import (
"time"
metrics "github.com/armon/go-metrics"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/client/servers"
"github.com/hashicorp/nomad/helper"
inmem "github.com/hashicorp/nomad/helper/codec"

2
client/state/upgrade.go
View File

@ -10,7 +10,7 @@ import (
"os"
hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/client/dynamicplugins"
"github.com/hashicorp/nomad/helper/boltdd"
"github.com/hashicorp/nomad/nomad/structs"

2
client/structs/structs.go
View File

@ -3,7 +3,7 @@
package structs
//go:generate codecgen -c github.com/hashicorp/go-msgpack/v2/codec -st codec -d 102 -t codegen_generated -o structs.generated.go structs.go
//go:generate codecgen -c github.com/hashicorp/go-msgpack/codec -st codec -d 102 -t codegen_generated -o structs.generated.go structs.go
import (
"errors"

2
client/testutil/rpc.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/require"

2
command/agent/agent_endpoint.go
View File

@ -18,7 +18,7 @@ import (
"github.com/docker/docker/pkg/ioutils"
log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/api"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/command/agent/host"

2
command/agent/agent_endpoint_test.go
View File

@ -22,7 +22,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/ci"

2
command/agent/alloc_endpoint.go
View File

@ -15,7 +15,7 @@ import (
"github.com/golang/snappy"
"github.com/gorilla/websocket"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/plugins/drivers"

2
command/agent/event_endpoint.go
View File

@ -15,7 +15,7 @@ import (
"strings"
"github.com/docker/docker/pkg/ioutils"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
"golang.org/x/sync/errgroup"
)

2
command/agent/fs_endpoint.go
View File

@ -14,7 +14,7 @@ import (
"strings"
"github.com/docker/docker/pkg/ioutils"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/nomad/structs"
)

2
command/agent/http.go
View File

@ -25,7 +25,7 @@ import (
"github.com/gorilla/websocket"
"github.com/hashicorp/go-connlimit"
log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
multierror "github.com/hashicorp/go-multierror"
"github.com/rs/cors"
"golang.org/x/time/rate"

2
command/agent/http_test.go
View File

@ -21,7 +21,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/ci"

2
command/agent/operator_endpoint.go
View File

@ -13,7 +13,7 @@ import (
"strings"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/raft"
"github.com/hashicorp/nomad/api"

2
command/data_format.go
View File

@ -9,7 +9,7 @@ import (
"text/template"
"github.com/Masterminds/sprig/v3"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
var (

5
go.mod
View File

@ -54,7 +54,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/v2 v2.0.0
github.com/hashicorp/go-msgpack v1.1.5
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
@ -70,7 +70,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/v2 v2.0.0
github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69
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
@ -202,7 +202,6 @@ 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

9
go.sum
View File

@ -838,10 +838,9 @@ 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/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-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs=
github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
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=
@ -909,8 +908,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/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/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/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=

2
helper/boltdd/boltdd.go
View File

@ -11,7 +11,7 @@ import (
"os"
"sync"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
"go.etcd.io/bbolt"
"golang.org/x/crypto/blake2b"

2
helper/boltdd/boltdd_test.go
View File

@ -9,7 +9,7 @@ import (
"path/filepath"
"testing"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"

2
helper/pluginutils/hclutils/testing.go
View File

@ -6,7 +6,7 @@ package hclutils
import (
"testing"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/ast"
"github.com/hashicorp/nomad/helper/pluginutils/hclspecutils"

2
helper/pluginutils/hclutils/types.go
View File

@ -4,7 +4,7 @@
package hclutils
import (
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
// MapStrInt is a wrapper for map[string]int that handles

2
helper/pluginutils/hclutils/util.go
View File

@ -8,7 +8,7 @@ import (
"errors"
"fmt"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
hcl "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hcldec"
hjson "github.com/hashicorp/hcl/v2/json"

2
helper/pool/pool.go
View File

@ -15,7 +15,7 @@ import (
"time"
hclog "github.com/hashicorp/go-hclog"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/helper"
"github.com/hashicorp/nomad/helper/tlsutil"
"github.com/hashicorp/nomad/nomad/structs"

2
helper/raftutil/msgpack.go
View File

@ -9,7 +9,7 @@ import (
"time"
"unicode"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
)

2
helper/raftutil/msgpack_test.go
View File

@ -9,7 +9,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/require"

2
helper/raftutil/state.go
View File

@ -12,7 +12,7 @@ import (
"strings"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/raft"
raftboltdb "github.com/hashicorp/raft-boltdb/v2"

2
helper/snapshot/snapshot_test.go
View File

@ -16,7 +16,7 @@ import (
"time"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/raft"
"github.com/stretchr/testify/require"

2
nomad/acl_endpoint_test.go
View File

@ -14,7 +14,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/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"
"github.com/hashicorp/nomad/nomad/mock"

2
nomad/acl_test.go
View File

@ -9,7 +9,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"

2
nomad/alloc_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"

2
nomad/client_agent_endpoint.go
View File

@ -22,7 +22,7 @@ import (
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
type Agent struct {

2
nomad/client_agent_endpoint_test.go
View File

@ -14,7 +14,7 @@ import (
"time"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client"

2
nomad/client_alloc_endpoint.go
View File

@ -12,7 +12,7 @@ import (
"github.com/armon/go-metrics"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
cstructs "github.com/hashicorp/nomad/client/structs"

4
nomad/client_alloc_endpoint_test.go
View File

@ -12,8 +12,8 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
"github.com/hashicorp/go-msgpack/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client"

2
nomad/client_csi_endpoint_test.go
View File

@ -10,7 +10,7 @@ import (
"time"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client"
"github.com/hashicorp/nomad/client/config"

2
nomad/client_fs_endpoint.go
View File

@ -16,7 +16,7 @@ import (
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/nomad/structs"
)

4
nomad/client_fs_endpoint_test.go
View File

@ -11,8 +11,8 @@ import (
"testing"
"time"
codec "github.com/hashicorp/go-msgpack/v2/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
codec "github.com/hashicorp/go-msgpack/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client"

4
nomad/client_rpc.go
View File

@ -9,9 +9,9 @@ import (
"net"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
multierror "github.com/hashicorp/go-multierror"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/helper/pool"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/yamux"

2
nomad/client_stats_endpoint_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client"

2
nomad/core_sched_test.go
View File

@ -9,7 +9,7 @@ import (
"time"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/csi_endpoint_test.go
View File

@ -9,7 +9,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/shoenig/test"
"github.com/shoenig/test/must"
"github.com/stretchr/testify/assert"

2
nomad/deployment_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"time"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"

7
nomad/drainer_int_test.go
View File

@ -11,7 +11,10 @@ import (
log "github.com/hashicorp/go-hclog"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/shoenig/test/must"
"github.com/shoenig/test/wait"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/helper/uuid"
@ -20,8 +23,6 @@ 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

2
nomad/encrypter_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/shoenig/test/must"
"github.com/stretchr/testify/require"

2
nomad/eval_broker_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/shoenig/test"
"github.com/shoenig/test/must"
"github.com/shoenig/test/wait"

2
nomad/eval_endpoint_test.go
View File

@ -12,7 +12,7 @@ import (
memdb "github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-set"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/event_endpoint.go
View File

@ -8,7 +8,7 @@ import (
"io"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/nomad/stream"

4
nomad/event_endpoint_test.go
View File

@ -14,8 +14,8 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
"github.com/hashicorp/go-msgpack/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"

2
nomad/fsm.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/go-bexpr"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/helper/uuid"
"github.com/hashicorp/nomad/nomad/state"

2
nomad/fsm_registry_oss.go
View File

@ -7,7 +7,7 @@
package nomad
import (
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/raft"
)

2
nomad/heartbeat_test.go
View File

@ -9,7 +9,7 @@ import (
"time"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"
"github.com/hashicorp/nomad/nomad/mock"

2
nomad/job_endpoint_oss_test.go
View File

@ -10,7 +10,7 @@ import (
"testing"
"github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/command/agent/consul"
"github.com/hashicorp/nomad/helper/pointer"

2
nomad/job_endpoint_test.go
View File

@ -12,7 +12,7 @@ import (
"time"
"github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/pointer"

2
nomad/keyring_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/stretchr/testify/require"
"github.com/hashicorp/nomad/ci"

2
nomad/namespace_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/node_endpoint_test.go
View File

@ -14,7 +14,7 @@ import (
"time"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/command/agent/consul"

2
nomad/operator_endpoint.go
View File

@ -11,7 +11,7 @@ import (
"time"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"

4
nomad/operator_endpoint_test.go
View File

@ -16,8 +16,8 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
"github.com/hashicorp/go-msgpack/codec"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
cstructs "github.com/hashicorp/nomad/client/structs"

2
nomad/periodic_endpoint_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"

2
nomad/plan_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"

2
nomad/plan_normalization_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"

2
nomad/regions_endpoint_test.go
View File

@ -7,7 +7,7 @@ import (
"fmt"
"testing"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/testutil"

2
nomad/rpc.go
View File

@ -21,7 +21,7 @@ import (
"github.com/hashicorp/go-connlimit"
log "github.com/hashicorp/go-hclog"
memdb "github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/helper"
"github.com/hashicorp/nomad/helper/pool"
"github.com/hashicorp/nomad/nomad/state"

4
nomad/rpc_test.go
View File

@ -19,9 +19,9 @@ import (
"time"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/go-sockaddr"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/helper/pool"

2
nomad/scaling_endpoint_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/search_endpoint_test.go
View File

@ -9,7 +9,7 @@ import (
"strings"
"testing"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/server_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/service_registration_endpoint_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"

2
nomad/status_endpoint_test.go
View File

@ -6,7 +6,7 @@ package nomad
import (
"testing"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/helper/uuid"

2
nomad/stream/ndjson.go
View File

@ -9,7 +9,7 @@ import (
"fmt"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/nomad/structs"
)

2
nomad/structs/encoding.go
View File

@ -6,7 +6,7 @@ package structs
import (
"reflect"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
// extendFunc is a mapping from one struct to another, to change the shape of the encoded JSON

2
nomad/structs/generate.sh
View File

@ -6,7 +6,7 @@ set -e
FILES="$(ls ./*.go | grep -v -e _test.go -e .generated.go | tr '\n' ' ')"
codecgen \
-c github.com/hashicorp/go-msgpack/v2/codec \
-c github.com/hashicorp/go-msgpack/codec \
-st codec \
-d 100 \
-t codegen_generated \

2
nomad/structs/handlers.go
View File

@ -4,7 +4,7 @@
package structs
import (
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
var (

2
nomad/structs/structs.go
View File

@ -29,7 +29,7 @@ import (
jwt "github.com/golang-jwt/jwt/v4"
"github.com/hashicorp/cronexpr"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/go-set"
"github.com/hashicorp/go-version"

2
nomad/system_endpoint_test.go
View File

@ -9,7 +9,7 @@ import (
"testing"
memdb "github.com/hashicorp/go-memdb"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/nomad/acl"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/mock"

2
nomad/timetable.go
View File

@ -8,7 +8,7 @@ import (
"sync"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
)
// TimeTable is used to associate a Raft index with a timestamp.

2
nomad/timetable_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/structs"
)

2
nomad/variables_endpoint_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2"
msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/shoenig/test/must"
"github.com/hashicorp/nomad/acl"

2
plugins/base/plugin.go
View File

@ -8,7 +8,7 @@ import (
"context"
"reflect"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
plugin "github.com/hashicorp/go-plugin"
"github.com/hashicorp/nomad/plugins/base/proto"
"google.golang.org/grpc"

2
plugins/drivers/testutils/testing_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
"github.com/hashicorp/go-msgpack/v2/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/plugins/drivers"