*: rename TiProxy to tiproxy in go import (#353)

pingcap · Sep 1, 2023 · 8551648 · 8551648
1 parent 7f0eed6
commit 8551648
Show file tree

Hide file tree

Showing 97 changed files with 220 additions and 219 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -4,7 +4,7 @@ builds:
     main: ./cmd/tiproxy
     binary: tiproxy
     ldflags:
-      - -s -w -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyVersion={{.Version}} -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyGitHash={{.FullCommit}}
+      - -s -w -X github.com/pingcap/tiproxy/pkg/util/versioninfo.TiProxyVersion={{.Version}} -X github.com/pingcap/tiproxy/pkg/util/versioninfo.TiProxyGitHash={{.FullCommit}}
     goos:
       - linux
       - darwin
@@ -22,7 +22,7 @@ builds:
     main: ./cmd/tiproxyctl
     binary: tiproxyctl
     ldflags:
-      - -s -w -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyVersion={{.Version}} -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyGitHash={{.FullCommit}}
+      - -s -w -X github.com/pingcap/tiproxy/pkg/util/versioninfo.TiProxyVersion={{.Version}} -X github.com/pingcap/tiproxy/pkg/util/versioninfo.TiProxyGitHash={{.FullCommit}}
     goos:
       - linux
       - darwin

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ DEBUG ?=
 DOCKERPREFIX ?=
 BUILD_TAGS ?=
 LDFLAGS ?=
-BUILDFLAGS ?= -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS) -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyVersion=$(VERSION) -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyGitHash=$(COMMIT)' -tags '$(BUILD_TAGS)'
+BUILDFLAGS ?= -gcflags '$(GCFLAGS)' -ldflags '$(LDFLAGS) -X github.com/pingcap/tiproxy/pkg/util/versioninfo.TiProxyVersion=$(VERSION) -X github.com/pingcap/TiProxy/pkg/util/versioninfo.TiProxyGitHash=$(COMMIT)' -tags '$(BUILD_TAGS)'
 ifneq ("$(DEBUG)", "")
 	BUILDFLAGS += -race
 endif

diff --git a/cmd/tiproxy/main.go b/cmd/tiproxy/main.go
@@ -8,12 +8,12 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/pingcap/TiProxy/lib/util/cmd"
-	"github.com/pingcap/TiProxy/lib/util/errors"
-	"github.com/pingcap/TiProxy/pkg/metrics"
-	"github.com/pingcap/TiProxy/pkg/sctx"
-	"github.com/pingcap/TiProxy/pkg/server"
-	"github.com/pingcap/TiProxy/pkg/util/versioninfo"
+	"github.com/pingcap/tiproxy/lib/util/cmd"
+	"github.com/pingcap/tiproxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/pkg/metrics"
+	"github.com/pingcap/tiproxy/pkg/sctx"
+	"github.com/pingcap/tiproxy/pkg/server"
+	"github.com/pingcap/tiproxy/pkg/util/versioninfo"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/tiproxyctl/main.go b/cmd/tiproxyctl/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pingcap/TiProxy/lib/cli"
-	"github.com/pingcap/TiProxy/lib/util/cmd"
-	"github.com/pingcap/TiProxy/pkg/util/versioninfo"
+	"github.com/pingcap/tiproxy/lib/cli"
+	"github.com/pingcap/tiproxy/lib/util/cmd"
+	"github.com/pingcap/tiproxy/pkg/util/versioninfo"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/pingcap/TiProxy
+module github.com/pingcap/tiproxy
 
 go 1.19
 
@@ -10,9 +10,9 @@ require (
 	github.com/gin-contrib/pprof v1.4.0
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-mysql-org/go-mysql v1.6.0
-	github.com/pingcap/TiProxy/lib v0.0.0-00010101000000-000000000000
 	github.com/pingcap/tidb v1.1.0-beta.0.20230103132820-3ccff46aa3bc
 	github.com/pingcap/tidb/parser v0.0.0-20230103132820-3ccff46aa3bc
+	github.com/pingcap/tiproxy/lib v0.0.0-00010101000000-000000000000
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/client_model v0.3.0
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
@@ -141,4 +141,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace github.com/pingcap/TiProxy/lib => ./lib
+replace github.com/pingcap/tiproxy/lib => ./lib
diff --git a/lib/cli/main.go b/lib/cli/main.go
@@ -10,9 +10,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/cmd"
-	"github.com/pingcap/TiProxy/lib/util/security"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/cmd"
+	"github.com/pingcap/tiproxy/lib/util/security"
 	"github.com/spf13/cobra"
 )
 

diff --git a/lib/cli/namespace.go b/lib/cli/namespace.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	"github.com/pingcap/TiProxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/config"
 	"github.com/spf13/cobra"
 )
 

diff --git a/lib/cli/util.go b/lib/cli/util.go
@@ -10,7 +10,7 @@ import (
 	"math/rand"
 	"net/http"
 
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 	"go.uber.org/zap"
 )
 

