Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: issue rollout create order (#17867)
p0nyb41bfa27e911
diff --git a/backend/migrator/migration/3.11/0020##drop_issue_pipeline_id.sql b/backend/migrator/migration/3.11/0020##drop_issue_pipeline_id.sqlnew file mode 100644index 0000000000..84452ba177--- /dev/null+++ b/backend/migrator/migration/3.11/0020##drop_issue_pipeline_id.sql@@ -0,0 +1,2 @@+DROP INDEX IF EXISTS idx_issue_pipeline_id;+ALTER TABLE issue DROP COLUMN IF EXISTS pipeline_id;diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex 3cfc68b469..a64a39c115 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -307,7 +307,6 @@ CREATE TABLE issue (updated_at timestamptz NOT NULL DEFAULT now(),project text NOT NULL REFERENCES project(resource_id),plan_id bigint REFERENCES plan(id),- pipeline_id integer REFERENCES pipeline(id),name text NOT NULL,status text NOT NULL CHECK (status IN ('OPEN', 'DONE', 'CANCELED')),-- type: DATABASE_CHANGE, GRANT_REQUEST, DATABASE_EXPORT@@ -323,8 +322,6 @@ CREATE INDEX idx_issue_project ON issue(project);CREATE INDEX idx_issue_plan_id ON issue(plan_id);-CREATE INDEX idx_issue_pipeline_id ON issue(pipeline_id);-CREATE INDEX idx_issue_creator_id ON issue(creator_id);CREATE INDEX idx_issue_ts_vector ON issue USING GIN(ts_vector);diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex a024162cce..93ef621a7e 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -12,7 +12,7 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.11.19"), *files[len(files)-1].version)+ require.Equal(t, semver.MustParse("3.11.20"), *files[len(files)-1].version)}func TestVersionUnique(t *testing.T) {diff --git a/backend/store/issue.go b/backend/store/issue.goindex 5e549b0a1a..79a76d5265 100644--- a/backend/store/issue.go+++ b/backend/store/issue.go@@ -39,7 +39,7 @@ type IssueMessage struct {Type storepb.Issue_TypeDescription stringPayload *storepb.Issue- PipelineUID *int+ PipelineUID *int // Computed from plan.pipeline_idPlanUID *int64TaskStatusCount map[string]int32@@ -62,8 +62,6 @@ type UpdateIssueMessage struct {// PayloadUpsert upserts the presented top-level keys.PayloadUpsert *storepb.IssueRemoveLabels bool-- PipelineUID *int}// FindIssueMessage is the message to find issues.@@ -72,7 +70,7 @@ type FindIssueMessage struct {ProjectID *stringProjectIDs *[]stringPlanUID *int64- PipelineID *int+ PipelineID *int // Filter by pipeline_id (computed from plan)// To support pagination, we add into creator.// Only principleID or one of the following three fields can be set.CreatorID *int@@ -146,7 +144,6 @@ func (s *Store) CreateIssueV2(ctx context.Context, create *IssueMessage, creatorINSERT INTO issue (creator_id,project,- pipeline_id,plan_id,name,status,@@ -155,11 +152,10 @@ func (s *Store) CreateIssueV2(ctx context.Context, create *IssueMessage, creatorpayload,ts_vector)- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)RETURNING id`,creatorID,create.Project.ResourceID,- create.PipelineUID,create.PlanUID,create.Title,create.Status.String(),@@ -203,9 +199,6 @@ func (s *Store) UpdateIssueV2(ctx context.Context, uid int, patch *UpdateIssueMeset := qb.Q()set.Comma("updated_at = ?", time.Now())- if v := patch.PipelineUID; v != nil {- set.Comma("pipeline_id = ?", *v)- }if v := patch.Title; v != nil {set.Comma("name = ?", *v)}@@ -278,7 +271,7 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Isswhere.And("issue.id = ?", *v)}if v := find.PipelineID; v != nil {- where.And("issue.pipeline_id = ?", *v)+ where.And("plan.pipeline_id = ?", *v)}if v := find.PlanUID; v != nil {where.And("issue.plan_id = ?", *v)@@ -290,10 +283,10 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Isswhere.And("issue.project = ANY(?)", *v)}if v := find.InstanceResourceID; v != nil {- where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = issue.pipeline_id AND task.instance = ?)", *v)+ where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.instance = ?)", *v)}if find.InstanceID != nil && find.DatabaseName != nil {- where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = issue.pipeline_id AND task.instance = ? AND task.db_name = ?)", *find.InstanceID, *find.DatabaseName)+ where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.instance = ? AND task.db_name = ?)", *find.InstanceID, *find.DatabaseName)}if v := find.CreatorID; v != nil {where.And("issue.creator_id = ?", *v)@@ -335,19 +328,19 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Issfor _, mt := range *find.MigrateTypes {migrateTypeStrings = append(migrateTypeStrings, mt.String())}- where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = issue.pipeline_id AND task.type = ANY(?) AND task.payload->>'migrateType' = ANY(?))", taskTypeStrings, migrateTypeStrings)+ where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.type = ANY(?) AND task.payload->>'migrateType' = ANY(?))", taskTypeStrings, migrateTypeStrings)} else {- where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = issue.pipeline_id AND task.type = ANY(?))", taskTypeStrings)+ where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.type = ANY(?))", taskTypeStrings)}}if v := find.EnvironmentID; v != nil {- where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = issue.pipeline_id AND task.environment = ?)", *v)+ where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.environment = ?)", *v)}if len(find.LabelList) != 0 {where.And("payload->'labels' ??& ?::TEXT[]", find.LabelList)}if find.NoPipeline {- where.And("issue.pipeline_id IS NULL")+ where.And("plan.pipeline_id IS NULL")}q := qb.Q().Space(`@@ -357,7 +350,7 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Ississue.created_at,issue.updated_at,issue.project,- issue.pipeline_id,+ plan.pipeline_id,issue.plan_id,COALESCE(plan.name, issue.name) AS name,issue.status,@@ -386,7 +379,7 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Iss(SELECT task_run.status FROM task_run WHERE task_run.task_id = task.id ORDER BY task_run.id DESC LIMIT 1), 'NOT_STARTED') AS status) AS latest_task_run ON TRUE- WHERE task.pipeline_id = issue.pipeline_id+ WHERE task.pipeline_id = plan.pipeline_id) AS tGROUP BY t.status) AS t@@ -494,51 +487,67 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Iss// BatchUpdateIssueStatuses updates the status of multiple issues.func (s *Store) BatchUpdateIssueStatuses(ctx context.Context, issueUIDs []int, status storepb.Issue_Status) error {- q := qb.Q().Space("UPDATE issue SET status = ? WHERE id = ANY(?) RETURNING id, pipeline_id", status.String(), issueUIDs)-- query, args, err := q.ToSQL()+ // First get the pipeline IDs for cache invalidation+ selectQuery := qb.Q().Space(`+ SELECT issue.id, plan.pipeline_id+ FROM issue+ LEFT JOIN plan ON issue.plan_id = plan.id+ WHERE issue.id = ANY(?)+ `, issueUIDs)+ selectSQL, selectArgs, err := selectQuery.ToSQL()if err != nil {- return errors.Wrapf(err, "failed to build sql")+ return errors.Wrapf(err, "failed to build select sql")}+ type issueInfo struct {+ id int+ pipelineUID *int+ }+ var infos []issueInfo+tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {return errors.Wrapf(err, "failed to begin transaction")}defer tx.Rollback()- rows, err := tx.QueryContext(ctx, query, args...)+ rows, err := tx.QueryContext(ctx, selectSQL, selectArgs...)if err != nil {return errors.Wrapf(err, "failed to query")}defer rows.Close()-- var issueIDs []int- var pipelineIDs []intfor rows.Next() {- var issueID int- var pipelineID sql.NullInt32- if err := rows.Scan(&issueID, &pipelineID); err != nil {+ var info issueInfo+ if err := rows.Scan(&info.id, &info.pipelineUID); err != nil {return errors.Wrapf(err, "failed to scan")}- issueIDs = append(issueIDs, issueID)- if pipelineID.Valid {- pipelineIDs = append(pipelineIDs, int(pipelineID.Int32))- }+ infos = append(infos, info)}if err := rows.Err(); err != nil {return errors.Wrapf(err, "failed to scan issues")}+ // Update the statuses+ updateQuery := qb.Q().Space("UPDATE issue SET status = ? WHERE id = ANY(?)", status.String(), issueUIDs)+ updateSQL, updateArgs, err := updateQuery.ToSQL()+ if err != nil {+ return errors.Wrapf(err, "failed to build update sql")+ }++ if _, err := tx.ExecContext(ctx, updateSQL, updateArgs...); err != nil {+ return errors.Wrapf(err, "failed to update")+ }+if err := tx.Commit(); err != nil {return errors.Wrapf(err, "failed to commit")}- for _, issueID := range issueIDs {- s.issueCache.Remove(issueID)- }- for _, pipelineID := range pipelineIDs {- s.issueByPipelineCache.Remove(pipelineID)+ // Invalidate caches+ for _, info := range infos {+ s.issueCache.Remove(info.id)+ if info.pipelineUID != nil {+ s.issueByPipelineCache.Remove(*info.pipelineUID)+ }}return nildiff --git a/backend/store/pipeline.go b/backend/store/pipeline.goindex d1809d6869..91b3cfe8e4 100644--- a/backend/store/pipeline.go+++ b/backend/store/pipeline.go@@ -57,7 +57,7 @@ func (s *Store) CreatePipelineAIO(ctx context.Context, planUID int64, pipeline *createdPipelineUID = createdPipeline.ID// update pipeline uid of associated issue and plan- if invalidateCacheF, err = s.updatePipelineUIDOfIssueAndPlan(ctx, tx, planUID, createdPipelineUID); err != nil {+ if invalidateCacheF, err = s.updatePipelineUIDOfPlan(ctx, tx, planUID, createdPipelineUID); err != nil {return 0, errors.Wrapf(err, "failed to update associated plan or issue")}} else {@@ -123,7 +123,7 @@ func (s *Store) CreatePipelineAIO(ctx context.Context, planUID int64, pipeline *}// returns func() to invalidate cache.-func (s *Store) updatePipelineUIDOfIssueAndPlan(ctx context.Context, txn *sql.Tx, planUID int64, pipelineUID int) (func(), error) {+func (*Store) updatePipelineUIDOfPlan(ctx context.Context, txn *sql.Tx, planUID int64, pipelineUID int) (func(), error) {q := qb.Q().Space(`UPDATE planSET pipeline_id = ?@@ -137,27 +137,8 @@ func (s *Store) updatePipelineUIDOfIssueAndPlan(ctx context.Context, txn *sql.Txreturn nil, errors.Wrapf(err, "failed to update plan pipeline_id")}- q = qb.Q().Space(`- UPDATE issue- SET pipeline_id = ?- WHERE plan_id = ?- RETURNING id- `, pipelineUID, planUID)- querySQL, args, err = q.ToSQL()- if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")- }- var issueUID int- if err := txn.QueryRowContext(ctx, querySQL, args...).Scan(&issueUID); err != nil {- if err != sql.ErrNoRows {- return nil, errors.Wrapf(err, "failed to update issue pipeline_id")- }- }return func() {// TODO: need to remove planCache once we add planCache- if issueUID != 0 {- s.issueCache.Remove(issueUID)- }}, nil}@@ -255,7 +236,8 @@ func (s *Store) ListPipelineV2(ctx context.Context, find *PipelineFind) ([]*Pipepipeline.created_at) AS updated_atFROM pipeline- LEFT JOIN issue ON pipeline.id = issue.pipeline_id+ LEFT JOIN plan ON plan.pipeline_id = pipeline.id+ LEFT JOIN issue ON issue.plan_id = plan.idWHERE TRUE`)diff --git a/backend/store/task.go b/backend/store/task.goindex c90ba6e0fa..7a96581f6a 100644--- a/backend/store/task.go+++ b/backend/store/task.go@@ -116,7 +116,8 @@ func (s *Store) FindBlockingTaskByVersion(ctx context.Context, pipelineUID int,Space("task.payload->>'schemaVersion'").Space("FROM task").Space("LEFT JOIN pipeline ON task.pipeline_id = pipeline.id").- Space("LEFT JOIN issue ON pipeline.id = issue.pipeline_id").+ Space("LEFT JOIN plan ON plan.pipeline_id = pipeline.id").+ Space("LEFT JOIN issue ON issue.plan_id = plan.id").Space("LEFT JOIN LATERAL (").Space("SELECT COALESCE(").Space("(SELECT").@@ -504,7 +505,8 @@ func (s *Store) ListTasksToAutoRollout(ctx context.Context, environments []strinSpace("task.id").Space("FROM task").Space("LEFT JOIN pipeline ON pipeline.id = task.pipeline_id").- Space("LEFT JOIN issue ON issue.pipeline_id = pipeline.id").+ Space("LEFT JOIN plan ON plan.pipeline_id = pipeline.id").+ Space("LEFT JOIN issue ON issue.plan_id = plan.id").Space("WHERE NOT EXISTS (SELECT 1 FROM task_run WHERE task_run.task_id = task.id)").Space("AND task.type != 'DATABASE_EXPORT'").Space("AND COALESCE((task.payload->>'skipped')::BOOLEAN, FALSE) IS FALSE").diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vueindex 605b85f831..8272abd974 100644--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/create/CreateButton.vue@@ -164,29 +164,31 @@ const doCreateIssue = async () => {);if (!createdPlan) return;- const rolloutRequest = create(CreateRolloutRequestSchema, {+ issue.value.plan = createdPlan.name;+ issue.value.planEntity = createdPlan;++ const issueCreate = create(IssueSchema, {+ ...issue.value,+ rollout: "",+ });+ const request = create(CreateIssueRequestSchema, {parent: issue.value.project,- rollout: {- plan: createdPlan.name,- },+ issue: issueCreate,});- const createdRollout =- await rolloutServiceClientConnect.createRollout(rolloutRequest);+ const createdIssue = await issueServiceClientConnect.createIssue(request);- const request = create(CreateIssueRequestSchema, {+ const rolloutRequest = create(CreateRolloutRequestSchema, {parent: issue.value.project,- issue: create(IssueSchema, {- ...issue.value,+ rollout: {plan: createdPlan.name,- rollout: createdRollout.name,- }),+ },});- const createdIssue = await issueServiceClientConnect.createIssue(request);+ await rolloutServiceClientConnect.createRollout(rolloutRequest);router.replace({name: PROJECT_V1_ROUTE_ISSUE_DETAIL,params: {- projectId: extractProjectResourceName(createdIssue.name),+ projectId: extractProjectResourceName(issue.value.project),issueSlug: issueV1Slug(createdIssue.name, createdIssue.title),},});diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vueindex 4e5b396396..8e1d55b66c 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue@@ -509,15 +509,6 @@ const getIssueTypeFromPlan = (planValue: Plan): Issue_Type => {};const doCreateIssue = async () => {- const createRolloutRequest = create(CreateRolloutRequestSchema, {- parent: project.value.name,- rollout: {- plan: plan.value.name,- },- });- const rollout =- await rolloutServiceClientConnect.createRollout(createRolloutRequest);-const createIssueRequest = create(CreateIssueRequestSchema, {parent: project.value.name,issue: create(IssueSchema, {@@ -526,12 +517,24 @@ const doCreateIssue = async () => {plan: plan.value.name,status: IssueStatus.OPEN,type: getIssueTypeFromPlan(plan.value),- rollout: rollout.name,+ rollout: "",}),});++ // Create issue firstconst createdIssue =await issueServiceClientConnect.createIssue(createIssueRequest);+ const createRolloutRequest = create(CreateRolloutRequestSchema, {+ parent: project.value.name,+ rollout: {+ plan: plan.value.name,+ },+ });++ // Then create rollout+ await rolloutServiceClientConnect.createRollout(createRolloutRequest);+// Emit status changed to refresh the UIevents.emit("status-changed", { eager: true });