Fix linter complaints

temporalio · Feb 20, 2024 · 72fa4c6 · 72fa4c6
1 parent 03a489a
commit 72fa4c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/common/persistence/sql/sqlplugin/mysql/session/session.go b/common/persistence/sql/sqlplugin/mysql/session/session.go
@@ -71,6 +71,7 @@ const (
 
 var (
 	errMySQL8VisInterpolateParamsNotSupported = errors.New("interpolateParams is not supported for mysql8 visibility stores")
+	errUnspecifiedMySQLVersion                = errors.New("bug: mysql version not specified")
 	dsnAttrOverrides                          = map[string]string{
 		"parseTime":       "true",
 		"clientFoundRows": "true",
@@ -95,7 +96,7 @@ func NewSession(
 	resolver resolver.ServiceResolver,
 ) (*Session, error) {
 	if version == MySQLVersionUnspecified {
-		return nil, fmt.Errorf("Bug: unspecified MySQL version provided to NewSession")
+		return nil, errUnspecifiedMySQLVersion
 	}
 
 	db, err := createConnection(version, dbKind, cfg, resolver)

diff --git a/common/persistence/sql/sqlplugin/mysql/session/session_test.go b/common/persistence/sql/sqlplugin/mysql/session/session_test.go
@@ -173,7 +173,7 @@ func (s *sessionTestSuite) TestBuildDSN() {
 }
 
 func (s *sessionTestSuite) Test_MySQL8_Visibility_DoesntSupport_interpolateParams() {
-	config := config.SQL{
+	cfg := config.SQL{
 		User:              "test",
 		Password:          "pass",
 		ConnectProtocol:   "tcp",
@@ -182,8 +182,8 @@ func (s *sessionTestSuite) Test_MySQL8_Visibility_DoesntSupport_interpolateParam
 		ConnectAttributes: map[string]string{"interpolateParams": "ignored"},
 	}
 	r := resolver.NewMockServiceResolver(s.controller)
-	r.EXPECT().Resolve(config.ConnectAddr).Return([]string{config.ConnectAddr})
-	_, err := buildDSN(MySQLVersion8_0, sqlplugin.DbKindVisibility, &config, r)
+	r.EXPECT().Resolve(cfg.ConnectAddr).Return([]string{cfg.ConnectAddr})
+	_, err := buildDSN(MySQLVersion8_0, sqlplugin.DbKindVisibility, &cfg, r)
 	s.Error(err, "We should return an error when a MySQL8 Visibility database is configured with interpolateParams")
 }