Skip to content

Commit 08c634b

Browse files
philip-petersonphilip-peterson
authored
Remove unused param doer (#34545)
1 parent dfea753 commit 08c634b

File tree

16 files changed

+20
-26
lines changed

16 files changed

+20
-26
lines changed

‎routers/api/v1/repo/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func Migrate(ctx *context.APIContext) {
203203
}
204204

205205
if repo != nil {
206-
if errDelete := repo_service.DeleteRepositoryDirectly(ctx, ctx.Doer, repo.ID); errDelete != nil {
206+
if errDelete := repo_service.DeleteRepositoryDirectly(ctx, repo.ID); errDelete != nil {
207207
log.Error("DeleteRepository: %v", errDelete)
208208
}
209209
}

‎services/doctor/repository.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88

99
"code.gitea.io/gitea/models/db"
10-
user_model "code.gitea.io/gitea/models/user"
1110
"code.gitea.io/gitea/modules/log"
1211
"code.gitea.io/gitea/modules/storage"
1312
repo_service "code.gitea.io/gitea/services/repository"
@@ -39,7 +38,6 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
3938
batchSize := db.MaxBatchInsertSize("repository")
4039
e := db.GetEngine(ctx)
4140
var deleted int64
42-
adminUser := &user_model.User{IsAdmin: true}
4341

4442
for {
4543
select {
@@ -60,7 +58,7 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
6058
}
6159

6260
for _, id := range ids {
63-
if err := repo_service.DeleteRepositoryDirectly(ctx, adminUser, id, true); err != nil {
61+
if err := repo_service.DeleteRepositoryDirectly(ctx, id, true); err != nil {
6462
return deleted, err
6563
}
6664
deleted++

‎services/org/team_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func TestIncludesAllRepositoriesTeams(t *testing.T) {
281281
}
282282

283283
// Remove repo and check teams repositories.
284-
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repoIDs[0]), "DeleteRepository")
284+
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, repoIDs[0]), "DeleteRepository")
285285
teamRepos[0] = repoIDs[1:]
286286
teamRepos[1] = repoIDs[1:]
287287
teamRepos[3] = repoIDs[1:3]
@@ -293,7 +293,7 @@ func TestIncludesAllRepositoriesTeams(t *testing.T) {
293293
// Wipe created items.
294294
for i, rid := range repoIDs {
295295
if i > 0 { // first repo already deleted.
296-
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, rid), "DeleteRepository %d", i)
296+
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, rid), "DeleteRepository %d", i)
297297
}
298298
}
299299
assert.NoError(t, DeleteOrganization(db.DefaultContext, org, false), "DeleteOrganization")

