Merge branch 'master' into unit-test-for-nosqlplugin-cassandra-visibi…

…lity

client/history/peer_resolver.go

@@ -24,6 +24,7 @@ import (
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/membership"
 	"github.com/uber/cadence/common/service"
+	"github.com/uber/cadence/service/history/lookup"
 )
 
 // PeerResolver is used to resolve history peers.
@@ -74,8 +75,7 @@ func (pr peerResolver) FromDomainID(domainID string) (string, error) {
 // It uses our membership provider to lookup which instance currently owns the given shard.
 // FromHostAddress is used for further resolving.
 func (pr peerResolver) FromShardID(shardID int) (string, error) {
-	shardIDString := string(rune(shardID))
-	host, err := pr.resolver.Lookup(service.History, shardIDString)
+	host, err := lookup.HistoryServerByShardID(pr.resolver, shardID)
 	if err != nil {
 		return "", common.ToServiceTransientError(err)
 	}

client/matching/peerResolver.go → client/matching/peer_resolver.go

@@ -29,14 +29,22 @@ import (
 // PeerResolver is used to resolve matching peers.
 // Those are deployed instances of Cadence matching services that participate in the cluster ring.
 // The resulting peer is simply an address of form ip:port where RPC calls can be routed to.
-type PeerResolver struct {
+//go:generate mockgen -package $GOPACKAGE -source $GOFILE -destination peer_resolver_mock.go -package matching github.com/uber/cadence/client/matching PeerResolver
+
+type PeerResolver interface {
+	FromTaskList(taskListName string) (string, error)
+	GetAllPeers() ([]string, error)
+	FromHostAddress(hostAddress string) (string, error)
+}
+
+type peerResolver struct {
 	resolver  membership.Resolver
 	namedPort string // grpc or tchannel, depends on yarpc configuration
 }
 
 // NewPeerResolver creates a new matching peer resolver.
 func NewPeerResolver(membership membership.Resolver, namedPort string) PeerResolver {
-	return PeerResolver{
+	return peerResolver{
 		resolver:  membership,
 		namedPort: namedPort,
 	}
@@ -45,7 +53,7 @@ func NewPeerResolver(membership membership.Resolver, namedPort string) PeerResol
 // FromTaskList resolves the matching peer responsible for the given task list name.
 // It uses our membership provider to lookup which instance currently owns the given task list.
 // FromHostAddress is used for further resolving.
-func (pr PeerResolver) FromTaskList(taskListName string) (string, error) {
+func (pr peerResolver) FromTaskList(taskListName string) (string, error) {
 	host, err := pr.resolver.Lookup(service.Matching, taskListName)
 	if err != nil {
 		return "", common.ToServiceTransientError(err)
@@ -56,7 +64,7 @@ func (pr PeerResolver) FromTaskList(taskListName string) (string, error) {
 }
 
 // GetAllPeers returns all matching service peers in the cluster ring.
-func (pr PeerResolver) GetAllPeers() ([]string, error) {
+func (pr peerResolver) GetAllPeers() ([]string, error) {
 	hosts, err := pr.resolver.Members(service.Matching)
 	if err != nil {
 		return nil, common.ToServiceTransientError(err)
@@ -75,7 +83,7 @@ func (pr PeerResolver) GetAllPeers() ([]string, error) {
 // FromHostAddress resolves the final matching peer responsible for the given host address.
 // The address may be used as is, or processed with additional address mapper.
 // In case of gRPC transport, the port within the address is replaced with gRPC port.
-func (pr PeerResolver) FromHostAddress(hostAddress string) (string, error) {
+func (pr peerResolver) FromHostAddress(hostAddress string) (string, error) {
 	host, err := pr.resolver.LookupByAddress(service.Matching, hostAddress)
 	if err != nil {
 		return "", common.ToServiceTransientError(err)