Skip to content

Commit 7ad5031

Browse files
authored
Fix duplicate status check contexts (#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 61b495e commit 7ad5031

File tree

2 files changed

+61
-25
lines changed

2 files changed

+61
-25
lines changed

models/git/commit_status.go

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

398398
// FindRepoRecentCommitStatusContexts returns repository's recent commit status contexts
399399
func FindRepoRecentCommitStatusContexts(ctx context.Context, repoID int64, before time.Duration) ([]string, error) {
400-
type result struct {
401-
Index int64
402-
SHA string
403-
}
404-
getBase := func() *xorm.Session {
405-
return db.GetEngine(ctx).Table(&CommitStatus{}).Where("repo_id = ?", repoID)
406-
}
407-
408400
start := timeutil.TimeStampNow().AddDuration(-before)
409-
results := make([]result, 0, 10)
410401

411-
sess := getBase().And("updated_unix >= ?", start).
412-
Select("max( `index` ) as `index`, sha").
413-
GroupBy("context_hash, sha").OrderBy("max( `index` ) desc")
414-
415-
err := sess.Find(&results)
416-
if err != nil {
402+
var contexts []string
403+
if err := db.GetEngine(ctx).Table("commit_status").
404+
Where("repo_id = ?", repoID).And("updated_unix >= ?", start).
405+
Cols("context").Distinct().Find(&contexts); err != nil {
417406
return nil, err
418407
}
419408

420-
contexts := make([]string, 0, len(results))
421-
if len(results) == 0 {
422-
return contexts, nil
423-
}
424-
425-
conds := make([]builder.Cond, 0, len(results))
426-
for _, result := range results {
427-
conds = append(conds, builder.Eq{"`index`": result.Index, "sha": result.SHA})
428-
}
429-
return contexts, getBase().And(builder.Or(conds...)).Select("context").Find(&contexts)
409+
return contexts, nil
430410
}
431411

432412
// NewCommitStatusOptions holds options for creating a CommitStatus

models/git/commit_status_test.go

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ 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"
16+
"code.gitea.io/gitea/modules/gitrepo"
1317
"code.gitea.io/gitea/modules/structs"
1418

1519
"github.com/stretchr/testify/assert"
@@ -175,3 +179,55 @@ func Test_CalcCommitStatus(t *testing.T) {
175179
assert.Equal(t, kase.expected, git_model.CalcCommitStatus(kase.statuses))
176180
}
177181
}
182+
183+
func TestFindRepoRecentCommitStatusContexts(t *testing.T) {
184+
assert.NoError(t, unittest.PrepareTestDatabase())
185+
186+
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
187+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
188+
gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo2)
189+
assert.NoError(t, err)
190+
defer gitRepo.Close()
191+
192+
commit, err := gitRepo.GetBranchCommit(repo2.DefaultBranch)
193+
assert.NoError(t, err)
194+
195+
defer func() {
196+
_, err := db.DeleteByBean(db.DefaultContext, &git_model.CommitStatus{
197+
RepoID: repo2.ID,
198+
CreatorID: user2.ID,
199+
SHA: commit.ID.String(),
200+
})
201+
assert.NoError(t, err)
202+
}()
203+
204+
err = git_model.NewCommitStatus(db.DefaultContext, git_model.NewCommitStatusOptions{
205+
Repo: repo2,
206+
Creator: user2,
207+
SHA: commit.ID,
208+
CommitStatus: &git_model.CommitStatus{
209+
State: structs.CommitStatusFailure,
210+
TargetURL: "https://example.com/tests/",
211+
Context: "compliance/lint-backend",
212+
},
213+
})
214+
assert.NoError(t, err)
215+
216+
err = git_model.NewCommitStatus(db.DefaultContext, git_model.NewCommitStatusOptions{
217+
Repo: repo2,
218+
Creator: user2,
219+
SHA: commit.ID,
220+
CommitStatus: &git_model.CommitStatus{
221+
State: structs.CommitStatusSuccess,
222+
TargetURL: "https://example.com/tests/",
223+
Context: "compliance/lint-backend",
224+
},
225+
})
226+
assert.NoError(t, err)
227+
228+
contexts, err := git_model.FindRepoRecentCommitStatusContexts(db.DefaultContext, repo2.ID, time.Hour)
229+
assert.NoError(t, err)
230+
if assert.Len(t, contexts, 1) {
231+
assert.Equal(t, "compliance/lint-backend", contexts[0])
232+
}
233+
}

0 commit comments

Comments
 (0)