Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: optimize release and task run conversions (#18523)
Danny Xu636e7fbc1d86
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.goindex 1ea874ab2a..5b15010aa1 100644--- a/backend/api/v1/release_service.go+++ b/backend/api/v1/release_service.go@@ -108,21 +108,39 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Request}}- files, err := convertReleaseFiles(ctx, s.store, sanitizedFiles)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert files"))- }-releaseMessage := &store.ReleaseMessage{ProjectID: project.ResourceID,Digest: req.Msg.Release.Digest,Payload: &storepb.ReleasePayload{Title: req.Msg.Release.Title,- Files: files,VcsSource: convertReleaseVcsSource(req.Msg.Release.VcsSource),},}+ for _, f := range sanitizedFiles {+ projectID, sheetUID, err := common.GetProjectResourceIDSheetUID(f.Sheet)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get sheetUID from %q", f.Sheet)+ }+ sheet, err := s.store.GetSheetMetadata(ctx, sheetUID)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get sheet %q", f.Sheet)+ }+ if sheet.ProjectID != projectID {+ return nil, errors.Errorf("sheet %d not in project %s", sheetUID, projectID)+ }++ releaseMessage.Payload.Files = append(releaseMessage.Payload.Files, &storepb.ReleasePayload_File{+ Id: f.Id,+ Path: f.Path,+ Sheet: f.Sheet,+ SheetSha256: sheet.GetSha256Hex(),+ Type: storepb.SchemaChangeType(f.Type),+ Version: f.Version,+ EnableGhost: f.EnableGhost,+ })+ }+release, err := s.store.CreateRelease(ctx, releaseMessage, user.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create release"))@@ -408,43 +426,16 @@ func convertToReleases(ctx context.Context, s *store.Store, releases []*store.Refunc convertToRelease(ctx context.Context, s *store.Store, release *store.ReleaseMessage) (*v1pb.Release, error) {r := &v1pb.Release{+ Name: common.FormatReleaseName(release.ProjectID, release.UID),Title: release.Payload.Title,+ Creator: common.FormatUserEmail(release.Creator),CreateTime: timestamppb.New(release.At),VcsSource: convertToReleaseVcsSource(release.Payload.VcsSource),State: convertDeletedToState(release.Deleted),Digest: release.Digest,}- files, err := convertToReleaseFiles(ctx, s, release.Payload.Files)- if err != nil {- return nil, errors.Wrapf(err, "failed to convert release files")- }- r.Files = files-- project, err := s.GetProject(ctx, &store.FindProjectMessage{ResourceID: &release.ProjectID})- if err != nil {- return nil, errors.Wrapf(err, "failed to find project")- }- if project == nil {- return nil, errors.Errorf("project %s not found", release.ProjectID)- }- r.Name = common.FormatReleaseName(project.ResourceID, release.UID)-- creator, err := s.GetUserByEmail(ctx, release.Creator)- if err != nil {- return nil, errors.Wrapf(err, "failed to get release creator")- }- r.Creator = common.FormatUserEmail(creator.Email)-- return r, nil-}--func convertToReleaseFiles(ctx context.Context, s *store.Store, files []*storepb.ReleasePayload_File) ([]*v1pb.Release_File, error) {- if files == nil {- return nil, nil- }- var v1Files []*v1pb.Release_File- for _, f := range files {+ for _, f := range release.Payload.Files {projectID, sheetUID, err := common.GetProjectResourceIDSheetUID(f.Sheet)if err != nil {return nil, errors.Wrapf(err, "failed to get sheetUID from %q", f.Sheet)@@ -456,7 +447,7 @@ func convertToReleaseFiles(ctx context.Context, s *store.Store, files []*storepbif sheet.ProjectID != projectID {return nil, errors.Errorf("sheet %d not in project %s", sheetUID, projectID)}- v1Files = append(v1Files, &v1pb.Release_File{+ r.Files = append(r.Files, &v1pb.Release_File{Id: f.Id,Path: f.Path,Sheet: f.Sheet,@@ -468,7 +459,7 @@ func convertToReleaseFiles(ctx context.Context, s *store.Store, files []*storepbEnableGhost: f.EnableGhost,})}- return v1Files, nil+ return r, nil}func convertToReleaseVcsSource(vs *storepb.ReleasePayload_VCSSource) *v1pb.Release_VCSSource {@@ -481,37 +472,6 @@ func convertToReleaseVcsSource(vs *storepb.ReleasePayload_VCSSource) *v1pb.Relea}}-func convertReleaseFiles(ctx context.Context, s *store.Store, files []*v1pb.Release_File) ([]*storepb.ReleasePayload_File, error) {- if files == nil {- return nil, nil- }- var rFiles []*storepb.ReleasePayload_File- for _, f := range files {- projectID, sheetUID, err := common.GetProjectResourceIDSheetUID(f.Sheet)- if err != nil {- return nil, errors.Wrapf(err, "failed to get sheetUID from %q", f.Sheet)- }- sheet, err := s.GetSheetMetadata(ctx, sheetUID)- if err != nil {- return nil, errors.Wrapf(err, "failed to get sheet %q", f.Sheet)- }- if sheet.ProjectID != projectID {- return nil, errors.Errorf("sheet %d not in project %s", sheetUID, projectID)- }-- rFiles = append(rFiles, &storepb.ReleasePayload_File{- Id: f.Id,- Path: f.Path,- Sheet: f.Sheet,- SheetSha256: sheet.GetSha256Hex(),- Type: storepb.SchemaChangeType(f.Type),- Version: f.Version,- EnableGhost: f.EnableGhost,- })- }- return rFiles, nil-}-func convertReleaseVcsSource(vs *v1pb.Release_VCSSource) *storepb.ReleasePayload_VCSSource {if vs == nil {return nildiff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.goindex 0dae4435ed..974265eb9c 100644--- a/backend/api/v1/rollout_service_converter.go+++ b/backend/api/v1/rollout_service_converter.go@@ -56,11 +56,7 @@ func convertToTaskRun(ctx context.Context, s *store.Store, stateCfg *state.State}if taskRun.SheetUID != nil && *taskRun.SheetUID != 0 {- sheet, err := s.GetSheetMetadata(ctx, *taskRun.SheetUID)- if err != nil {- return nil, errors.Wrapf(err, "failed to get sheet")- }- t.Sheet = common.FormatSheet(taskRun.ProjectID, sheet.UID)+ t.Sheet = common.FormatSheet(taskRun.ProjectID, *taskRun.SheetUID)}if v, ok := stateCfg.TaskRunSchedulerInfo.Load(taskRun.ID); ok {