‎services/repository/check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func DeleteMissingRepositories(ctx context.Context, doer *user_model.User) error
162162
default:
163163
}
164164
log.Trace("Deleting %d/%d...", repo.OwnerID, repo.ID)
165-
if err := DeleteRepositoryDirectly(ctx, doer, repo.ID); err != nil {
165+
if err := DeleteRepositoryDirectly(ctx, repo.ID); err != nil {
166166
log.Error("Failed to DeleteRepository %-v: Error: %v", repo, err)
167167
if err2 := system_model.CreateRepositoryNotice("Failed to DeleteRepository %s [%d]: Error: %v", repo.FullName(), repo.ID, err); err2 != nil {
168168
log.Error("CreateRepositoryNotice: %v", err)

‎services/repository/create.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,
263263
defer func() {
264264
if err != nil {
265265
// we can not use the ctx because it maybe canceled or timeout
266-
cleanupRepository(doer, repo.ID)
266+
cleanupRepository(repo.ID)
267267
}
268268
}()
269269

@@ -458,8 +458,8 @@ func createRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r
458458
return nil
459459
}
460460

461-
func cleanupRepository(doer *user_model.User, repoID int64) {
462-
if errDelete := DeleteRepositoryDirectly(db.DefaultContext, doer, repoID); errDelete != nil {
461+
func cleanupRepository(repoID int64) {
462+
if errDelete := DeleteRepositoryDirectly(db.DefaultContext, repoID); errDelete != nil {
463463
log.Error("cleanupRepository failed: %v", errDelete)
464464
// add system notice
465465
if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository: %v", errDelete); err != nil {

‎services/repository/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestCreateRepositoryDirectly(t *testing.T) {
3535

3636
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: createdRepo.Name})
3737

38-
err = DeleteRepositoryDirectly(db.DefaultContext, user2, createdRepo.ID)
38+
err = DeleteRepositoryDirectly(db.DefaultContext, createdRepo.ID)
3939
assert.NoError(t, err)
4040

4141
// a failed creating because some mock data

‎services/repository/delete.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func deleteDBRepository(ctx context.Context, repoID int64) error {
4949

5050
// DeleteRepository deletes a repository for a user or organization.
5151
// make sure if you call this func to close open sessions (sqlite will otherwise get a deadlock)
52-
func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID int64, ignoreOrgTeams ...bool) error {
52+
func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams ...bool) error {
5353
ctx, committer, err := db.TxContext(ctx)
5454
if err != nil {
5555
return err
@@ -391,7 +391,7 @@ func DeleteOwnerRepositoriesDirectly(ctx context.Context, owner *user_model.User
391391
break
392392
}
393393
for _, repo := range repos {
394-
if err := DeleteRepositoryDirectly(ctx, owner, repo.ID); err != nil {
394+
if err := DeleteRepositoryDirectly(ctx, repo.ID); err != nil {
395395
return fmt.Errorf("unable to delete repository %s for %s[%d]. Error: %w", repo.Name, owner.Name, owner.ID, err)
396396
}
397397
}

‎services/repository/fork.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
124124
defer func() {
125125
if err != nil {
126126
// we can not use the ctx because it maybe canceled or timeout
127-
cleanupRepository(doer, repo.ID)
127+
cleanupRepository(repo.ID)
128128
}
129129
}()
130130

‎services/repository/fork_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestForkRepositoryCleanup(t *testing.T) {
6969
assert.NoError(t, err)
7070
assert.True(t, exist)
7171

72-
err = DeleteRepositoryDirectly(db.DefaultContext, user2, fork.ID)
72+
err = DeleteRepositoryDirectly(db.DefaultContext, fork.ID)
7373
assert.NoError(t, err)
7474

7575
// a failed creating because some mock data

‎services/repository/repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod
6969
notify_service.DeleteRepository(ctx, doer, repo)
7070
}
7171

72-
return DeleteRepositoryDirectly(ctx, doer, repo.ID)
72+
return DeleteRepositoryDirectly(ctx, repo.ID)
7373
}
7474

7575
// PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace

‎services/repository/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
102102
defer func() {
103103
if err != nil {
104104
// we can not use the ctx because it maybe canceled or timeout
105-
cleanupRepository(doer, generateRepo.ID)
105+
cleanupRepository(generateRepo.ID)
106106
}
107107
}()
108108

‎tests/integration/api_repo_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ func TestAPIRepoTransfer(t *testing.T) {
586586

587587
// cleanup
588588
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID})
589-
_ = repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID)
589+
_ = repo_service.DeleteRepositoryDirectly(db.DefaultContext, repo.ID)
590590
}
591591

592592
func transfer(t *testing.T) *repo_model.Repository {

‎tests/integration/ephemeral_actions_runner_deletion_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ func testEphemeralActionsRunnerDeletionByRepository(t *testing.T) {
5050
task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 52})
5151
assert.Equal(t, actions_model.StatusRunning, task.Status)
5252

53-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
54-
55-
err = repo_service.DeleteRepositoryDirectly(t.Context(), user, task.RepoID, true)
53+
err = repo_service.DeleteRepositoryDirectly(t.Context(), task.RepoID, true)
5654
assert.NoError(t, err)
5755

5856
_, err = actions_model.GetRunnerByID(t.Context(), 34350)

‎tests/integration/git_push_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func runTestGitPush(t *testing.T, u *url.URL, gitOperation func(t *testing.T, gi
191191
assert.Equal(t, commitID, branch.CommitID)
192192
}
193193

194-
require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID))
194+
require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, repo.ID))
195195
}
196196

197197
func TestPushPullRefs(t *testing.T) {

‎tests/integration/pull_compare_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
issues_model "code.gitea.io/gitea/models/issues"
1414
repo_model "code.gitea.io/gitea/models/repo"
1515
"code.gitea.io/gitea/models/unittest"
16-
user_model "code.gitea.io/gitea/models/user"
1716
"code.gitea.io/gitea/modules/test"
1817
repo_service "code.gitea.io/gitea/services/repository"
1918
"code.gitea.io/gitea/tests"
@@ -76,10 +75,9 @@ func TestPullCompare(t *testing.T) {
7675
assert.Positive(t, editButtonCount, "Expected to find a button to edit a file in the PR diff view but there were none")
7776

7877
repoForked := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
79-
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
8078

8179
// delete the head repository and revisit the PR diff view
82-
err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, repoForked.ID)
80+
err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, repoForked.ID)
8381
assert.NoError(t, err)
8482

8583
req = NewRequest(t, "GET", prFilesURL)

‎tests/integration/repo_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ func TestGenerateRepository(t *testing.T) {
523523

524524
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: generatedRepo.Name})
525525

526-
err = repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, generatedRepo.ID)
526+
err = repo_service.DeleteRepositoryDirectly(db.DefaultContext, generatedRepo.ID)
527527
assert.NoError(t, err)
528528

529529
// a failed creating because some mock data

0 commit comments

Comments
 (0)