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

Fix Request.SecretID -> Request.AuthToken

This commit is contained in:
Michael Schurter 2017-10-13 09:56:56 -07:00
parent 021b4c1ae9
commit 6a1a509ea5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nomad/node_endpoint_test.go
View File

@ -1172,11 +1172,14 @@ func TestClientEndpoint_GetAllocs_ACL(t *testing.T) {
invalidToken := mock.CreatePolicyAndToken(t, state, 1004, "test-invalid", invalidToken := mock.CreatePolicyAndToken(t, state, 1004, "test-invalid",
mock.NamespacePolicy(structs.DefaultNamespace, "", []string{acl.NamespaceCapabilityReadJob})) mock.NamespacePolicy(structs.DefaultNamespace, "", []string{acl.NamespaceCapabilityReadJob}))
// Lookup the node without a token and expect failure
req := &structs.NodeSpecificRequest{ req := &structs.NodeSpecificRequest{
NodeID: node.ID, NodeID: node.ID,
QueryOptions: structs.QueryOptions{Region: "global"}, QueryOptions: structs.QueryOptions{
Region: "global",
},
} }
// Lookup the node without a token and expect failure
{ {
var resp structs.NodeAllocsResponse var resp structs.NodeAllocsResponse
err := msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp) err := msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp)
@ -1185,7 +1188,7 @@ func TestClientEndpoint_GetAllocs_ACL(t *testing.T) {
} }
// Try with a valid token for the default namespace // Try with a valid token for the default namespace
req.SecretID = validDefaultToken.SecretID req.AuthToken = validDefaultToken.SecretID
{ {
var resp structs.NodeAllocsResponse var resp structs.NodeAllocsResponse
assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC") assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC")
@ -1194,7 +1197,7 @@ func TestClientEndpoint_GetAllocs_ACL(t *testing.T) {
} }
// Try with a valid token for a namespace with no allocs on this node // Try with a valid token for a namespace with no allocs on this node
req.SecretID = validNoNSToken.SecretID req.AuthToken = validNoNSToken.SecretID
{ {
var resp structs.NodeAllocsResponse var resp structs.NodeAllocsResponse
assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC") assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC")
@ -1202,7 +1205,7 @@ func TestClientEndpoint_GetAllocs_ACL(t *testing.T) {
} }
// Try with a invalid token // Try with a invalid token
req.SecretID = invalidToken.SecretID req.AuthToken = invalidToken.SecretID
{ {
var resp structs.NodeAllocsResponse var resp structs.NodeAllocsResponse
err := msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp) err := msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp)
@ -1211,7 +1214,7 @@ func TestClientEndpoint_GetAllocs_ACL(t *testing.T) {
} }
// Try with a root token // Try with a root token
req.SecretID = root.SecretID req.AuthToken = root.SecretID
{ {
var resp structs.NodeAllocsResponse var resp structs.NodeAllocsResponse
assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC") assert.Nil(msgpackrpc.CallWithCodec(codec, "Node.GetAllocs", req, &resp), "RPC")