Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: several fix (#20952)
ecmadao1151c3aa3749
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.goindex 77fa391b97..707e602459 100644--- a/backend/api/v1/instance_service.go+++ b/backend/api/v1/instance_service.go@@ -56,15 +56,18 @@ const (connectionCategorySuccess = "success")-func newConnectionTestErrorWithCategory(code connect.Code, err error, category string, format string, args ...any) *connect.Error {- connectErr := connect.NewError(code, errors.Wrapf(err, format, args...))- connectErr.Meta().Set(connectionCategoryHeader, category)- return connectErr-}-func classifyConnectionFailure(err error) string {if err == nil {- return connectionCategoryUnknown+ return connectionCategorySuccess+ }+ var connectErr *connect.Error+ if errors.As(err, &connectErr) {+ if connectErr == nil {+ return connectionCategorySuccess+ }+ if category := connectErr.Meta().Get(connectionCategoryHeader); category != "" {+ return category+ }}text := strings.ToLower(err.Error())switch {@@ -108,9 +111,16 @@ func classifyConnectionFailure(err error) string {}}-func buildInstanceConnectionLogAttrs(source string, category string, instance *store.InstanceMessage, dataSource *storepb.DataSource, elapsed time.Duration) []slog.Attr {- attrs := []slog.Attr{- slog.String("source", source),+func newConnectionTestErrorWithCategory(code connect.Code, err error, format string, args ...any) *connect.Error {+ category := classifyConnectionFailure(err)+ connectErr := connect.NewError(code, errors.Wrapf(err, format, args...))+ connectErr.Meta().Set(connectionCategoryHeader, category)+ return connectErr+}++func buildInstanceConnectionLogAttrs(method string, category string, instance *store.InstanceMessage, dataSource *storepb.DataSource, elapsed time.Duration) []any {+ attrs := []any{+ slog.String("method", method),slog.String("category", category),slog.Int64("elapsed_ms", elapsed.Milliseconds()),slog.Bool("has_ssl", hasDataSourceSSL(dataSource)),@@ -152,8 +162,28 @@ func hasDataSourceSSH(dataSource *storepb.DataSource) bool {dataSource.GetObfuscatedSshPrivateKey() != ""}-func logInstanceConnection(ctx context.Context, source string, category string, instance *store.InstanceMessage, dataSource *storepb.DataSource, elapsed time.Duration) {- slog.LogAttrs(ctx, slog.LevelInfo, "instance connection check completed", buildInstanceConnectionLogAttrs(source, category, instance, dataSource, elapsed)...)+func (s *InstanceService) checkAndLogInstanceConnection(ctx context.Context, method string, instance *store.InstanceMessage, dataSource *storepb.DataSource) *connect.Error {+ start := time.Now()++ err := func() *connect.Error {+ driver, err := s.dbFactory.GetDataSourceDriver(+ ctx, instance, dataSource,+ db.ConnectionContext{+ ReadOnly: dataSource.GetType() == storepb.DataSourceType_READ_ONLY,+ },+ )+ if err != nil {+ return newConnectionTestErrorWithCategory(connect.CodeInternal, err, "failed to get database driver")+ }+ defer driver.Close(ctx)+ if err := driver.Ping(ctx); err != nil {+ return newConnectionTestErrorWithCategory(connect.CodeInvalidArgument, err, "invalid datasource %s", dataSource.GetType())+ }+ return nil+ }()+ category := classifyConnectionFailure(err)+ slog.Info("instance connection check completed", buildInstanceConnectionLogAttrs(method, category, instance, dataSource, time.Since(start))...)+ return err}// NewInstanceService creates a new InstanceService.@@ -308,29 +338,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque// Test connection.if req.Msg.ValidateOnly {for _, ds := range instanceMessage.Metadata.GetDataSources() {- err := func() error {- start := time.Now()- driver, err := s.dbFactory.GetDataSourceDriver(- ctx, instanceMessage, ds,- db.ConnectionContext{- ReadOnly: ds.GetType() == storepb.DataSourceType_READ_ONLY,- },- )- if err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceCreateInstanceProcedure, category, instanceMessage, ds, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInternal, err, category, "failed to get database driver")- }- defer driver.Close(ctx)- if err := driver.Ping(ctx); err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceCreateInstanceProcedure, category, instanceMessage, ds, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInvalidArgument, err, category, "invalid datasource %s", ds.GetType())- }- logInstanceConnection(ctx, v1connect.InstanceServiceCreateInstanceProcedure, connectionCategorySuccess, instanceMessage, ds, time.Since(start))- return nil- }()- if err != nil {+ if err := s.checkAndLogInstanceConnection(ctx, v1connect.InstanceServiceCreateInstanceProcedure, instanceMessage, ds); err != nil {return nil, err}}@@ -996,29 +1004,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques// Test connection.if req.Msg.ValidateOnly {- err := func() error {- start := time.Now()- driver, err := s.dbFactory.GetDataSourceDriver(- ctx, instance, dataSource,- db.ConnectionContext{- ReadOnly: dataSource.GetType() == storepb.DataSourceType_READ_ONLY,- },- )- if err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceAddDataSourceProcedure, category, instance, dataSource, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInternal, err, category, "failed to get database driver")- }- defer driver.Close(ctx)- if err := driver.Ping(ctx); err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceAddDataSourceProcedure, category, instance, dataSource, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInvalidArgument, err, category, "invalid datasource %s", dataSource.GetType())- }- logInstanceConnection(ctx, v1connect.InstanceServiceAddDataSourceProcedure, connectionCategorySuccess, instance, dataSource, time.Since(start))- return nil- }()- if err != nil {+ if err := s.checkAndLogInstanceConnection(ctx, v1connect.InstanceServiceAddDataSourceProcedure, instance, dataSource); err != nil {return nil, err}result := s.convertToV1Instance(ctx, instanceWithMetadata(instance, metadata))@@ -1224,27 +1210,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req// Test connection.if req.Msg.ValidateOnly {- err := func() error {- start := time.Now()- driver, err := s.dbFactory.GetDataSourceDriver(- ctx, instance, dataSource,- db.ConnectionContext{ReadOnly: dataSource.GetType() == storepb.DataSourceType_READ_ONLY},- )- if err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceUpdateDataSourceProcedure, category, instance, dataSource, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInternal, err, category, "failed to get database driver")- }- defer driver.Close(ctx)- if err := driver.Ping(ctx); err != nil {- category := classifyConnectionFailure(err)- logInstanceConnection(ctx, v1connect.InstanceServiceUpdateDataSourceProcedure, category, instance, dataSource, time.Since(start))- return newConnectionTestErrorWithCategory(connect.CodeInvalidArgument, err, category, "invalid datasource %s", dataSource.GetType())- }- logInstanceConnection(ctx, v1connect.InstanceServiceUpdateDataSourceProcedure, connectionCategorySuccess, instance, dataSource, time.Since(start))- return nil- }()- if err != nil {+ if err := s.checkAndLogInstanceConnection(ctx, v1connect.InstanceServiceUpdateDataSourceProcedure, instance, dataSource); err != nil {return nil, err}result := s.convertToV1Instance(ctx, instanceWithMetadata(instance, metadata))diff --git a/backend/api/v1/instance_service_test.go b/backend/api/v1/instance_service_test.goindex 0d67ed3d29..daa7448873 100644--- a/backend/api/v1/instance_service_test.go+++ b/backend/api/v1/instance_service_test.go@@ -6,6 +6,7 @@ import ("testing""time"+ "connectrpc.com/connect""github.com/stretchr/testify/require""github.com/bytebase/bytebase/backend/component/config"@@ -23,10 +24,17 @@ func TestValidateExtraConnectionParametersRejectsTiDBAllowAllFiles(t *testing.T)}func TestClassifyConnectionFailure(t *testing.T) {+ connectErr := connect.NewError(connect.CodeInvalidArgument, errors.New("generic connect error"))+ connectErr.Meta().Set(connectionCategoryHeader, connectionCategoryAuthFailed)+ var typedNilConnectErr *connect.Error+testCases := []struct {err errorwant string}{+ {err: nil, want: connectionCategorySuccess},+ {err: typedNilConnectErr, want: connectionCategorySuccess},+ {err: connectErr, want: connectionCategoryAuthFailed},{err: errors.New("dial tcp 10.0.0.5:5432: i/o timeout"), want: connectionCategoryTimeout},{err: errors.New("password authentication failed for user bytebase"), want: connectionCategoryAuthFailed},{err: errors.New("permission denied for schema public"), want: connectionCategoryPermissionDenied},@@ -63,12 +71,14 @@ func TestBuildInstanceConnectionLogAttrs(t *testing.T) {attrs := buildInstanceConnectionLogAttrs(v1connect.InstanceServiceCreateInstanceProcedure, connectionCategoryAuthFailed, instance, dataSource, 1500*time.Millisecond)got := make(map[string]any)- for _, attr := range attrs {+ for _, item := range attrs {+ attr, ok := item.(slog.Attr)+ require.True(t, ok)got[attr.Key] = attr.Value.Any()}require.Equal(t, map[string]any{- "source": v1connect.InstanceServiceCreateInstanceProcedure,+ "method": v1connect.InstanceServiceCreateInstanceProcedure,"engine": storepb.Engine_POSTGRES.String(),"data_source_type": storepb.DataSourceType_ADMIN.String(),"category": connectionCategoryAuthFailed,@@ -80,7 +90,6 @@ func TestBuildInstanceConnectionLogAttrs(t *testing.T) {for _, key := range []string{"host", "port", "username", "database", "password", "dsn", "sql"} {require.NotContains(t, got, key)}- require.IsType(t, slog.Attr{}, attrs[0])}func TestValidateExternalSecretForSaaS(t *testing.T) {diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 96f567e1d6..10e3e74857 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -816,7 +816,7 @@"partitions": "Partitions","procedures": "Procedures","project-instance-synced-action": "Create database change",- "project-instance-synced-description": "Your database is ready in this project. Start with a governed database change when you are ready.",+ "project-instance-synced-description": "Your database is ready in this project. Start by querying data in SQL Editor, or create a governed database change when needed.","project-instance-synced-sql-editor-action": "Open SQL Editor","project-instance-synced-title": "Database connected","project-instance-syncing-description": "This may take a few seconds to a few minutes. You can refresh this page later.",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 72ba793a90..d3a2da6675 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -816,7 +816,7 @@"partitions": "Particiones","procedures": "Procedimientos","project-instance-synced-action": "Crear cambio de base de datos",- "project-instance-synced-description": "Tu base de datos está lista en este proyecto. Empieza con un cambio de base de datos gobernado cuando estés listo.",+ "project-instance-synced-description": "Tu base de datos está lista en este proyecto. Empieza consultando datos en SQL Editor, o crea un cambio de base de datos gobernado cuando lo necesites.","project-instance-synced-sql-editor-action": "Abrir SQL Editor","project-instance-synced-title": "Base de datos conectada","project-instance-syncing-description": "Esto puede tardar de unos segundos a unos minutos. Puedes actualizar esta página más tarde.",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex c0a4392316..42377b6648 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -816,7 +816,7 @@"partitions": "パーティション","procedures": "ストアドプロシージャ","project-instance-synced-action": "データベース変更を作成",- "project-instance-synced-description": "このプロジェクトでデータベースを利用できるようになりました。準備ができたら、管理されたデータベース変更から始めてください。",+ "project-instance-synced-description": "このプロジェクトでデータベースを利用できるようになりました。まず SQL Editor でデータをクエリし、必要に応じて管理されたデータベース変更を作成できます。","project-instance-synced-sql-editor-action": "SQL Editor を開く","project-instance-synced-title": "データベースが接続されました","project-instance-syncing-description": "数秒から数分かかる場合があります。後でこのページを更新してください。",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 6454c01667..b54dbf3a1f 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -816,7 +816,7 @@"partitions": "Phân vùng","procedures": "Thủ tục","project-instance-synced-action": "Tạo thay đổi cơ sở dữ liệu",- "project-instance-synced-description": "Cơ sở dữ liệu của bạn đã sẵn sàng trong dự án này. Hãy bắt đầu bằng một thay đổi cơ sở dữ liệu được quản trị khi bạn sẵn sàng.",+ "project-instance-synced-description": "Cơ sở dữ liệu của bạn đã sẵn sàng trong dự án này. Hãy bắt đầu bằng cách truy vấn dữ liệu trong SQL Editor, hoặc tạo thay đổi cơ sở dữ liệu được quản trị khi cần.","project-instance-synced-sql-editor-action": "Mở SQL Editor","project-instance-synced-title": "Đã kết nối cơ sở dữ liệu","project-instance-syncing-description": "Quá trình này có thể mất vài giây đến vài phút. Bạn có thể làm mới trang này sau.",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex d1e8bd12e5..d79dc55d45 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -816,7 +816,7 @@"partitions": "分区","procedures": "存储过程","project-instance-synced-action": "创建数据库变更",- "project-instance-synced-description": "你的数据库已在此项目中就绪。准备好后,可以从受管数据库变更开始。",+ "project-instance-synced-description": "你的数据库已在此项目中就绪。可以先在 SQL Editor 中查询数据,也可以在需要时创建受管数据库变更。","project-instance-synced-sql-editor-action": "打开 SQL Editor","project-instance-synced-title": "数据库已连接","project-instance-syncing-description": "这可能需要几秒到几分钟。你可以稍后刷新此页面。",diff --git a/frontend/src/modules/sql-editor/components/ResultView/TableCell.test.tsx b/frontend/src/modules/sql-editor/components/ResultView/TableCell.test.tsxindex b653d123b0..efe3e0ca9b 100644--- a/frontend/src/modules/sql-editor/components/ResultView/TableCell.test.tsx+++ b/frontend/src/modules/sql-editor/components/ResultView/TableCell.test.tsx@@ -111,7 +111,7 @@ describe("TableCell", () => {);});- test("preserves leading whitespace when rendering string cells", () => {+ test("preserves leading whitespace without soft-wrapping string cells", () => {const { container } = render(<SQLResultViewProviderengine={Engine.POSTGRES}@@ -132,6 +132,8 @@ describe("TableCell", () => {const content = container.querySelector(".line-clamp-3");expect(content?.textContent).toBe(" -> Seq Scan on project");- expect(content).toHaveClass("whitespace-pre-wrap");+ expect(content).toHaveClass("whitespace-pre");+ expect(content).not.toHaveClass("whitespace-pre-wrap");+ expect(content).not.toHaveClass("wrap-break-word");});});diff --git a/frontend/src/modules/sql-editor/components/ResultView/TableCell.tsx b/frontend/src/modules/sql-editor/components/ResultView/TableCell.tsxindex 548fa2d23e..c7a78bce26 100644--- a/frontend/src/modules/sql-editor/components/ResultView/TableCell.tsx+++ b/frontend/src/modules/sql-editor/components/ResultView/TableCell.tsx@@ -142,7 +142,7 @@ export function TableCell({<divref={wrapperRef}className={cn(- "font-mono text-start wrap-break-word whitespace-pre-wrap line-clamp-3",+ "font-mono text-start whitespace-pre line-clamp-3",(hasByteData || clickable) && "max-w-[calc(100%-1.5rem)]",hasByteData && clickable && "max-w-[calc(100%-3.25rem)]")}