pkg refactor

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
)

GNUmakefile

@@ -48,8 +48,8 @@ cov:
 
 test: dev
 	go test -tags "$(GOTAGS)" -i -run '^$$' ./...
-	go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep -v '(consul/consul|vendor)') > test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
+	go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep -v '(agent/consul|vendor)') > test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
-	go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep '(consul/consul)') >> test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
+	go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep '(agent/consul)') >> test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
 	@if [ "$$TRAVIS" == "true" ] ; then cat test.log ; fi
 	@if grep -q 'FAIL_TOKEN' test.log ; then grep 'FAIL:' test.log ; exit 1 ; else echo 'PASS' ; fi
 

agent/acl.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/golang-lru"
 	"github.com/hashicorp/serf/serf"

agent/acl_endpoint.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 // aclCreateResponse is used to wrap the ACL ID

agent/acl_endpoint_test.go

@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 func makeTestACL(t *testing.T, srv *HTTPServer) string {

agent/acl_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	rawacl "github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/serf/serf"
@@ -22,7 +22,7 @@ func TestACL_Bad_Config(t *testing.T) {
 
 	// do not use TestAgent here since we want
 	// the agent to fail during startup.
-	_, err := NewAgent(cfg)
+	_, err := New(cfg)
 	if err == nil || !strings.Contains(err.Error(), "invalid ACL down policy") {
 		t.Fatalf("err: %v", err)
 	}

agent/agent.go

@@ -21,10 +21,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul"
+	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul"
-	"github.com/hashicorp/consul/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logger"
@@ -169,7 +169,7 @@ type Agent struct {
 	wgServers sync.WaitGroup
 }
 
-func NewAgent(c *Config) (*Agent, error) {
+func New(c *Config) (*Agent, error) {
 	if c.Datacenter == "" {
 		return nil, fmt.Errorf("Must configure a Datacenter")
 	}
@@ -1029,8 +1029,8 @@ func (a *Agent) setupNodeID(config *Config) error {
 
 // setupKeyrings is used to initialize and load keyrings during agent startup
 func (a *Agent) setupKeyrings(config *consul.Config) error {
-	fileLAN := filepath.Join(a.config.DataDir, serfLANKeyring)
+	fileLAN := filepath.Join(a.config.DataDir, SerfLANKeyring)
-	fileWAN := filepath.Join(a.config.DataDir, serfWANKeyring)
+	fileWAN := filepath.Join(a.config.DataDir, SerfWANKeyring)
 
 	if a.config.EncryptKey == "" {
 		goto LOAD

agent/agent_endpoint.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/logger"
 	"github.com/hashicorp/consul/types"

agent/agent_endpoint_test.go

@@ -13,8 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/logger"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/consul/types"

agent/agent_test.go

@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/consul/version"

agent/catalog_endpoint.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 func (s *HTTPServer) CatalogRegister(resp http.ResponseWriter, req *http.Request) (interface{}, error) {

agent/catalog_endpoint_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/serf/coordinate"
 )

agent/check.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/armon/circbuf"
 	docker "github.com/fsouza/go-dockerclient"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-cleanhttp"

agent/check_test.go

@@ -17,8 +17,8 @@ import (
 	"time"
 
 	docker "github.com/fsouza/go-dockerclient"
+	"github.com/hashicorp/consul/agent/mock"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/agent/mock"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/consul/types"
 )

agent/config.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/consul/consul"
+	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
@@ -1006,9 +1006,9 @@ func (c *Config) GetTokenForAgent() string {
 	return ""
 }
 
-// verifyUniqueListeners checks to see if an address was used more than once in
+// VerifyUniqueListeners checks to see if an address was used more than once in
 // the config
-func (c *Config) verifyUniqueListeners() error {
+func (c *Config) VerifyUniqueListeners() error {
 	listeners := []struct {
 		host  string
 		port  int

agent/config_test.go

@@ -1207,7 +1207,7 @@ func TestDecodeConfig_VerifyUniqueListeners(t *testing.T) {
 				t.Fatalf("got error %v want nil", err)
 			}
 
-			err = c.verifyUniqueListeners()
+			err = c.VerifyUniqueListeners()
 			if got, want := err, tt.err; !reflect.DeepEqual(got, want) {
 				t.Fatalf("got error %v want %v", got, want)
 			}

agent/consul/acl.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/golang-lru"
 )
 

agent/consul/acl_endpoint.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/go-uuid"
 )

agent/consul/acl_endpoint_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"

agent/consul/acl_replication.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 )
 

agent/consul/acl_replication_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 )

agent/consul/acl_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 )

agent/consul/agent/server_test.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/serf/serf"
 )
 

agent/consul/autopilot.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"

agent/consul/catalog_endpoint.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-memdb"

agent/consul/catalog_endpoint_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"

agent/consul/client.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/servers"
+	"github.com/hashicorp/consul/agent/consul/servers"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/serf/coordinate"
 	"github.com/hashicorp/serf/serf"

agent/consul/client_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/testutil/retry"

agent/consul/config.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/memberlist"

agent/consul/coordinate_endpoint.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/serf/coordinate"
 )

agent/consul/coordinate_endpoint_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/filter.go

@@ -2,7 +2,7 @@ package consul
 
 import (
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 type dirEntFilter struct {

agent/consul/filter_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 func TestFilter_DirEnt(t *testing.T) {

agent/consul/flood.go

@@ -3,7 +3,7 @@ package consul
 import (
 	"time"
 
-	"github.com/hashicorp/consul/consul/servers"
+	"github.com/hashicorp/consul/agent/consul/servers"
 	"github.com/hashicorp/serf/serf"
 )
 

agent/consul/fsm.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
+	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/hashicorp/raft"
 )

agent/consul/fsm_test.go

@@ -9,9 +9,9 @@ import (
 
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-uuid"

agent/consul/health_endpoint.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 )
 

agent/consul/health_endpoint_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/internal_endpoint.go

@@ -3,8 +3,8 @@ package consul
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/serf/serf"
 )

agent/consul/internal_endpoint_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/issue_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 )
 
 // Testing for GH-300 and GH-279

agent/consul/kvs_endpoint.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/go-memdb"
 )
 

agent/consul/kvs_endpoint_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"
 )

agent/consul/leader.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
+	"github.com/hashicorp/consul/agent/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/agent"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"

agent/consul/leader_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/merge.go

@@ -3,7 +3,7 @@ package consul
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/serf/serf"
 )

