cd837b0b18
command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )
334 lines
7.2 KiB
Go
334 lines
7.2 KiB
Go
package agent
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
|
"github.com/hashicorp/consul/testutil/retry"
|
|
)
|
|
|
|
func TestEventFire(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
body := bytes.NewBuffer([]byte("test"))
|
|
url := "/v1/event/fire/test?node=Node&service=foo&tag=bar"
|
|
req, _ := http.NewRequest("PUT", url, body)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventFire(resp, req)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
event, ok := obj.(*UserEvent)
|
|
if !ok {
|
|
t.Fatalf("bad: %#v", obj)
|
|
}
|
|
|
|
if event.ID == "" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
if event.Name != "test" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
if string(event.Payload) != "test" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
if event.NodeFilter != "Node" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
if event.ServiceFilter != "foo" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
if event.TagFilter != "bar" {
|
|
t.Fatalf("bad: %#v", event)
|
|
}
|
|
}
|
|
|
|
func TestEventFire_token(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := TestACLConfig()
|
|
cfg.ACLDefaultPolicy = "deny"
|
|
a := NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
// Create an ACL token
|
|
args := structs.ACLRequest{
|
|
Datacenter: "dc1",
|
|
Op: structs.ACLSet,
|
|
ACL: structs.ACL{
|
|
Name: "User token",
|
|
Type: structs.ACLTypeClient,
|
|
Rules: testEventPolicy,
|
|
},
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
}
|
|
var token string
|
|
if err := a.RPC("ACL.Apply", &args, &token); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
type tcase struct {
|
|
event string
|
|
allowed bool
|
|
}
|
|
tcases := []tcase{
|
|
{"foo", false},
|
|
{"bar", false},
|
|
{"baz", true},
|
|
}
|
|
for _, c := range tcases {
|
|
// Try to fire the event over the HTTP interface
|
|
url := fmt.Sprintf("/v1/event/fire/%s?token=%s", c.event, token)
|
|
req, _ := http.NewRequest("PUT", url, nil)
|
|
resp := httptest.NewRecorder()
|
|
if _, err := a.srv.EventFire(resp, req); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
|
|
// Check the result
|
|
body := resp.Body.String()
|
|
if c.allowed {
|
|
if strings.Contains(body, permissionDenied) {
|
|
t.Fatalf("bad: %s", body)
|
|
}
|
|
if resp.Code != 200 {
|
|
t.Fatalf("bad: %d", resp.Code)
|
|
}
|
|
} else {
|
|
if !strings.Contains(body, permissionDenied) {
|
|
t.Fatalf("bad: %s", body)
|
|
}
|
|
if resp.Code != 403 {
|
|
t.Fatalf("bad: %d", resp.Code)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEventList(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
p := &UserEvent{Name: "test"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
req, _ := http.NewRequest("GET", "/v1/event/list", nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 1 || list[0].Name != "test" {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
header := resp.Header().Get("X-Consul-Index")
|
|
if header == "" || header == "0" {
|
|
r.Fatalf("bad: %#v", header)
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestEventList_Filter(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
p := &UserEvent{Name: "test"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
p = &UserEvent{Name: "foo"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
req, _ := http.NewRequest("GET", "/v1/event/list?name=foo", nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 1 || list[0].Name != "foo" {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
header := resp.Header().Get("X-Consul-Index")
|
|
if header == "" || header == "0" {
|
|
r.Fatalf("bad: %#v", header)
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestEventList_ACLFilter(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), TestACLConfig())
|
|
defer a.Shutdown()
|
|
|
|
// Fire an event.
|
|
p := &UserEvent{Name: "foo"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
t.Run("no token", func(t *testing.T) {
|
|
retry.Run(t, func(r *retry.R) {
|
|
req, _ := http.NewRequest("GET", "/v1/event/list", nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 0 {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
})
|
|
})
|
|
|
|
t.Run("root token", func(t *testing.T) {
|
|
retry.Run(t, func(r *retry.R) {
|
|
req, _ := http.NewRequest("GET", "/v1/event/list?token=root", nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 1 || list[0].Name != "foo" {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
func TestEventList_Blocking(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
p := &UserEvent{Name: "test"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
var index string
|
|
retry.Run(t, func(r *retry.R) {
|
|
req, _ := http.NewRequest("GET", "/v1/event/list", nil)
|
|
resp := httptest.NewRecorder()
|
|
if _, err := a.srv.EventList(resp, req); err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
header := resp.Header().Get("X-Consul-Index")
|
|
if header == "" || header == "0" {
|
|
r.Fatalf("bad: %#v", header)
|
|
}
|
|
index = header
|
|
})
|
|
|
|
go func() {
|
|
time.Sleep(50 * time.Millisecond)
|
|
p := &UserEvent{Name: "second"}
|
|
if err := a.UserEvent("dc1", "root", p); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}()
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
url := "/v1/event/list?index=" + index
|
|
req, _ := http.NewRequest("GET", url, nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 2 || list[1].Name != "second" {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestEventList_EventBufOrder(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
// Fire some events in a non-sequential order
|
|
expected := &UserEvent{Name: "foo"}
|
|
|
|
for _, e := range []*UserEvent{
|
|
&UserEvent{Name: "foo"},
|
|
&UserEvent{Name: "bar"},
|
|
&UserEvent{Name: "foo"},
|
|
expected,
|
|
&UserEvent{Name: "bar"},
|
|
} {
|
|
if err := a.UserEvent("dc1", "root", e); err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}
|
|
// Test that the event order is preserved when name
|
|
// filtering on a list of > 1 matching event.
|
|
retry.Run(t, func(r *retry.R) {
|
|
url := "/v1/event/list?name=foo"
|
|
req, _ := http.NewRequest("GET", url, nil)
|
|
resp := httptest.NewRecorder()
|
|
obj, err := a.srv.EventList(resp, req)
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
list, ok := obj.([]*UserEvent)
|
|
if !ok {
|
|
r.Fatalf("bad: %#v", obj)
|
|
}
|
|
if len(list) != 3 || list[2].ID != expected.ID {
|
|
r.Fatalf("bad: %#v", list)
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestUUIDToUint64(t *testing.T) {
|
|
t.Parallel()
|
|
inp := "cb9a81ad-fff6-52ac-92a7-5f70687805ec"
|
|
|
|
// Output value was computed using python
|
|
if uuidToUint64(inp) != 6430540886266763072 {
|
|
t.Fatalf("bad")
|
|
}
|
|
}
|