bugfix: move Role constants into the public API

We return a role of an instance from `GetPoolInfo()` call. It is
unexpected that Role constants are not a part of the public API.

Part of #208

Author: oleg-jukovec

CHANGELOG.md

@@ -17,6 +17,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
 ### Fixed
 
 - Mode type description in the connection_pool subpackage (#208)
+- Missed Role type constants in the connection_pool subpackage (#208)
 
 ## [1.8.0] - 2022-08-17
 

connection_pool/connection_pool.go

@@ -574,50 +574,48 @@ func (connPool *ConnectionPool) NewPrepared(expr string, userMode Mode) (*tarant
 func (connPool *ConnectionPool) getConnectionRole(conn *tarantool.Connection) (Role, error) {
 	resp, err := conn.Call17("box.info", []interface{}{})
 	if err != nil {
-		return unknown, err
+		return UnknownRole, err
 	}
 	if resp == nil {
-		return unknown, ErrIncorrectResponse
+		return UnknownRole, ErrIncorrectResponse
 	}
 	if len(resp.Data) < 1 {
-		return unknown, ErrIncorrectResponse
+		return UnknownRole, ErrIncorrectResponse
 	}
 
 	instanceStatus, ok := resp.Data[0].(map[interface{}]interface{})["status"]
 	if !ok {
-		return unknown, ErrIncorrectResponse
+		return UnknownRole, ErrIncorrectResponse
 	}
 	if instanceStatus != "running" {
-		return unknown, ErrIncorrectStatus
+		return UnknownRole, ErrIncorrectStatus
 	}
 
 	replicaRole, ok := resp.Data[0].(map[interface{}]interface{})["ro"]
 	if !ok {
-		return unknown, ErrIncorrectResponse
+		return UnknownRole, ErrIncorrectResponse
 	}
 
 	switch replicaRole {
 	case false:
-		return master, nil
+		return MasterRole, nil
 	case true:
-		return replica, nil
+		return ReplicaRole, nil
 	}
 
-	return unknown, nil
+	return UnknownRole, nil
 }
 
 func (connPool *ConnectionPool) getConnectionFromPool(addr string) (*tarantool.Connection, Role) {
-	conn := connPool.rwPool.GetConnByAddr(addr)
-	if conn != nil {
-		return conn, master
+	if conn := connPool.rwPool.GetConnByAddr(addr); conn != nil {
+		return conn, MasterRole
 	}
 
-	conn = connPool.roPool.GetConnByAddr(addr)
-	if conn != nil {
-		return conn, replica
+	if conn := connPool.roPool.GetConnByAddr(addr); conn != nil {
+		return conn, ReplicaRole
 	}
 
-	return connPool.anyPool.GetConnByAddr(addr), unknown
+	return connPool.anyPool.GetConnByAddr(addr), UnknownRole
 }
 
 func (connPool *ConnectionPool) deleteConnectionFromPool(addr string) {
@@ -639,9 +637,9 @@ func (connPool *ConnectionPool) setConnectionToPool(addr string, conn *tarantool
 	connPool.anyPool.AddConn(addr, conn)
 
 	switch role {
-	case master:
+	case MasterRole:
 		connPool.rwPool.AddConn(addr, conn)
-	case replica:
+	case ReplicaRole:
 		connPool.roPool.AddConn(addr, conn)
 	}
 

connection_pool/connection_pool_test.go

@@ -1295,7 +1295,7 @@ func TestNewPrepared(t *testing.T) {
 	stmt, err := connPool.NewPrepared("SELECT NAME0, NAME1 FROM SQL_TEST WHERE NAME0=:id AND NAME1=:name;", connection_pool.RO)
 	require.Nilf(t, err, "fail to prepare statement: %v", err)
 
-	if connPool.GetPoolInfo()[stmt.Conn.Addr()].ConnRole != connection_pool.RO {
+	if connPool.GetPoolInfo()[stmt.Conn.Addr()].ConnRole != connection_pool.ReplicaRole {
 		t.Errorf("wrong role for the statement's connection")
 	}
 

connection_pool/const.go

@@ -26,13 +26,13 @@ const (
 	PreferRO             // If there is one, otherwise fallback to a read only one (replica).
 )
 
+// Role describes a role of an instance by its mode.
 type Role uint32
 
-// master/replica role
 const (
-	unknown = iota
-	master
-	replica
+	UnknownRole Role = iota // A connection pool failed to discover mode of the instance.
+	MasterRole              // The instance is read-write mode.
+	ReplicaRole             // The instance is in read-only mode.
 )
 
 type State uint32