fix lint

Signed-off-by: lance6716 <[email protected]>

Author: lance6716

driver/driver_options_test.go

@@ -39,7 +39,7 @@ type mockHandler struct {
 }
 
 func TestDriverOptions_SetRetriesOn(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 	var wg sync.WaitGroup
 	srv.handler.modifier = &wg
@@ -64,7 +64,7 @@ func TestDriverOptions_SetRetriesOn(t *testing.T) {
 }
 
 func TestDriverOptions_SetRetriesOff(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 	var wg sync.WaitGroup
 	srv.handler.modifier = &wg
@@ -114,7 +114,7 @@ func TestDriverOptions_SetCompression(t *testing.T) {
 }
 
 func TestDriverOptions_ConnectTimeout(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 
 	conn, err := sql.Open("mysql", "[email protected]:3307/test?timeout=1s")
@@ -131,7 +131,7 @@ func TestDriverOptions_ConnectTimeout(t *testing.T) {
 }
 
 func TestDriverOptions_BufferSize(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 
 	SetDSNOptions(map[string]DriverOption{
@@ -156,7 +156,7 @@ func TestDriverOptions_BufferSize(t *testing.T) {
 }
 
 func TestDriverOptions_ReadTimeout(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 
 	conn, err := sql.Open("mysql", "[email protected]:3307/test?readTimeout=100ms")
@@ -177,7 +177,7 @@ func TestDriverOptions_ReadTimeout(t *testing.T) {
 }
 
 func TestDriverOptions_writeTimeout(t *testing.T) {
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 
 	// use a writeTimeout that will fail parsing by ParseDuration resulting
@@ -224,7 +224,7 @@ func TestDriverOptions_namedValueChecker(t *testing.T) {
 		return nil
 	})
 
-	srv := CreateMockServer(t)
+	srv := createMockServer(t)
 	defer srv.Stop()
 	conn, err := sql.Open("mysql", "[email protected]:3307/test?writeTimeout=1s")
 	defer func() {
@@ -265,9 +265,9 @@ func TestDriverOptions_namedValueChecker(t *testing.T) {
 	require.True(t, math.MaxUint64 == a)
 }
 
-func CreateMockServer(t *testing.T) *testServer {
+func createMockServer(t *testing.T) *testServer {
 	inMemProvider := server.NewInMemoryProvider()
-	inMemProvider.AddUser(*testUser, *testPassword)
+	require.NoError(t, inMemProvider.AddUser(*testUser, *testPassword))
 	defaultServer := server.NewDefaultServer()
 
 	l, err := net.Listen("tcp", "127.0.0.1:3307")

server/caching_sha2_cache_test.go

@@ -27,7 +27,7 @@ func TestCachingSha2Cache(t *testing.T) {
 	remoteProvider := &RemoteThrottleProvider{
 		InMemoryProvider: NewInMemoryProvider(),
 	}
-	remoteProvider.AddUser(*testUser, *testPassword)
+	require.NoError(t, remoteProvider.AddUser(*testUser, *testPassword))
 	cacheServer := NewServer("8.0.12", mysql.DEFAULT_COLLATION_ID, mysql.AUTH_CACHING_SHA2_PASSWORD, test_keys.PubPem, tlsConf)
 
 	// no TLS
@@ -42,7 +42,7 @@ func TestCachingSha2CacheTLS(t *testing.T) {
 	remoteProvider := &RemoteThrottleProvider{
 		InMemoryProvider: NewInMemoryProvider(),
 	}
-	remoteProvider.AddUser(*testUser, *testPassword)
+	require.NoError(t, remoteProvider.AddUser(*testUser, *testPassword))
 	cacheServer := NewServer("8.0.12", mysql.DEFAULT_COLLATION_ID, mysql.AUTH_CACHING_SHA2_PASSWORD, test_keys.PubPem, tlsConf)
 
 	// TLS

server/conn.go

@@ -61,7 +61,9 @@ func NewCustomizedConn(conn net.Conn, serverConf *Server, p CredentialProvider,
 // NewConn: create connection with default server settings
 func (s *Server) NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, error) {
 	p := NewInMemoryProvider()
-	p.AddUser(user, password)
+	if err := p.AddUser(user, password); err != nil {
+		return nil, err
+	}
 
 	return s.NewCustomizedConn(conn, p, h)
 }