Merge pull request #164 from Leizhengzi/main

fix dtmutil relevant ci lint error

bench/svr/http.go

@@ -158,7 +158,7 @@ func benchAddRoute(app *gin.Engine) {
 		params2 := fmt.Sprintf("?uid=%s", suid2)
 		logger.Debugf("mode: %s contains dtm: %t", mode, strings.Contains(mode, "dtm"))
 		if strings.Contains(mode, "dtm") {
-			saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, fmt.Sprintf("bench-%d", uid)).
+			saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, fmt.Sprintf("bench-%d", uid)).
 				Add(benchBusi+"/TransOut"+params, benchBusi+"/TransOutCompensate"+params, req).
 				Add(benchBusi+"/TransIn"+params2, benchBusi+"/TransInCompensate"+params2, req)
 			saga.WaitResult = true
@@ -175,7 +175,7 @@ func benchAddRoute(app *gin.Engine) {
 	app.Any(benchAPI+"/benchEmptyUrl", dtmutil.WrapHandler(func(c *gin.Context) (interface{}, error) {
 		gid := shortuuid.New()
 		req := gin.H{}
-		saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gid).
+		saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gid).
 			Add("", "", req).
 			Add("", "", req)
 		saga.WaitResult = true

dtmsvr/storage/sql/sql.go

@@ -31,7 +31,7 @@ func (s *Store) Ping() error {
 
 // PopulateData populates data to db
 func (s *Store) PopulateData(skipDrop bool) {
-	file := fmt.Sprintf("%s/dtmsvr.storage.%s.sql", dtmutil.GetSqlDir(), conf.Store.Driver)
+	file := fmt.Sprintf("%s/dtmsvr.storage.%s.sql", dtmutil.GetSQLDir(), conf.Store.Driver)
 	dtmutil.RunSQLScript(conf.Store.GetDBConf(), file, skipDrop)
 }
 

dtmutil/consts.go

@@ -7,8 +7,8 @@
 package dtmutil
 
 const (
-	// DefaultHttpServer default url for http server. used by test and examples
-	DefaultHttpServer = "http://localhost:36789/api/dtmsvr"
+	// DefaultHTTPServer default url for http server. used by test and examples
+	DefaultHTTPServer = "http://localhost:36789/api/dtmsvr"
 	// DefaultGrpcServer default url for grpc server. used by test and examples
 	DefaultGrpcServer = "localhost:36790"
 )

dtmutil/db.go

@@ -28,7 +28,7 @@ func getGormDialetor(driver string, dsn string) gorm.Dialector {
 	if driver == dtmcli.DBTypePostgres {
 		return postgres.Open(dsn)
 	}
-	dtmimp.PanicIf(driver != dtmcli.DBTypeMysql, fmt.Errorf("unkown driver: %s", driver))
+	dtmimp.PanicIf(driver != dtmcli.DBTypeMysql, fmt.Errorf("unknown driver: %s", driver))
 	return mysql.Open(dsn)
 }
 
@@ -106,7 +106,8 @@ func DbGet(conf dtmcli.DBConf, ops ...func(*gorm.DB)) *DB {
 			SkipDefaultTransaction: true,
 		})
 		dtmimp.E2P(err)
-		db1.Use(&tracePlugin{})
+		err = db1.Use(&tracePlugin{})
+		dtmimp.E2P(err)
 		db = &DB{DB: db1}
 		for _, op := range ops {
 			op(db1)

dtmutil/utils.go

@@ -80,8 +80,8 @@ func MustGetwd() string {
 	return wd
 }
 
-// GetSqlDir 获取调用该函数的caller源代码的目录，主要用于测试时，查找相关文件
-func GetSqlDir() string {
+// GetSQLDir 获取调用该函数的caller源代码的目录，主要用于测试时，查找相关文件
+func GetSQLDir() string {
 	wd := MustGetwd()
 	if filepath.Base(wd) == "test" {
 		wd = filepath.Dir(wd)
@@ -89,6 +89,7 @@ func GetSqlDir() string {
 	return wd + "/sqls"
 }
 
+// RecoverPanic execs recovery operation
 func RecoverPanic(err *error) {
 	if x := recover(); x != nil {
 		e := dtmimp.AsError(x)
@@ -98,6 +99,7 @@ func RecoverPanic(err *error) {
 	}
 }
 
+// GetNextTime gets next time from second
 func GetNextTime(second int64) *time.Time {
 	next := time.Now().Add(time.Duration(second) * time.Second)
 	return &next
@@ -107,7 +109,7 @@ func GetNextTime(second int64) *time.Time {
 func RunSQLScript(conf dtmcli.DBConf, script string, skipDrop bool) {
 	con, err := dtmimp.StandaloneDB(conf)
 	logger.FatalIfError(err)
-	defer func() { con.Close() }()
+	defer func() { _ = con.Close() }()
 	content, err := ioutil.ReadFile(script)
 	logger.FatalIfError(err)
 	sqls := strings.Split(string(content), ";")

dtmutil/utils_test.go

@@ -31,7 +31,7 @@ func TestGin(t *testing.T) {
 		req, _ := http.NewRequest("GET", api, body)
 		w := httptest.NewRecorder()
 		app.ServeHTTP(w, req)
-		return string(w.Body.Bytes())
+		return w.Body.String()
 	}
 	assert.Equal(t, "{\"msg\":\"pong\"}", getResultString("/api/ping", nil))
 	assert.Equal(t, "1", getResultString("/api/sample", nil))
@@ -42,7 +42,7 @@ func TestFuncs(t *testing.T) {
 	wd := MustGetwd()
 	assert.NotEqual(t, "", wd)
 
-	dir1 := GetSqlDir()
+	dir1 := GetSQLDir()
 	assert.Equal(t, true, strings.HasSuffix(dir1, "/sqls"))
 
 }

test/api_test.go

@@ -20,7 +20,7 @@ func TestAPIQuery(t *testing.T) {
 	err := genMsg(gid).Submit()
 	assert.Nil(t, err)
 	waitTransProcessed(gid)
-	resp, err := dtmimp.RestyClient.R().SetQueryParam("gid", gid).Get(dtmutil.DefaultHttpServer + "/query")
+	resp, err := dtmimp.RestyClient.R().SetQueryParam("gid", gid).Get(dtmutil.DefaultHTTPServer + "/query")
 	assert.Nil(t, err)
 	m := map[string]interface{}{}
 	assert.Equal(t, resp.StatusCode(), 200)
@@ -28,11 +28,11 @@ func TestAPIQuery(t *testing.T) {
 	assert.NotEqual(t, nil, m["transaction"])
 	assert.Equal(t, 2, len(m["branches"].([]interface{})))
 
-	resp, err = dtmimp.RestyClient.R().SetQueryParam("gid", "").Get(dtmutil.DefaultHttpServer + "/query")
+	resp, err = dtmimp.RestyClient.R().SetQueryParam("gid", "").Get(dtmutil.DefaultHTTPServer + "/query")
 	e2p(err)
 	assert.Equal(t, resp.StatusCode(), 500)
 
-	resp, err = dtmimp.RestyClient.R().SetQueryParam("gid", "1").Get(dtmutil.DefaultHttpServer + "/query")
+	resp, err = dtmimp.RestyClient.R().SetQueryParam("gid", "1").Get(dtmutil.DefaultHTTPServer + "/query")
 	e2p(err)
 	assert.Equal(t, resp.StatusCode(), 200)
 	dtmimp.MustUnmarshalString(resp.String(), &m)
@@ -47,7 +47,7 @@ func TestAPIAll(t *testing.T) {
 		assert.Nil(t, err)
 		waitTransProcessed(gid)
 	}
-	resp, err := dtmimp.RestyClient.R().SetQueryParam("limit", "1").Get(dtmutil.DefaultHttpServer + "/all")
+	resp, err := dtmimp.RestyClient.R().SetQueryParam("limit", "1").Get(dtmutil.DefaultHTTPServer + "/all")
 	assert.Nil(t, err)
 	m := map[string]interface{}{}
 	dtmimp.MustUnmarshalString(resp.String(), &m)
@@ -57,7 +57,7 @@ func TestAPIAll(t *testing.T) {
 	resp, err = dtmimp.RestyClient.R().SetQueryParams(map[string]string{
 		"limit":    "1",
 		"position": nextPos,
-	}).Get(dtmutil.DefaultHttpServer + "/all")
+	}).Get(dtmutil.DefaultHTTPServer + "/all")
 	assert.Nil(t, err)
 	dtmimp.MustUnmarshalString(resp.String(), &m)
 	nextPos2 := m["next_position"].(string)
@@ -67,7 +67,7 @@ func TestAPIAll(t *testing.T) {
 	resp, err = dtmimp.RestyClient.R().SetQueryParams(map[string]string{
 		"limit":    "1000",
 		"position": nextPos,
-	}).Get(dtmutil.DefaultHttpServer + "/all")
+	}).Get(dtmutil.DefaultHTTPServer + "/all")
 	assert.Nil(t, err)
 	dtmimp.MustUnmarshalString(resp.String(), &m)
 	nextPos3 := m["next_position"].(string)

test/busi/base_http.go

@@ -61,7 +61,7 @@ func BaseAppStartup() *gin.Engine {
 		c.Next()
 	})
 	var err error
-	XaClient, err = dtmcli.NewXaClient(dtmutil.DefaultHttpServer, BusiConf, Busi+"/xa", func(path string, xa *dtmcli.XaClient) {
+	XaClient, err = dtmcli.NewXaClient(dtmutil.DefaultHTTPServer, BusiConf, Busi+"/xa", func(path string, xa *dtmcli.XaClient) {
 		app.POST(path, dtmutil.WrapHandler(func(c *gin.Context) (interface{}, error) {
 			return xa.HandleCallback(c.Query("gid"), c.Query("branch_id"), c.Query("op"))
 		}))

test/busi/quick_start.go

@@ -35,7 +35,7 @@ func QsStartSvr() {
 func QsFireRequest() string {
 	req := &gin.H{"amount": 30} // 微服务的载荷
 	// DtmServer为DTM服务的地址
-	saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, dtmcli.MustGenGid(dtmutil.DefaultHttpServer)).
+	saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, dtmcli.MustGenGid(dtmutil.DefaultHTTPServer)).
 		// 添加一个TransOut的子事务，正向操作为url: qsBusi+"/TransOut"， 逆向操作为url: qsBusi+"/TransOutCompensate"
 		Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req).
 		// 添加一个TransIn的子事务，正向操作为url: qsBusi+"/TransOut"， 逆向操作为url: qsBusi+"/TransInCompensate"

test/busi/startup.go

@@ -16,8 +16,8 @@ func Startup() *gin.Engine {
 // PopulateDB populate example mysql data
 func PopulateDB(skipDrop bool) {
 	resetXaData()
-	file := fmt.Sprintf("%s/busi.%s.sql", dtmutil.GetSqlDir(), BusiConf.Driver)
+	file := fmt.Sprintf("%s/busi.%s.sql", dtmutil.GetSQLDir(), BusiConf.Driver)
 	dtmutil.RunSQLScript(BusiConf, file, skipDrop)
-	file = fmt.Sprintf("%s/dtmcli.barrier.%s.sql", dtmutil.GetSqlDir(), BusiConf.Driver)
+	file = fmt.Sprintf("%s/dtmcli.barrier.%s.sql", dtmutil.GetSQLDir(), BusiConf.Driver)
 	dtmutil.RunSQLScript(BusiConf, file, skipDrop)
 }

test/common_test.go

@@ -44,5 +44,5 @@ func testDbAlone(t *testing.T) {
 
 func TestMustGenGid(t *testing.T) {
 	dtmgrpc.MustGenGid(dtmutil.DefaultGrpcServer)
-	dtmcli.MustGenGid(dtmutil.DefaultHttpServer)
+	dtmcli.MustGenGid(dtmutil.DefaultHTTPServer)
 }

test/dtmsvr_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var DtmServer = dtmutil.DefaultHttpServer
+var DtmServer = dtmutil.DefaultHTTPServer
 var Busi = busi.Busi
 
 func getTransStatus(gid string) string {

test/msg_test.go

@@ -71,7 +71,7 @@ func TestMsgAbnormal(t *testing.T) {
 
 func genMsg(gid string) *dtmcli.Msg {
 	req := busi.GenTransReq(30, false, false)
-	msg := dtmcli.NewMsg(dtmutil.DefaultHttpServer, gid).
+	msg := dtmcli.NewMsg(dtmutil.DefaultHTTPServer, gid).
 		Add(busi.Busi+"/TransOut", &req).
 		Add(busi.Busi+"/TransIn", &req)
 	msg.QueryPrepared = busi.Busi + "/QueryPrepared"

test/saga_compatible_test.go

@@ -20,7 +20,7 @@ func TestSagaCompatibleNormal(t *testing.T) { // compatible with old http, which
 	gid := dtmimp.GetFuncName()
 	body := fmt.Sprintf(`{"gid":"%s","trans_type":"saga","steps":[{"action":"%s/TransOut","compensate":"%s/TransOutRevert","data":"{\"amount\":30,\"transInResult\":\"SUCCESS\",\"transOutResult\":\"SUCCESS\"}"},{"action":"%s/TransIn","compensate":"%s/TransInRevert","data":"{\"amount\":30,\"transInResult\":\"SUCCESS\",\"transOutResult\":\"SUCCESS\"}"}]}`,
 		gid, busi.Busi, busi.Busi, busi.Busi, busi.Busi)
-	dtmimp.RestyClient.R().SetBody(body).Post(fmt.Sprintf("%s/submit", dtmutil.DefaultHttpServer))
+	dtmimp.RestyClient.R().SetBody(body).Post(fmt.Sprintf("%s/submit", dtmutil.DefaultHTTPServer))
 	waitTransProcessed(gid)
 	assert.Equal(t, []string{StatusPrepared, StatusSucceed, StatusPrepared, StatusSucceed}, getBranchesStatus(gid))
 	assert.Equal(t, StatusSucceed, getTransStatus(gid))

test/saga_options_test.go

@@ -94,7 +94,7 @@ func TestSagaOptionsRollbackWait(t *testing.T) {
 
 func TestSagaPassthroughHeadersYes(t *testing.T) {
 	gidYes := dtmimp.GetFuncName()
-	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gidYes)
+	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gidYes)
 	sagaYes.WaitResult = true
 	sagaYes.PassthroughHeaders = []string{"test_header"}
 	sagaYes.Add(busi.Busi+"/TransOutHeaderYes", "", nil)
@@ -105,7 +105,7 @@ func TestSagaPassthroughHeadersYes(t *testing.T) {
 
 func TestSagaCronPassthroughHeadersYes(t *testing.T) {
 	gidYes := dtmimp.GetFuncName()
-	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gidYes)
+	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gidYes)
 	sagaYes.PassthroughHeaders = []string{"test_header"}
 	sagaYes.Add(busi.Busi+"/TransOutHeaderYes", "", nil)
 	busi.MainSwitch.TransOutResult.SetOnce("ONGOING")
@@ -120,7 +120,7 @@ func TestSagaCronPassthroughHeadersYes(t *testing.T) {
 
 func TestSagaPassthroughHeadersNo(t *testing.T) {
 	gidNo := dtmimp.GetFuncName()
-	sagaNo := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gidNo)
+	sagaNo := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gidNo)
 	sagaNo.WaitResult = true
 	sagaNo.Add(busi.Busi+"/TransOutHeaderNo", "", nil)
 	err := sagaNo.Submit()
@@ -130,7 +130,7 @@ func TestSagaPassthroughHeadersNo(t *testing.T) {
 
 func TestSagaHeaders(t *testing.T) {
 	gidYes := dtmimp.GetFuncName()
-	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gidYes)
+	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gidYes)
 	sagaYes.BranchHeaders = map[string]string{
 		"test_header": "test",
 	}
@@ -143,7 +143,7 @@ func TestSagaHeaders(t *testing.T) {
 
 func TestSagaHeadersYes1(t *testing.T) {
 	gidYes := dtmimp.GetFuncName()
-	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gidYes)
+	sagaYes := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gidYes)
 	sagaYes.BranchHeaders = map[string]string{
 		"test_header": "test",
 	}

test/saga_test.go

@@ -64,7 +64,7 @@ func TestSagaAbnormal(t *testing.T) {
 }
 
 func TestSagaEmptyUrl(t *testing.T) {
-	saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, dtmimp.GetFuncName())
+	saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, dtmimp.GetFuncName())
 	req := busi.GenTransReq(30, false, false)
 	saga.Add(busi.Busi+"/TransOut", "", &req)
 	saga.Add("", "", &req)
@@ -75,7 +75,7 @@ func TestSagaEmptyUrl(t *testing.T) {
 }
 
 func genSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga {
-	saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gid)
+	saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gid)
 	req := busi.GenTransReq(30, outFailed, inFailed)
 	saga.Add(busi.Busi+"/TransOut", busi.Busi+"/TransOutRevert", &req)
 	saga.Add(busi.Busi+"/TransIn", busi.Busi+"/TransInRevert", &req)
@@ -83,7 +83,7 @@ func genSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga {
 }
 
 func genSaga1(gid string, outFailed bool, inFailed bool) *dtmcli.Saga {
-	saga := dtmcli.NewSaga(dtmutil.DefaultHttpServer, gid)
+	saga := dtmcli.NewSaga(dtmutil.DefaultHTTPServer, gid)
 	req := busi.GenTransReq(30, outFailed, inFailed)
 	saga.Add(busi.Busi+"/TransOut", busi.Busi+"/TransOutRevert", &req)
 	return saga

test/tcc_cover_test.go

@@ -21,7 +21,7 @@ func TestTccCoverNotConnected(t *testing.T) {
 func TestTccCoverPanic(t *testing.T) {
 	gid := dtmimp.GetFuncName()
 	err := dtmimp.CatchP(func() {
-		_ = dtmcli.TccGlobalTransaction(dtmutil.DefaultHttpServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+		_ = dtmcli.TccGlobalTransaction(dtmutil.DefaultHTTPServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
 			panic("user panic")
 		})
 		assert.FailNow(t, "not executed")

test/tcc_test.go

@@ -20,7 +20,7 @@ import (
 func TestTccNormal(t *testing.T) {
 	req := busi.GenTransReq(30, false, false)
 	gid := dtmimp.GetFuncName()
-	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHttpServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHTTPServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
 		_, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
 		assert.Nil(t, err)
 		return tcc.CallBranch(req, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
@@ -34,7 +34,7 @@ func TestTccNormal(t *testing.T) {
 func TestTccRollback(t *testing.T) {
 	gid := dtmimp.GetFuncName()
 	req := busi.GenTransReq(30, false, true)
-	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHttpServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHTTPServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
 		_, rerr := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
 		assert.Nil(t, rerr)
 		busi.MainSwitch.TransOutRevertResult.SetOnce(dtmcli.ResultOngoing)
@@ -54,7 +54,7 @@ func TestTccTimeout(t *testing.T) {
 	gid := dtmimp.GetFuncName()
 	timeoutChan := make(chan int, 1)
 
-	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHttpServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHTTPServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
 		_, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
 		assert.Nil(t, err)
 		go func() {
@@ -74,7 +74,7 @@ func TestTccTimeout(t *testing.T) {
 func TestTccCompatible(t *testing.T) {
 	req := busi.GenTransReq(30, false, false)
 	gid := dtmimp.GetFuncName()
-	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHttpServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
+	err := dtmcli.TccGlobalTransaction(dtmutil.DefaultHTTPServer, gid, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
 		_, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
 		assert.Nil(t, err)
 		return tcc.CallBranch(req, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
@@ -89,7 +89,7 @@ func TestTccCompatible(t *testing.T) {
 func TestTccHeaders(t *testing.T) {
 	req := busi.GenTransReq(30, false, false)
 	gid := dtmimp.GetFuncName()
-	err := dtmcli.TccGlobalTransaction2(dtmutil.DefaultHttpServer, gid, func(t *dtmcli.Tcc) {
+	err := dtmcli.TccGlobalTransaction2(dtmutil.DefaultHTTPServer, gid, func(t *dtmcli.Tcc) {
 		t.BranchHeaders = map[string]string{
 			"test_header": "test",
 		}