agent/consul/operator_autopilot_endpoint.go

@@ -3,7 +3,7 @@ package consul
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 // AutopilotGetConfiguration is used to retrieve the current Autopilot configuration.

agent/consul/operator_autopilot_endpoint_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/operator_raft_endpoint.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"
 )

agent/consul/operator_raft_endpoint_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"
 	"github.com/hashicorp/raft"

agent/consul/pool.go

@@ -10,7 +10,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/net-rpc-msgpackrpc"
 	"github.com/hashicorp/yamux"

agent/consul/prepared_query/template.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/hil"
 	"github.com/hashicorp/hil/ast"
 	"github.com/mitchellh/copystructure"

agent/consul/prepared_query/template_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/mitchellh/copystructure"
 )
 

agent/consul/prepared_query/walk_test.go

@@ -5,8 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
 	"sort"
+
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 func TestWalk_ServiceQuery(t *testing.T) {

agent/consul/prepared_query_endpoint.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/go-uuid"
 )

agent/consul/prepared_query_endpoint_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/rpc.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/memberlist"

agent/consul/rpc_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/rtt.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/serf/coordinate"
 )

agent/consul/rtt_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/serf.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"
 )

agent/consul/server.go

@@ -17,10 +17,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/servers"
+	"github.com/hashicorp/consul/agent/consul/servers"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"

