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 )
241 lines
4.7 KiB
Go
241 lines
4.7 KiB
Go
package agent
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
|
"github.com/hashicorp/consul/testutil/retry"
|
|
)
|
|
|
|
func TestValidateUserEventParams(t *testing.T) {
|
|
t.Parallel()
|
|
p := &UserEvent{}
|
|
err := validateUserEventParams(p)
|
|
if err == nil || err.Error() != "User event missing name" {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
p.Name = "foo"
|
|
|
|
p.NodeFilter = "("
|
|
err = validateUserEventParams(p)
|
|
if err == nil || !strings.Contains(err.Error(), "Invalid node filter") {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
p.NodeFilter = ""
|
|
p.ServiceFilter = "("
|
|
err = validateUserEventParams(p)
|
|
if err == nil || !strings.Contains(err.Error(), "Invalid service filter") {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
p.ServiceFilter = "foo"
|
|
p.TagFilter = "("
|
|
err = validateUserEventParams(p)
|
|
if err == nil || !strings.Contains(err.Error(), "Invalid tag filter") {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
p.ServiceFilter = ""
|
|
p.TagFilter = "foo"
|
|
err = validateUserEventParams(p)
|
|
if err == nil || !strings.Contains(err.Error(), "tag filter without service") {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestShouldProcessUserEvent(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
srv1 := &structs.NodeService{
|
|
ID: "mysql",
|
|
Service: "mysql",
|
|
Tags: []string{"test", "foo", "bar", "master"},
|
|
Port: 5000,
|
|
}
|
|
a.state.AddService(srv1, "")
|
|
|
|
p := &UserEvent{}
|
|
if !a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Bad node name
|
|
p = &UserEvent{
|
|
NodeFilter: "foobar",
|
|
}
|
|
if a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Good node name
|
|
p = &UserEvent{
|
|
NodeFilter: "^Node",
|
|
}
|
|
if !a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Bad service name
|
|
p = &UserEvent{
|
|
ServiceFilter: "foobar",
|
|
}
|
|
if a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Good service name
|
|
p = &UserEvent{
|
|
ServiceFilter: ".*sql",
|
|
}
|
|
if !a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Bad tag name
|
|
p = &UserEvent{
|
|
ServiceFilter: ".*sql",
|
|
TagFilter: "slave",
|
|
}
|
|
if a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
|
|
// Good service name
|
|
p = &UserEvent{
|
|
ServiceFilter: ".*sql",
|
|
TagFilter: "master",
|
|
}
|
|
if !a.shouldProcessUserEvent(p) {
|
|
t.Fatalf("bad")
|
|
}
|
|
}
|
|
|
|
func TestIngestUserEvent(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
for i := 0; i < 512; i++ {
|
|
msg := &UserEvent{LTime: uint64(i), Name: "test"}
|
|
a.ingestUserEvent(msg)
|
|
if a.LastUserEvent() != msg {
|
|
t.Fatalf("bad: %#v", msg)
|
|
}
|
|
events := a.UserEvents()
|
|
|
|
expectLen := 256
|
|
if i < 256 {
|
|
expectLen = i + 1
|
|
}
|
|
if len(events) != expectLen {
|
|
t.Fatalf("bad: %d %d %d", i, expectLen, len(events))
|
|
}
|
|
|
|
counter := i
|
|
for j := len(events) - 1; j >= 0; j-- {
|
|
if events[j].LTime != uint64(counter) {
|
|
t.Fatalf("bad: %#v", events)
|
|
}
|
|
counter--
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestFireReceiveEvent(t *testing.T) {
|
|
t.Parallel()
|
|
a := NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
srv1 := &structs.NodeService{
|
|
ID: "mysql",
|
|
Service: "mysql",
|
|
Tags: []string{"test", "foo", "bar", "master"},
|
|
Port: 5000,
|
|
}
|
|
a.state.AddService(srv1, "")
|
|
|
|
p1 := &UserEvent{Name: "deploy", ServiceFilter: "web"}
|
|
err := a.UserEvent("dc1", "root", p1)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
p2 := &UserEvent{Name: "deploy"}
|
|
err = a.UserEvent("dc1", "root", p2)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
retry.Run(t, func(r *retry.R) {
|
|
if got, want := len(a.UserEvents()), 1; got != want {
|
|
r.Fatalf("got %d events want %d", got, want)
|
|
}
|
|
})
|
|
|
|
last := a.LastUserEvent()
|
|
if last.ID != p2.ID {
|
|
t.Fatalf("bad: %#v", last)
|
|
}
|
|
}
|
|
|
|
func TestUserEventToken(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := TestACLConfig()
|
|
cfg.ACLDefaultPolicy = "deny" // Set the default policies to 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 {
|
|
name string
|
|
expect bool
|
|
}
|
|
cases := []tcase{
|
|
{"foo", false},
|
|
{"bar", false},
|
|
{"baz", true},
|
|
{"zip", false},
|
|
}
|
|
for _, c := range cases {
|
|
event := &UserEvent{Name: c.name}
|
|
err := a.UserEvent("dc1", token, event)
|
|
allowed := false
|
|
if err == nil || err.Error() != permissionDenied {
|
|
allowed = true
|
|
}
|
|
if allowed != c.expect {
|
|
t.Fatalf("bad: %#v result: %v", c, allowed)
|
|
}
|
|
}
|
|
}
|
|
|
|
const testEventPolicy = `
|
|
event "foo" {
|
|
policy = "deny"
|
|
}
|
|
event "bar" {
|
|
policy = "read"
|
|
}
|
|
event "baz" {
|
|
policy = "write"
|
|
}
|
|
`
|