status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3377 from hashicorp/refactor-pkgs

Browse Source 
Refactor packages
This commit is contained in:
James Phillips 2017-08-09 11:50:44 -07:00 committed by GitHub
commit d42c743c84
151 changed files with 290 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/acl.go
View File

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

2
agent/acl_endpoint.go
View File

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

2
agent/acl_endpoint_test.go
View File

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

2
agent/acl_test.go
View File

@ -8,7 +8,7 @@ import (
"time"
rawacl "github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/serf/serf"

2
agent/agent.go
View File

@ -20,7 +20,7 @@ import (
"github.com/armon/go-metrics"
"github.com/hashicorp/consul/agent/consul"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/systemd"
"github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/api"

2
agent/agent_endpoint.go
View File

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

2
agent/agent_endpoint_test.go
View File

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

2
agent/agent_test.go
View File

@ -15,7 +15,7 @@ import (
"time"
"github.com/hashicorp/consul/agent/consul"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/types"

2
agent/catalog_endpoint.go
View File

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

2
agent/catalog_endpoint_test.go
View File

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

2
agent/check.go
View File

@ -15,7 +15,7 @@ import (
"time"
"github.com/armon/circbuf"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/types"

2
agent/config.go
View File

@ -16,7 +16,7 @@ import (
"time"
"github.com/hashicorp/consul/agent/consul"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/tlsutil"

2
agent/config_test.go
View File

@ -14,7 +14,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/testutil"
"github.com/pascaldekloe/goe/verify"
)

2
agent/consul/acl.go
View File

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

2
agent/consul/acl_endpoint.go
View File

@ -7,7 +7,7 @@ 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/agent/structs"
"github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-uuid"
)

2
agent/consul/acl_endpoint_test.go
View File

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

2
agent/consul/acl_replication.go
View File

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

2
agent/consul/acl_replication_test.go
View File

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

2
agent/consul/acl_test.go
View File

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

14
agent/consul/autopilot.go
View File

@ -8,8 +8,8 @@ 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/agent/metadata"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/go-version"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"
@ -90,7 +90,7 @@ func (s *Server) pruneDeadServers(autopilotConfig *structs.AutopilotConfig) erro
}
for _, member := range s.serfLAN.Members() {
valid, parts := agent.IsConsulServer(member)
valid, parts := metadata.IsConsulServer(member)
if valid {
// Remove this server from the stale list; it has a serf entry
@ -275,13 +275,13 @@ func (s *Server) updateClusterHealth() error {
}
// Get the the serf members which are Consul servers
serverMap := make(map[string]*agent.Server)
serverMap := make(map[string]*metadata.Server)
for _, member := range s.LANMembers() {
if member.Status == serf.StatusLeft {
continue
}
valid, parts := agent.IsConsulServer(member)
valid, parts := metadata.IsConsulServer(member)
if valid {
serverMap[parts.ID] = parts
}
@ -297,7 +297,7 @@ func (s *Server) updateClusterHealth() error {
// consistent of a sample as possible. We capture the leader's index
// here as well so it roughly lines up with the same point in time.
targetLastIndex := s.raft.LastIndex()
var fetchList []*agent.Server
var fetchList []*metadata.Server
for _, server := range servers {
if parts, ok := serverMap[string(server.ID)]; ok {
fetchList = append(fetchList, parts)
@ -377,7 +377,7 @@ func (s *Server) updateClusterHealth() error {
// updateServerHealth computes the resulting health of the server based on its
// fetched stats and the state of the leader.
func (s *Server) updateServerHealth(health *structs.ServerHealth,
server *agent.Server, stats *structs.ServerStats,
server *metadata.Server, stats *structs.ServerStats,
autopilotConf *structs.AutopilotConfig, targetLastIndex uint64) error {
health.LastTerm = stats.LastTerm

2
agent/consul/catalog_endpoint.go
View File

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

2
agent/consul/catalog_endpoint_test.go
View File

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

32
agent/consul/client.go
View File

@ -11,10 +11,10 @@ import (
"sync"
"time"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/consul/servers"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/pool"
"github.com/hashicorp/consul/agent/router"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/serf/coordinate"
"github.com/hashicorp/serf/serf"
@ -52,9 +52,9 @@ type Client struct {
// Connection pool to consul servers
connPool *pool.ConnPool
// servers is responsible for the selection and maintenance of
// routers is responsible for the selection and maintenance of
// Consul servers this agent uses for RPC requests
servers *servers.Manager
routers *router.Manager
// eventCh is used to receive events from the
// serf cluster in the datacenter
@ -140,8 +140,8 @@ func NewClientLogger(config *Config, logger *log.Logger) (*Client, error) {
}
// Start maintenance task for servers
c.servers = servers.New(c.logger, c.shutdownCh, c.serf, c.connPool)
go c.servers.Start()
c.routers = router.New(c.logger, c.shutdownCh, c.serf, c.connPool)
go c.routers.Start()
return c, nil
}
@ -275,7 +275,7 @@ func (c *Client) lanEventHandler() {
// nodeJoin is used to handle join events on the serf cluster
func (c *Client) nodeJoin(me serf.MemberEvent) {
for _, m := range me.Members {
ok, parts := agent.IsConsulServer(m)
ok, parts := metadata.IsConsulServer(m)
if !ok {
continue
}
@ -285,7 +285,7 @@ func (c *Client) nodeJoin(me serf.MemberEvent) {
continue
}
c.logger.Printf("[INFO] consul: adding server %s", parts)
c.servers.AddServer(parts)
c.routers.AddServer(parts)
// Trigger the callback
if c.config.ServerUp != nil {
@ -297,12 +297,12 @@ func (c *Client) nodeJoin(me serf.MemberEvent) {
// nodeFail is used to handle fail events on the serf cluster
func (c *Client) nodeFail(me serf.MemberEvent) {
for _, m := range me.Members {
ok, parts := agent.IsConsulServer(m)
ok, parts := metadata.IsConsulServer(m)
if !ok {
continue
}
c.logger.Printf("[INFO] consul: removing server %s", parts)
c.servers.RemoveServer(parts)
c.routers.RemoveServer(parts)
}
}
@ -336,14 +336,14 @@ func (c *Client) localEvent(event serf.UserEvent) {
// RPC is used to forward an RPC call to a consul server, or fail if no servers
func (c *Client) RPC(method string, args interface{}, reply interface{}) error {
server := c.servers.FindServer()
server := c.routers.FindServer()
if server == nil {
return structs.ErrNoServers
}
// Forward to remote Consul
if err := c.connPool.RPC(c.config.Datacenter, server.Addr, server.Version, method, server.UseTLS, args, reply); err != nil {
c.servers.NotifyFailedServer(server)
c.routers.NotifyFailedServer(server)
c.logger.Printf("[ERR] consul: RPC failed to server %s: %v", server.Addr, err)
return err
}
@ -358,7 +358,7 @@ func (c *Client) SnapshotRPC(args *structs.SnapshotRequest, in io.Reader, out io
replyFn structs.SnapshotReplyFn) error {
// Locate a server to make the request to.
server := c.servers.FindServer()
server := c.routers.FindServer()
if server == nil {
return structs.ErrNoServers
}
@ -395,7 +395,7 @@ func (c *Client) SnapshotRPC(args *structs.SnapshotRequest, in io.Reader, out io
// Stats is used to return statistics for debugging and insight
// for various sub-systems
func (c *Client) Stats() map[string]map[string]string {
numServers := c.servers.NumServers()
numServers := c.routers.NumServers()
toString := func(v uint64) string {
return strconv.FormatUint(v, 10)
@ -412,7 +412,7 @@ func (c *Client) Stats() map[string]map[string]string {
}
func (c *Client) ServerAddrs() map[string]string {
return c.servers.GetServerAddrs()
return c.routers.GetServerAddrs()
}
// GetLANCoordinate returns the network coordinate of the current node, as

14
agent/consul/client_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/testutil/retry"
@ -84,7 +84,7 @@ func TestClient_JoinLAN(t *testing.T) {
// Try to join
joinLAN(t, c1, s1)
retry.Run(t, func(r *retry.R) {
if got, want := c1.servers.NumServers(), 1; got != want {
if got, want := c1.routers.NumServers(), 1; got != want {
r.Fatalf("got %d servers want %d", got, want)
}
if got, want := len(s1.LANMembers()), 2; got != want {
@ -254,7 +254,7 @@ func TestClient_RPC_ConsulServerPing(t *testing.T) {
}
// Sleep to allow Serf to sync, shuffle, and let the shuffle complete
c.servers.ResetRebalanceTimer()
c.routers.ResetRebalanceTimer()
time.Sleep(time.Second)
if len(c.LANMembers()) != numServers+numClients {
@ -270,7 +270,7 @@ func TestClient_RPC_ConsulServerPing(t *testing.T) {
var pingCount int
for range servers {
time.Sleep(200 * time.Millisecond)
s := c.servers.FindServer()
s := c.routers.FindServer()
ok, err := c.connPool.Ping(s.Datacenter, s.Addr, s.Version, s.UseTLS)
if !ok {
t.Errorf("Unable to ping server %v: %s", s.String(), err)
@ -279,7 +279,7 @@ func TestClient_RPC_ConsulServerPing(t *testing.T) {
// Artificially fail the server in order to rotate the server
// list
c.servers.NotifyFailedServer(s)
c.routers.NotifyFailedServer(s)
}
if pingCount != numServers {
@ -354,7 +354,7 @@ func TestClient_SnapshotRPC(t *testing.T) {
// Wait until we've got a healthy server.
retry.Run(t, func(r *retry.R) {
if got, want := c1.servers.NumServers(), 1; got != want {
if got, want := c1.routers.NumServers(), 1; got != want {
r.Fatalf("got %d servers want %d", got, want)
}
})
@ -413,7 +413,7 @@ func TestClient_SnapshotRPC_TLS(t *testing.T) {
}
// Wait until we've got a healthy server.
if got, want := c1.servers.NumServers(), 1; got != want {
if got, want := c1.routers.NumServers(), 1; got != want {
r.Fatalf("got %d servers want %d", got, want)
}
})

2
agent/consul/config.go
View File

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

2
agent/consul/coordinate_endpoint.go
View File

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

2
agent/consul/coordinate_endpoint_test.go
View File

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

2
agent/consul/filter.go
View File

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

2
agent/consul/filter_test.go
View File

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

6
agent/consul/flood.go
View File

@ -3,7 +3,7 @@ package consul
import (
"time"
"github.com/hashicorp/consul/agent/consul/servers"
"github.com/hashicorp/consul/agent/router"
"github.com/hashicorp/serf/serf"
)
@ -24,7 +24,7 @@ func (s *Server) FloodNotify() {
// Flood is a long-running goroutine that floods servers from the LAN to the
// given global Serf instance, such as the WAN. This will exit once either of
// the Serf instances are shut down.
func (s *Server) Flood(portFn servers.FloodPortFn, global *serf.Serf) {
func (s *Server) Flood(portFn router.FloodPortFn, global *serf.Serf) {
s.floodLock.Lock()
floodCh := make(chan struct{})
s.floodCh = append(s.floodCh, floodCh)
@ -61,6 +61,6 @@ func (s *Server) Flood(portFn servers.FloodPortFn, global *serf.Serf) {
}
FLOOD:
servers.FloodJoins(s.logger, portFn, s.config.Datacenter, s.serfLAN, global)
router.FloodJoins(s.logger, portFn, s.config.Datacenter, s.serfLAN, global)
}
}

2
agent/consul/fsm.go
View File

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

2
agent/consul/fsm_test.go
View File

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

2
agent/consul/health_endpoint.go
View File

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

2
agent/consul/health_endpoint_test.go
View File

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

2
agent/consul/internal_endpoint.go
View File

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

2
agent/consul/internal_endpoint_test.go
View File

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

2
agent/consul/issue_test.go
View File

@ -5,7 +5,7 @@ import (
"reflect"
"testing"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api"
)

2
agent/consul/kvs_endpoint.go
View File

@ -7,7 +7,7 @@ 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/agent/structs"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/go-memdb"
)

2
agent/consul/kvs_endpoint_test.go
View File

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

16
agent/consul/leader.go
View File

@ -9,8 +9,8 @@ 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/agent/metadata"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/go-version"
@ -440,7 +440,7 @@ func (s *Server) shouldHandleMember(member serf.Member) bool {
if valid, dc := isConsulNode(member); valid && dc == s.config.Datacenter {
return true
}
if valid, parts := agent.IsConsulServer(member); valid && parts.Datacenter == s.config.Datacenter {
if valid, parts := metadata.IsConsulServer(member); valid && parts.Datacenter == s.config.Datacenter {
return true
}
return false
@ -451,7 +451,7 @@ func (s *Server) shouldHandleMember(member serf.Member) bool {
func (s *Server) handleAliveMember(member serf.Member) error {
// Register consul service if a server
var service *structs.NodeService
if valid, parts := agent.IsConsulServer(member); valid {
if valid, parts := metadata.IsConsulServer(member); valid {
service = &structs.NodeService{
ID: structs.ConsulServiceID,
Service: structs.ConsulServiceName,
@ -595,7 +595,7 @@ func (s *Server) handleDeregisterMember(reason string, member serf.Member) error
}
// Remove from Raft peers if this was a server
if valid, parts := agent.IsConsulServer(member); valid {
if valid, parts := metadata.IsConsulServer(member); valid {
if err := s.removeConsulServer(member, parts.Port); err != nil {
return err
}
@ -622,7 +622,7 @@ func (s *Server) handleDeregisterMember(reason string, member serf.Member) error
}
// joinConsulServer is used to try to join another consul server
func (s *Server) joinConsulServer(m serf.Member, parts *agent.Server) error {
func (s *Server) joinConsulServer(m serf.Member, parts *metadata.Server) error {
// Do not join ourself
if m.Name == s.config.NodeName {
return nil
@ -632,7 +632,7 @@ func (s *Server) joinConsulServer(m serf.Member, parts *agent.Server) error {
if parts.Bootstrap {
members := s.serfLAN.Members()
for _, member := range members {
valid, p := agent.IsConsulServer(member)
valid, p := metadata.IsConsulServer(member)
if valid && member.Name != m.Name && p.Bootstrap {
s.logger.Printf("[ERR] consul: '%v' and '%v' are both in bootstrap mode. Only one node should be in bootstrap mode, not adding Raft peer.", m.Name, member.Name)
return nil
@ -732,7 +732,7 @@ func (s *Server) removeConsulServer(m serf.Member, port int) error {
return err
}
_, parts := agent.IsConsulServer(m)
_, parts := metadata.IsConsulServer(m)
// Pick which remove API to use based on how the server was added.
for _, server := range configFuture.Configuration().Servers {

2
agent/consul/leader_test.go
View File

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

6
agent/consul/merge.go
View File

@ -3,7 +3,7 @@ package consul
import (
"fmt"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/serf/serf"
)
@ -48,7 +48,7 @@ func (md *lanMergeDelegate) NotifyMerge(members []*serf.Member) error {
continue
}
ok, parts := agent.IsConsulServer(*m)
ok, parts := metadata.IsConsulServer(*m)
if ok && parts.Datacenter != md.dc {
return fmt.Errorf("Member '%s' part of wrong datacenter '%s'",
m.Name, parts.Datacenter)
@ -65,7 +65,7 @@ type wanMergeDelegate struct {
func (md *wanMergeDelegate) NotifyMerge(members []*serf.Member) error {
for _, m := range members {
ok, _ := agent.IsConsulServer(*m)
ok, _ := metadata.IsConsulServer(*m)
if !ok {
return fmt.Errorf("Member '%s' is not a server", m.Name)
}

2
agent/consul/operator_autopilot_endpoint.go
View File

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

2
agent/consul/operator_autopilot_endpoint_test.go
View File

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

6
agent/consul/operator_raft_endpoint.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"net"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"
)
@ -35,7 +35,7 @@ func (op *Operator) RaftGetConfiguration(args *structs.DCSpecificRequest, reply
// Index the Consul information about the servers.
serverMap := make(map[raft.ServerAddress]serf.Member)
for _, member := range op.srv.serfLAN.Members() {
valid, parts := agent.IsConsulServer(member)
valid, parts := metadata.IsConsulServer(member)
if !valid {
continue
}

2
agent/consul/operator_raft_endpoint_test.go
View File

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

2
agent/consul/prepared_query/template.go
View File

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

2
agent/consul/prepared_query/template_test.go
View File

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

2
agent/consul/prepared_query/walk_test.go
View File

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

2
agent/consul/prepared_query_endpoint.go
View File

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

2
agent/consul/prepared_query_endpoint_test.go
View File

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

10
agent/consul/rpc.go
View File

@ -9,12 +9,12 @@ import (
"time"
"github.com/armon/go-metrics"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/pool"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/go-memdb"
memdb "github.com/hashicorp/go-memdb"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/net-rpc-msgpackrpc"
"github.com/hashicorp/yamux"
@ -225,7 +225,7 @@ CHECK_LEADER:
// getLeader returns if the current node is the leader, and if not then it
// returns the leader which is potentially nil if the cluster has not yet
// elected a leader.
func (s *Server) getLeader() (bool, *agent.Server) {
func (s *Server) getLeader() (bool, *metadata.Server) {
// Check if we are the leader
if s.IsLeader() {
return true, nil
@ -247,7 +247,7 @@ func (s *Server) getLeader() (bool, *agent.Server) {
}
// forwardLeader is used to forward an RPC call to the leader, or fail if no leader
func (s *Server) forwardLeader(server *agent.Server, method string, args interface{}, reply interface{}) error {
func (s *Server) forwardLeader(server *metadata.Server, method string, args interface{}, reply interface{}) error {
// Handle a missing server
if server == nil {
return structs.ErrNoLeader

2
agent/consul/rpc_test.go
View File

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

2
agent/consul/rtt.go
View File

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

2
agent/consul/rtt_test.go
View File

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

10
agent/consul/serf.go
View File

@ -4,7 +4,7 @@ import (
"strings"
"time"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"
)
@ -125,7 +125,7 @@ func (s *Server) localEvent(event serf.UserEvent) {
// lanNodeJoin is used to handle join events on the LAN pool.
func (s *Server) lanNodeJoin(me serf.MemberEvent) {
for _, m := range me.Members {
ok, parts := agent.IsConsulServer(m)
ok, parts := metadata.IsConsulServer(m)
if !ok {
continue
}
@ -166,9 +166,9 @@ func (s *Server) maybeBootstrap() {
// Scan for all the known servers.
members := s.serfLAN.Members()
var servers []agent.Server
var servers []metadata.Server
for _, member := range members {
valid, p := agent.IsConsulServer(member)
valid, p := metadata.IsConsulServer(member)
if !valid {
continue
}
@ -265,7 +265,7 @@ func (s *Server) maybeBootstrap() {
// lanNodeFailed is used to handle fail events on the LAN pool.
func (s *Server) lanNodeFailed(me serf.MemberEvent) {
for _, m := range me.Members {
ok, parts := agent.IsConsulServer(m)
ok, parts := metadata.IsConsulServer(m)
if !ok {
continue
}

22
agent/consul/server.go
View File

@ -18,17 +18,17 @@ import (
"time"
"github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/consul/servers"
"github.com/hashicorp/consul/agent/consul/state"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/pool"
"github.com/hashicorp/consul/agent/router"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/tlsutil"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/raft"
"github.com/hashicorp/raft-boltdb"
raftboltdb "github.com/hashicorp/raft-boltdb"
"github.com/hashicorp/serf/coordinate"
"github.com/hashicorp/serf/serf"
)
@ -125,7 +125,7 @@ type Server struct {
// localConsuls is used to track the known consuls
// in the local datacenter. Used to do leader forwarding.
localConsuls map[raft.ServerAddress]*agent.Server
localConsuls map[raft.ServerAddress]*metadata.Server
localLock sync.RWMutex
// Logger uses the provided LogOutput
@ -154,7 +154,7 @@ type Server struct {
// router is used to map out Consul servers in the WAN and in Consul
// Enterprise user-defined areas.
router *servers.Router
router *router.Router
// Listener is used to listen for incoming connections
Listener net.Listener
@ -181,7 +181,7 @@ type Server struct {
sessionTimers *SessionTimers
// statsFetcher is used by autopilot to check the status of the other
// Consul servers.
// Consul router.
statsFetcher *StatsFetcher
// reassertLeaderCh is used to signal the leader loop should re-run
@ -295,10 +295,10 @@ func NewServerLogger(config *Config, logger *log.Logger, tokens *token.Store) (*
connPool: connPool,
eventChLAN: make(chan serf.Event, 256),
eventChWAN: make(chan serf.Event, 256),
localConsuls: make(map[raft.ServerAddress]*agent.Server),
localConsuls: make(map[raft.ServerAddress]*metadata.Server),
logger: logger,
reconcileCh: make(chan serf.Member, 32),
router: servers.NewRouter(logger, config.Datacenter),
router: router.NewRouter(logger, config.Datacenter),
rpcServer: rpc.NewServer(),
rpcTLS: incomingTLS,
reassertLeaderCh: make(chan chan error),
@ -382,10 +382,10 @@ func NewServerLogger(config *Config, logger *log.Logger, tokens *token.Store) (*
s.Shutdown()
return nil, fmt.Errorf("Failed to add WAN serf route: %v", err)
}
go servers.HandleSerfEvents(s.logger, s.router, types.AreaWAN, s.serfWAN.ShutdownCh(), s.eventChWAN)
go router.HandleSerfEvents(s.logger, s.router, types.AreaWAN, s.serfWAN.ShutdownCh(), s.eventChWAN)
// Fire up the LAN <-> WAN join flooder.
portFn := func(s *agent.Server) (int, bool) {
portFn := func(s *metadata.Server) (int, bool) {
if s.WanJoinPort > 0 {
return s.WanJoinPort, true
}

4
agent/consul/server_test.go
View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/consul/testutil"
@ -667,7 +667,7 @@ func testVerifyRPC(s1, s2 *Server, t *testing.T) (bool, error) {
// Have s2 make an RPC call to s1
s2.localLock.RLock()
var leader *agent.Server
var leader *metadata.Server
for _, server := range s2.localConsuls {
if server.Name == s1.config.NodeName {
leader = server

2
agent/consul/session_endpoint.go
View File

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

2
agent/consul/session_endpoint_test.go
View File

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

2
agent/consul/session_ttl.go
View File

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

2
agent/consul/session_ttl_test.go
View File

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

2
agent/consul/snapshot_endpoint.go
View File

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

2
agent/consul/snapshot_endpoint_test.go
View File

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

2
agent/consul/state/acl.go
View File

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

2
agent/consul/state/acl_test.go
View File

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

2
agent/consul/state/autopilot.go
View File

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

2
agent/consul/state/autopilot_test.go
View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/pascaldekloe/goe/verify"
)

2
agent/consul/state/catalog.go
View File

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

2
agent/consul/state/catalog_test.go
View File

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

2
agent/consul/state/coordinate.go
View File

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

2
agent/consul/state/coordinate_test.go
View File

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

2
agent/consul/state/kvs.go
View File

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

2
agent/consul/state/kvs_test.go
View File

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

2
agent/consul/state/prepared_query.go
View File

@ -5,7 +5,7 @@ import (
"regexp"
"github.com/hashicorp/consul/agent/consul/prepared_query"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/go-memdb"
)

2
agent/consul/state/prepared_query_index_test.go
View File

@ -3,7 +3,7 @@ package state
import (
"testing"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
)
// Indexer is a global indexer to use for tests since there is no state.

2
agent/consul/state/prepared_query_test.go
View File

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

2
agent/consul/state/session.go
View File

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

2
agent/consul/state/session_test.go
View File

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

2
agent/consul/state/state_store_test.go
View File

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

2
agent/consul/state/txn.go
View File

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

2
agent/consul/state/txn_test.go
View File

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

10
agent/consul/stats_fetcher.go
View File

@ -5,9 +5,9 @@ import (
"log"
"sync"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/agent/pool"
"github.com/hashicorp/consul/agent/structs"
)
// StatsFetcher has two functions for autopilot. First, lets us fetch all the
@ -39,7 +39,7 @@ func NewStatsFetcher(logger *log.Logger, pool *pool.ConnPool, datacenter string)
// cancel this when the context is canceled because we only want one in-flight
// RPC to each server, so we let it finish and then clean up the in-flight
// tracking.
func (f *StatsFetcher) fetch(server *agent.Server, replyCh chan *structs.ServerStats) {
func (f *StatsFetcher) fetch(server *metadata.Server, replyCh chan *structs.ServerStats) {
var args struct{}
var reply structs.ServerStats
err := f.pool.RPC(f.datacenter, server.Addr, server.Version, "Status.RaftStats", server.UseTLS, &args, &reply)
@ -56,9 +56,9 @@ func (f *StatsFetcher) fetch(server *agent.Server, replyCh chan *structs.ServerS
}
// Fetch will attempt to query all the servers in parallel.
func (f *StatsFetcher) Fetch(ctx context.Context, servers []*agent.Server) map[string]*structs.ServerStats {
func (f *StatsFetcher) Fetch(ctx context.Context, servers []*metadata.Server) map[string]*structs.ServerStats {
type workItem struct {
server *agent.Server
server *metadata.Server
replyCh chan *structs.ServerStats
}
var work []*workItem

6
agent/consul/stats_fetcher_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/consul/types"
)
@ -34,9 +34,9 @@ func TestStatsFetcher(t *testing.T) {
t.Fatalf("bad len: %d", len(members))
}
var servers []*agent.Server
var servers []*metadata.Server
for _, member := range members {
ok, server := agent.IsConsulServer(member)
ok, server := metadata.IsConsulServer(member)
if !ok {
t.Fatalf("bad: %#v", member)
}

2
agent/consul/status_endpoint.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"strconv"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
)
// Status endpoint is used to check on server status

2
agent/consul/txn_endpoint.go
View File

@ -6,7 +6,7 @@ import (
"github.com/armon/go-metrics"
"github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
)
// Txn endpoint is used to perform multi-object atomic transactions.

2
agent/consul/txn_endpoint_test.go
View File

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

4
agent/consul/util.go
View File

@ -7,7 +7,7 @@ import (
"runtime"
"strconv"
"github.com/hashicorp/consul/agent/consul/agent"
"github.com/hashicorp/consul/agent/metadata"
"github.com/hashicorp/go-version"
"github.com/hashicorp/serf/serf"
)
@ -302,7 +302,7 @@ func runtimeStats() map[string]string {
// given Consul version
func ServersMeetMinimumVersion(members []serf.Member, minVersion *version.Version) bool {
for _, member := range members {
if valid, parts := agent.IsConsulServer(member); valid && parts.Status == serf.StatusAlive {
if valid, parts := metadata.IsConsulServer(member); valid && parts.Status == serf.StatusAlive {
if parts.Build.LessThan(minVersion) {
return false
}

2
agent/coordinate_endpoint.go
View File

@ -5,7 +5,7 @@ import (
"net/http"
"sort"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
)
// coordinateDisabled handles all the endpoints when coordinates are not enabled,

2
agent/coordinate_endpoint_test.go
View File

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

2
agent/dns.go
View File

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

2
agent/dns_test.go
View File

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

2
agent/event_endpoint.go
View File

@ -9,7 +9,7 @@ import (
"strings"
"time"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
)
const (

2
agent/event_endpoint_test.go
View File

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

2
agent/health_endpoint.go
View File

@ -6,7 +6,7 @@ import (
"strconv"
"strings"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api"
)

2
agent/health_endpoint_test.go
View File

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

2
agent/http.go
View File

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

2
agent/http_test.go
View File

@ -18,7 +18,7 @@ import (
"testing"
"time"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/go-cleanhttp"
)

2
agent/keyring.go
View File

@ -9,7 +9,7 @@ import (
"path/filepath"
"github.com/hashicorp/consul/agent/consul"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/serf/serf"
)

2
agent/kvs_endpoint.go
View File

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

Some files were not shown because too many files have changed in this diff Show More