agent/consul/server_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/testutil/retry"
@@ -22,9 +22,9 @@ func getPort() int {
 }
 
 func configureTLS(config *Config) {
-	config.CAFile = "../test/ca/root.cer"
+	config.CAFile = "../../test/ca/root.cer"
-	config.CertFile = "../test/key/ourdomain.cer"
+	config.CertFile = "../../test/key/ourdomain.cer"
-	config.KeyFile = "../test/key/ourdomain.key"
+	config.KeyFile = "../../test/key/ourdomain.key"
 }
 
 func testServerConfig(t *testing.T, NodeName string) (string, *Config) {
@@ -607,9 +607,9 @@ func TestServer_TLSToNoTLS(t *testing.T) {
 	// Add a second server with TLS configured
 	dir2, s2 := testServerWithConfig(t, func(c *Config) {
 		c.Bootstrap = false
-		c.CAFile = "../test/client_certs/rootca.crt"
+		c.CAFile = "../../test/client_certs/rootca.crt"
-		c.CertFile = "../test/client_certs/server.crt"
+		c.CertFile = "../../test/client_certs/server.crt"
-		c.KeyFile = "../test/client_certs/server.key"
+		c.KeyFile = "../../test/client_certs/server.key"
 	})
 	defer os.RemoveAll(dir2)
 	defer s2.Shutdown()
@@ -634,9 +634,9 @@ func TestServer_TLSForceOutgoingToNoTLS(t *testing.T) {
 	// Add a second server with TLS and VerifyOutgoing set
 	dir2, s2 := testServerWithConfig(t, func(c *Config) {
 		c.Bootstrap = false
-		c.CAFile = "../test/client_certs/rootca.crt"
+		c.CAFile = "../../test/client_certs/rootca.crt"
-		c.CertFile = "../test/client_certs/server.crt"
+		c.CertFile = "../../test/client_certs/server.crt"
-		c.KeyFile = "../test/client_certs/server.key"
+		c.KeyFile = "../../test/client_certs/server.key"
 		c.VerifyOutgoing = true
 	})
 	defer os.RemoveAll(dir2)
@@ -651,9 +651,9 @@ func TestServer_TLSForceOutgoingToNoTLS(t *testing.T) {
 func TestServer_TLSToFullVerify(t *testing.T) {
 	// Set up a server with TLS and VerifyIncoming set
 	dir1, s1 := testServerWithConfig(t, func(c *Config) {
-		c.CAFile = "../test/client_certs/rootca.crt"
+		c.CAFile = "../../test/client_certs/rootca.crt"
-		c.CertFile = "../test/client_certs/server.crt"
+		c.CertFile = "../../test/client_certs/server.crt"
-		c.KeyFile = "../test/client_certs/server.key"
+		c.KeyFile = "../../test/client_certs/server.key"
 		c.VerifyIncoming = true
 		c.VerifyOutgoing = true
 	})
@@ -665,9 +665,9 @@ func TestServer_TLSToFullVerify(t *testing.T) {
 	// Add a second server with TLS configured
 	dir2, s2 := testServerWithConfig(t, func(c *Config) {
 		c.Bootstrap = false
-		c.CAFile = "../test/client_certs/rootca.crt"
+		c.CAFile = "../../test/client_certs/rootca.crt"
-		c.CertFile = "../test/client_certs/server.crt"
+		c.CertFile = "../../test/client_certs/server.crt"
-		c.KeyFile = "../test/client_certs/server.key"
+		c.KeyFile = "../../test/client_certs/server.key"
 	})
 	defer os.RemoveAll(dir2)
 	defer s2.Shutdown()

agent/consul/servers/manager.go

@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/consul/lib"
 )
 

agent/consul/servers/manager_internal_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 )
 
 var (

agent/consul/servers/manager_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/servers"
+	"github.com/hashicorp/consul/agent/consul/servers"
 )
 
 type fauxConnPool struct {

agent/consul/servers/router.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/serf/coordinate"

agent/consul/servers/router_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/serf/coordinate"

agent/consul/servers/serf_adapter.go

@@ -3,7 +3,7 @@ package servers
 import (
 	"log"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/serf/serf"
 )

agent/consul/servers/serf_flooder.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/hashicorp/consul/consul/agent"
+	"github.com/hashicorp/consul/agent/consul/agent"
 	"github.com/hashicorp/serf/serf"
 )
 

agent/consul/session_endpoint.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/state"
+	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/go-uuid"
 )

agent/consul/session_endpoint_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/session_ttl.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 const (

agent/consul/session_ttl_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/snapshot_endpoint.go

@@ -16,7 +16,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/snapshot"
 	"github.com/hashicorp/go-msgpack/codec"
 )

agent/consul/snapshot_endpoint_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"

agent/consul/state/acl.go

@@ -3,7 +3,7 @@ package state
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 )
 

agent/consul/state/acl_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 )
 

agent/consul/state/autopilot.go

@@ -3,7 +3,7 @@ package state
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 )
 

agent/consul/state/autopilot_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 )
 
 func TestStateStore_Autopilot(t *testing.T) {

agent/consul/state/catalog.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-memdb"
 )

agent/consul/state/catalog_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-memdb"

agent/consul/state/coordinate.go

@@ -3,7 +3,7 @@ package state
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/serf/coordinate"
 )

agent/consul/state/coordinate_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/serf/coordinate"
 )