diff --git a/lib/config/proxy.go b/lib/config/proxy.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 )
 
 var (

diff --git a/lib/go.mod b/lib/go.mod
@@ -1,4 +1,4 @@
-module github.com/pingcap/TiProxy/lib
+module github.com/pingcap/tiproxy/lib
 
 go 1.18
 

diff --git a/lib/util/cmd/logger.go b/lib/util/cmd/logger.go
@@ -6,7 +6,7 @@ package cmd
 import (
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )

diff --git a/lib/util/cmd/syncer.go b/lib/util/cmd/syncer.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"

diff --git a/lib/util/errors/error_test.go b/lib/util/errors/error_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	serr "github.com/pingcap/TiProxy/lib/util/errors"
+	serr "github.com/pingcap/tiproxy/lib/util/errors"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/errors/errors_test.go b/lib/util/errors/errors_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	serr "github.com/pingcap/TiProxy/lib/util/errors"
+	serr "github.com/pingcap/tiproxy/lib/util/errors"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/errors/merror_test.go b/lib/util/errors/merror_test.go
@@ -6,7 +6,7 @@ package errors_test
 import (
 	"testing"
 
-	serr "github.com/pingcap/TiProxy/lib/util/errors"
+	serr "github.com/pingcap/tiproxy/lib/util/errors"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/errors/werror_test.go b/lib/util/errors/werror_test.go
@@ -6,7 +6,7 @@ package errors_test
 import (
 	"testing"
 
-	serr "github.com/pingcap/TiProxy/lib/util/errors"
+	serr "github.com/pingcap/tiproxy/lib/util/errors"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/security/cert.go b/lib/util/security/cert.go
@@ -11,8 +11,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 	"go.uber.org/zap"
 )
 

diff --git a/lib/util/security/cert_test.go b/lib/util/security/cert_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/logger"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/security/tls.go b/lib/util/security/tls.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 	"go.uber.org/zap"
 )
 

diff --git a/lib/util/security/tls_test.go b/lib/util/security/tls_test.go
@@ -7,7 +7,7 @@ import (
 	"crypto/tls"
 	"testing"
 
-	"github.com/pingcap/TiProxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/util/logger"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/util/systimemon/systime_mon_test.go b/lib/util/systimemon/systime_mon_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/util/logger"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 )

diff --git a/pkg/manager/cert/manager.go b/pkg/manager/cert/manager.go
@@ -9,11 +9,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
-	"github.com/pingcap/TiProxy/lib/util/security"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
-	"github.com/pingcap/TiProxy/pkg/metrics"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/util/security"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/pkg/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/manager/cert/manager_test.go b/pkg/manager/cert/manager_test.go
@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/logger"
-	"github.com/pingcap/TiProxy/lib/util/security"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/util/security"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/fsnotify/fsnotify"
-	"github.com/pingcap/TiProxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/config"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/manager/config/config_test.go b/pkg/manager/config/config_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/config"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/pkg/manager/config/manager.go b/pkg/manager/config/manager.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
 	"github.com/tidwall/btree"
 	"go.uber.org/zap"
 )

diff --git a/pkg/manager/config/manager_test.go b/pkg/manager/config/manager_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/logger"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/pkg/manager/config/namespace.go b/pkg/manager/config/namespace.go
@@ -9,8 +9,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 

diff --git a/pkg/manager/config/namespace_test.go b/pkg/manager/config/namespace_test.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
 	"github.com/stretchr/testify/require"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )

diff --git a/pkg/manager/infosync/etcd.go b/pkg/manager/infosync/etcd.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
-	"github.com/pingcap/TiProxy/pkg/manager/cert"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/pkg/manager/cert"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

diff --git a/pkg/manager/infosync/info.go b/pkg/manager/infosync/info.go
@@ -13,14 +13,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/errors"
-	"github.com/pingcap/TiProxy/lib/util/retry"
-	"github.com/pingcap/TiProxy/lib/util/sys"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
-	"github.com/pingcap/TiProxy/pkg/manager/cert"
-	"github.com/pingcap/TiProxy/pkg/util/versioninfo"
 	tidbinfo "github.com/pingcap/tidb/domain/infosync"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/errors"
+	"github.com/pingcap/tiproxy/lib/util/retry"
+	"github.com/pingcap/tiproxy/lib/util/sys"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/pkg/manager/cert"
+	"github.com/pingcap/tiproxy/pkg/util/versioninfo"
 	"github.com/siddontang/go/hack"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/concurrency"

diff --git a/pkg/manager/infosync/info_test.go b/pkg/manager/infosync/info_test.go
@@ -13,11 +13,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/logger"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
-	"github.com/pingcap/TiProxy/pkg/manager/cert"
 	tidbinfo "github.com/pingcap/tidb/domain/infosync"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/logger"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/pkg/manager/cert"
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	clientv3 "go.etcd.io/etcd/client/v3"

diff --git a/pkg/manager/logger/manager.go b/pkg/manager/logger/manager.go
@@ -7,9 +7,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/pingcap/TiProxy/lib/config"
-	"github.com/pingcap/TiProxy/lib/util/cmd"
-	"github.com/pingcap/TiProxy/lib/util/waitgroup"
+	"github.com/pingcap/tiproxy/lib/config"
+	"github.com/pingcap/tiproxy/lib/util/cmd"
+	"github.com/pingcap/tiproxy/lib/util/waitgroup"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )