Skip to content

Commit aa3c761

Browse files
authored
Fix duplicate status check contexts (#30660) (#30776)
Backport #30660. Caused by #30076. There may be some duplicate status check contexts when setting status checks for a branch protection rule. The duplicate contexts should be removed. Before: <img src="https://github.com/go-gitea/gitea/assets/15528715/97f4de2d-4868-47a3-8a99-5a180f9ac0a3" width="600px" /> After: <img src="https://github.com/go-gitea/gitea/assets/15528715/ff7289c5-9793-4090-ba31-e8cb3c85f8a3" width="600px" />
1 parent 224c48e commit aa3c761

File tree

2 files changed

+60
-25
lines changed

2 files changed

+60
-25
lines changed

models/git/commit_status.go

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -410,36 +410,16 @@ func GetLatestCommitStatusForRepoCommitIDs(ctx context.Context, repoID int64, co
410410

411411
// FindRepoRecentCommitStatusContexts returns repository's recent commit status contexts
412412
func FindRepoRecentCommitStatusContexts(ctx context.Context, repoID int64, before time.Duration) ([]string, error) {
413-
type result struct {
414-
Index int64
415-
SHA string
416-
}
417-
getBase := func() *xorm.Session {
418-
return db.GetEngine(ctx).Table(&CommitStatus{}).Where("repo_id = ?", repoID)
419-
}
420-
421413
start := timeutil.TimeStampNow().AddDuration(-before)
422-
results := make([]result, 0, 10)
423414

424-
sess := getBase().And("updated_unix >= ?", start).
425-
Select("max( `index` ) as `index`, sha").
426-
GroupBy("context_hash, sha").OrderBy("max( `index` ) desc")
427-
428-
err := sess.Find(&results)
429-
if err != nil {
415+
var contexts []string
416+
if err := db.GetEngine(ctx).Table("commit_status").
417+
Where("repo_id = ?", repoID).And("updated_unix >= ?", start).
418+
Cols("context").Distinct().Find(&contexts); err != nil {
430419
return nil, err
431420
}
432421

433-
contexts := make([]string, 0, len(results))
434-
if len(results) == 0 {
435-
return contexts, nil
436-
}
437-
438-
conds := make([]builder.Cond, 0, len(results))
439-
for _, result := range results {
440-
conds = append(conds, builder.Eq{"`index`": result.Index, "sha": result.SHA})
441-
}
442-
return contexts, getBase().And(builder.Or(conds...)).Select("context").Find(&contexts)
422+
return contexts, nil
443423
}
444424

445425
// NewCommitStatusOptions holds options for creating a CommitStatus

models/git/commit_status_test.go

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ package git_test
55

66
import (
77
"testing"
8+
"time"
89

910
"code.gitea.io/gitea/models/db"
1011
git_model "code.gitea.io/gitea/models/git"
1112
repo_model "code.gitea.io/gitea/models/repo"
1213
"code.gitea.io/gitea/models/unittest"
14+
user_model "code.gitea.io/gitea/models/user"
15+
"code.gitea.io/gitea/modules/git"
1316
"code.gitea.io/gitea/modules/structs"
1417

1518
"github.com/stretchr/testify/assert"
@@ -60,3 +63,55 @@ func TestGetCommitStatuses(t *testing.T) {
6063
assert.Equal(t, int(maxResults), 5)
6164
assert.Empty(t, statuses)
6265
}
66+
67+
func TestFindRepoRecentCommitStatusContexts(t *testing.T) {
68+
assert.NoError(t, unittest.PrepareTestDatabase())
69+
70+
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
71+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
72+
gitRepo, err := git.OpenRepository(git.DefaultContext, repo2.RepoPath())
73+
assert.NoError(t, err)
74+
defer gitRepo.Close()
75+
76+
commit, err := gitRepo.GetBranchCommit(repo2.DefaultBranch)
77+
assert.NoError(t, err)
78+
79+
defer func() {
80+
_, err := db.DeleteByBean(db.DefaultContext, &git_model.CommitStatus{
81+
RepoID: repo2.ID,
82+
CreatorID: user2.ID,
83+
SHA: commit.ID.String(),
84+
})
85+
assert.NoError(t, err)
86+
}()
87+
88+
err = git_model.NewCommitStatus(db.DefaultContext, git_model.NewCommitStatusOptions{
89+
Repo: repo2,
90+
Creator: user2,
91+
SHA: commit.ID.String(),
92+
CommitStatus: &git_model.CommitStatus{
93+
State: structs.CommitStatusFailure,
94+
TargetURL: "https://example.com/tests/",
95+
Context: "compliance/lint-backend",
96+
},
97+
})
98+
assert.NoError(t, err)
99+
100+
err = git_model.NewCommitStatus(db.DefaultContext, git_model.NewCommitStatusOptions{
101+
Repo: repo2,
102+
Creator: user2,
103+
SHA: commit.ID.String(),
104+
CommitStatus: &git_model.CommitStatus{
105+
State: structs.CommitStatusSuccess,
106+
TargetURL: "https://example.com/tests/",
107+
Context: "compliance/lint-backend",
108+
},
109+
})
110+
assert.NoError(t, err)
111+
112+
contexts, err := git_model.FindRepoRecentCommitStatusContexts(db.DefaultContext, repo2.ID, time.Hour)
113+
assert.NoError(t, err)
114+
if assert.Len(t, contexts, 1) {
115+
assert.Equal(t, "compliance/lint-backend", contexts[0])
116+
}
117+
}

0 commit comments

Comments
 (0)