Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: clear data after authentication type changed (#19297)

ecmadao6424e8b05d28
diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.go
index fd7680b230..bb0fb7ee64 100644
--- a/backend/api/v1/database_service.go
+++ b/backend/api/v1/database_service.go
@@ -948,7 +948,7 @@ func (s *DatabaseService) convertToDatabase(ctx context.Context, database *store
effEnv := common.FormatEnvironment(*database.EffectiveEnvironmentID)
effectiveEnvironment = &effEnv
}
- instanceResource := convertInstanceMessageToInstanceResource(instance)
+ instanceResource := convertToV1InstanceResource(instance)
return &v1pb.Database{
Name: common.FormatDatabase(database.InstanceID, database.DatabaseName),
State: convertDeletedToState(database.Deleted),
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index 7b87221f68..bd55537464 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -54,7 +54,7 @@ func (s *InstanceService) GetInstance(ctx context.Context, req *connect.Request[
if err != nil {
return nil, err
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -104,7 +104,7 @@ func (s *InstanceService) ListInstances(ctx context.Context, req *connect.Reques
NextPageToken: nextPageToken,
}
for _, instance := range instances {
- ins := convertInstanceMessage(instance)
+ ins := convertToV1Instance(instance)
response.Instances = append(response.Instances, ins)
}
return connect.NewResponse(response), nil
@@ -120,7 +120,7 @@ func (s *InstanceService) ListInstanceDatabase(ctx context.Context, req *connect
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- if instanceMessage, err = convertInstanceToInstanceMessage(instanceID, req.Msg.Instance); err != nil {
+ if instanceMessage, err = convertToStoreInstance(instanceID, req.Msg.Instance); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
} else {
@@ -160,7 +160,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- instanceMessage, err := convertInstanceToInstanceMessage(req.Msg.InstanceId, req.Msg.Instance)
+ instanceMessage, err := convertToStoreInstance(req.Msg.InstanceId, req.Msg.Instance)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -189,7 +189,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
}
}
- result := convertInstanceMessage(instanceMessage)
+ result := convertToV1Instance(instanceMessage)
return connect.NewResponse(result), nil
}
@@ -228,7 +228,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque
s.schemaSyncer.SyncAllDatabases(ctx, instance)
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -417,7 +417,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- result := convertInstanceMessage(ins)
+ result := convertToV1Instance(ins)
return connect.NewResponse(result), nil
}
@@ -498,7 +498,7 @@ func (s *InstanceService) UndeleteInstance(ctx context.Context, req *connect.Req
}
// Idempotent: if already active, return the instance
if !instance.Deleted {
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
if err := s.instanceCountGuard(ctx); err != nil {
@@ -518,7 +518,7 @@ func (s *InstanceService) UndeleteInstance(ctx context.Context, req *connect.Req
slog.Warn("failed to handle sample instance undelete", log.BBError(err), slog.String("instance", ins.ResourceID))
}
- result := convertInstanceMessage(ins)
+ result := convertToV1Instance(ins)
return connect.NewResponse(result), nil
}
@@ -641,7 +641,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
if err != nil {
return nil, err
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -662,7 +662,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInternal, err)
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -791,6 +791,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
ClientSecret: azureCredential.ClientSecret,
},
}
+ dataSource.AuthenticationType = storepb.DataSource_AZURE_IAM
} else {
dataSource.IamExtension = nil
}
@@ -805,6 +806,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
ExternalId: awsCredential.ExternalId,
},
}
+ dataSource.AuthenticationType = storepb.DataSource_AWS_RDS_IAM
} else {
dataSource.IamExtension = nil
}
@@ -815,6 +817,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
Content: gcpCredential.Content,
},
}
+ dataSource.AuthenticationType = storepb.DataSource_GOOGLE_CLOUD_SQL_IAM
} else {
dataSource.IamExtension = nil
}
@@ -825,6 +828,8 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
}
}
+ clearDataSourceAuthentication(dataSource)
+
if err := s.checkDataSource(instance, dataSource); err != nil {
return nil, err
}
@@ -848,7 +853,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
if err != nil {
return nil, err
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -859,7 +864,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
@@ -905,7 +910,7 @@ func (s *InstanceService) RemoveDataSource(ctx context.Context, req *connect.Req
return nil, connect.NewError(connect.CodeInternal, err)
}
- result := convertInstanceMessage(instance)
+ result := convertToV1Instance(instance)
return connect.NewResponse(result), nil
}
diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.go
index 10128d1a07..b682595946 100644
--- a/backend/api/v1/instance_service_converter.go
+++ b/backend/api/v1/instance_service_converter.go
@@ -12,7 +12,7 @@ import (
"github.com/bytebase/bytebase/backend/store"
)
-func convertInstanceMessage(instance *store.InstanceMessage) *v1pb.Instance {
+func convertToV1Instance(instance *store.InstanceMessage) *v1pb.Instance {
engine := convertToEngine(instance.Metadata.GetEngine())
dataSources := convertDataSources(instance.Metadata.GetDataSources())
@@ -62,7 +62,7 @@ func convertInstanceRoles(instance *store.InstanceMessage, roles []*storepb.Inst
return v1Roles
}
-func convertInstanceToInstanceMessage(instanceID string, instance *v1pb.Instance) (*store.InstanceMessage, error) {
+func convertToStoreInstance(instanceID string, instance *v1pb.Instance) (*store.InstanceMessage, error) {
datasources, err := convertV1DataSources(instance.DataSources)
if err != nil {
return nil, err
@@ -93,8 +93,8 @@ func convertInstanceToInstanceMessage(instanceID string, instance *v1pb.Instance
}, nil
}
-func convertInstanceMessageToInstanceResource(instanceMessage *store.InstanceMessage) *v1pb.InstanceResource {
- instance := convertInstanceMessage(instanceMessage)
+func convertToV1InstanceResource(instanceMessage *store.InstanceMessage) *v1pb.InstanceResource {
+ instance := convertToV1Instance(instanceMessage)
return &v1pb.InstanceResource{
Name: instance.Name,
Title: instance.Title,
@@ -532,9 +532,30 @@ func convertV1DataSource(dataSource *v1pb.DataSource) (*storepb.DataSource, erro
default:
}
+ clearDataSourceAuthentication(storeDataSource)
+
return storeDataSource, nil
}
+func clearDataSourceAuthentication(ds *storepb.DataSource) {
+ switch ds.AuthenticationType {
+ case storepb.DataSource_AZURE_IAM, storepb.DataSource_GOOGLE_CLOUD_SQL_IAM, storepb.DataSource_AWS_RDS_IAM:
+ ds.Password = ""
+ ds.ExternalSecret = nil
+ default:
+ if ds.ExternalSecret != nil {
+ ds.IamExtension = nil
+ if ds.ExternalSecret.SecretType != storepb.DataSourceExternalSecret_SECRET_TYPE_UNSPECIFIED {
+ ds.Password = ""
+ }
+ }
+ if ds.Password != "" {
+ ds.ExternalSecret = nil
+ ds.IamExtension = nil
+ }
+ }
+}
+
func convertV1DataSourceType(tp v1pb.DataSourceType) (storepb.DataSourceType, error) {
switch tp {
case v1pb.DataSourceType_READ_ONLY: