diff --git a/.golangci.yml b/.golangci.yml index f783729156..d9cb0f354b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -113,6 +113,7 @@ linters: - -QF1001 - -QF1006 - -QF1008 + - -SA4023 # hangs on go 1.27, https://github.com/golangci/golangci-lint/issues/6732 testifylint: disable: - empty @@ -182,7 +183,8 @@ formatters: - blank - default gofumpt: - extra-rules: true + extra: + group-params: true exclusions: generated: lax paths: diff --git a/Makefile b/Makefile index eee234d3f0..3a4f9a2804 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ XGO_VERSION := go-1.27.x AIR_PACKAGE ?= github.com/air-verse/air@v1.67.4 # renovate: datasource=go EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.11.1 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.0 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.16 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.8.0 # renovate: datasource=go SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.36.2 # renovate: datasource=go diff --git a/cmd/admin.go b/cmd/admin.go index 890ed92b17..0bb337d8b1 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -113,11 +113,9 @@ func runRepoSyncReleases(ctx context.Context, _ *cli.Command) error { log.Trace("Synchronizing repository releases (this may take a while)") for page := 1; ; page++ { repos, count, err := repo_model.SearchRepositoryByName(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: repo_model.RepositoryListDefaultPageSize, - Page: page, - }, - Private: true, + PageSize: repo_model.RepositoryListDefaultPageSize, + Page: page, + Private: true, }) if err != nil { return fmt.Errorf("SearchRepositoryByName: %w", err) diff --git a/cmd/hook.go b/cmd/hook.go index f8e964d0c6..77a8fafaa9 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -752,7 +752,7 @@ func writeFlushPktLine(ctx context.Context, out io.Writer) error { func writeDataPktLine(ctx context.Context, out io.Writer, data []byte) error { hexchar := []byte("0123456789abcdef") hex := func(n uint64) byte { - return hexchar[(n)&15] + return hexchar[n&15] } length := uint64(len(data) + 4) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 67a6b9e2ee..34c6a34d05 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -30,22 +30,18 @@ func TestMigratePackages(t *testing.T) { defer buf.Close() v, f, err := packages_service.CreatePackageAndAddFile(t.Context(), &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: creator, - PackageType: packages.TypeGeneric, - Name: "test", - Version: "1.0.0", - }, + Owner: creator, + PackageType: packages.TypeGeneric, + Name: "test", + Version: "1.0.0", Creator: creator, SemverCompatible: true, VersionProperties: map[string]string{}, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: "a.go", - }, - Creator: creator, - Data: buf, - IsLead: true, + Filename: "a.go", + Creator: creator, + Data: buf, + IsLead: true, }) assert.NoError(t, err) assert.NotNil(t, v) diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index bc65c70488..bff4b9db6d 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -14,6 +14,7 @@ import ( "slices" "strings" "time" + "uuid" "gitea.dev/models/db" "gitea.dev/modules/container" @@ -23,7 +24,6 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/oauth2" - "uuid" "xorm.io/builder" "xorm.io/xorm" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 54ee652abd..0324b3ab83 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -35,8 +35,8 @@ func TestAddDeletedBranch(t *testing.T) { assert.True(t, secondBranch.IsDeleted) commit := &git.Commit{ - ID: git.MustIDFromString(secondBranch.CommitID), - CommitMessage: git.CommitMessage{MessageRaw: secondBranch.CommitMessage}, + ID: git.MustIDFromString(secondBranch.CommitID), + MessageRaw: secondBranch.CommitMessage, Committer: &git.Signature{ When: secondBranch.CommitTime.AsLocalTime(), }, diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index 411dd91f73..e287eb03fc 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -28,9 +28,9 @@ func TestGetCommitStatuses(t *testing.T) { sha1 := "1234123412341234123412341234123412341234" // the mocked commit ID in test fixtures statuses, maxResults, err := db.FindAndCount[git_model.CommitStatus](t.Context(), &git_model.CommitStatusOptions{ - ListOptions: db.ListOptions{Page: 1, PageSize: 50}, - RepoID: repo1.ID, - SHA: sha1, + Page: 1, PageSize: 50, + RepoID: repo1.ID, + SHA: sha1, }) assert.NoError(t, err) assert.Equal(t, 5, int(maxResults)) @@ -57,9 +57,9 @@ func TestGetCommitStatuses(t *testing.T) { assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/statuses/1234123412341234123412341234123412341234", statuses[4].APIURL(t.Context())) statuses, maxResults, err = db.FindAndCount[git_model.CommitStatus](t.Context(), &git_model.CommitStatusOptions{ - ListOptions: db.ListOptions{Page: 2, PageSize: 50}, - RepoID: repo1.ID, - SHA: sha1, + Page: 2, PageSize: 50, + RepoID: repo1.ID, + SHA: sha1, }) assert.NoError(t, err) assert.Equal(t, 5, int(maxResults)) diff --git a/models/git/lfs.go b/models/git/lfs.go index c5018cb398..b726405cd6 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -149,12 +149,12 @@ func RemoveLFSMetaObjectByOidFn(ctx context.Context, repoID int64, oid string, f } return db.WithTx2(ctx, func(ctx context.Context) (int64, error) { - m := &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}, RepositoryID: repoID} + m := &LFSMetaObject{Oid: oid, RepositoryID: repoID} if _, err := db.DeleteByBean(ctx, m); err != nil { return -1, err } - count, err := db.CountByBean(ctx, &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}}) + count, err := db.CountByBean(ctx, &LFSMetaObject{Oid: oid}) if err != nil { return count, err } @@ -192,20 +192,20 @@ func CountLFSMetaObjects(ctx context.Context, repoID int64) (int64, error) { // LFSObjectAccessible checks if a provided Oid is accessible to the user func LFSObjectAccessible(ctx context.Context, user *user_model.User, oid string) (bool, error) { if user.IsAdmin { - count, err := db.GetEngine(ctx).Count(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}}) + count, err := db.GetEngine(ctx).Count(&LFSMetaObject{Oid: oid}) return count > 0, err } // LFS objects are repository code content, so authorization must require // Code-unit access; other unit accesses (e.g. Issues) must not authorize // reuse of an existing LFS object across repositories. cond := repo_model.AccessibleRepositoryCondition(user, unit.TypeCode) - count, err := db.GetEngine(ctx).Where(cond).Join("INNER", "repository", "`lfs_meta_object`.repository_id = `repository`.id").Count(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}}) + count, err := db.GetEngine(ctx).Where(cond).Join("INNER", "repository", "`lfs_meta_object`.repository_id = `repository`.id").Count(&LFSMetaObject{Oid: oid}) return count > 0, err } // ExistsLFSObject checks if a provided Oid exists within the DB func ExistsLFSObject(ctx context.Context, oid string) (bool, error) { - return db.GetEngine(ctx).Exist(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}}) + return db.GetEngine(ctx).Exist(&LFSMetaObject{Oid: oid}) } // LFSAutoAssociate auto associates accessible LFSMetaObjects diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 9defb70840..d0c103afe1 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -57,10 +57,8 @@ func FindAllMatchedBranches(ctx context.Context, repoID int64, ruleName string) results := make([]string, 0, 10) for page := 1; ; page++ { brancheNames, err := FindBranchNames(ctx, FindBranchOptions{ - ListOptions: db.ListOptions{ - PageSize: 100, - Page: page, - }, + PageSize: 100, + Page: page, RepoID: repoID, IsDeletedBranch: optional.Some(false), }) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index 925038f68e..38d8d5d823 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -96,10 +96,8 @@ func TestGetMilestones(t *testing.T) { test := func(sortType string, sortCond func(*issues_model.Milestone) int) { for _, page := range []int{0, 1} { milestones, err := db.Find[issues_model.Milestone](t.Context(), issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoID: repo.ID, IsClosed: optional.Some(false), SortType: sortType, @@ -113,10 +111,8 @@ func TestGetMilestones(t *testing.T) { assert.True(t, sort.IntsAreSorted(values)) milestones, err = db.Find[issues_model.Milestone](t.Context(), issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoID: repo.ID, IsClosed: optional.Some(true), Name: "", @@ -229,10 +225,8 @@ func TestGetMilestonesByRepoIDs(t *testing.T) { test := func(sortType string, sortCond func(*issues_model.Milestone) int) { for _, page := range []int{0, 1} { openMilestones, err := db.Find[issues_model.Milestone](t.Context(), issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoIDs: []int64{repo1.ID, repo2.ID}, IsClosed: optional.Some(false), SortType: sortType, @@ -247,10 +241,8 @@ func TestGetMilestonesByRepoIDs(t *testing.T) { closedMilestones, err := db.Find[issues_model.Milestone](t.Context(), issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoIDs: []int64{repo1.ID, repo2.ID}, IsClosed: optional.Some(true), SortType: sortType, diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index bd7499fa80..28aee6aa75 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -89,9 +89,7 @@ func testPullRequestLoadHeadRepo(t *testing.T) { func testPullRequestsNewest(t *testing.T) { prs, count, err := issues_model.PullRequests(t.Context(), 1, &issues_model.PullRequestsOptions{ - ListOptions: db.ListOptions{ - Page: 1, - }, + Page: 1, State: "open", SortType: "newest", }) @@ -127,9 +125,7 @@ func testPullRequestsClosedRecentSortType(t *testing.T) { for _, test := range tests { t.Run(test.sortType, func(t *testing.T) { prs, _, err := issues_model.PullRequests(t.Context(), 1, &issues_model.PullRequestsOptions{ - ListOptions: db.ListOptions{ - Page: 1, - }, + Page: 1, State: "closed", SortType: test.sortType, }) @@ -172,9 +168,7 @@ func testLoadRequestedReviewers(t *testing.T) { func testPullRequestsOldest(t *testing.T) { prs, count, err := issues_model.PullRequests(t.Context(), 1, &issues_model.PullRequestsOptions{ - ListOptions: db.ListOptions{ - Page: 1, - }, + Page: 1, State: "open", SortType: "oldest", }) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 5d2045524a..7f7784a8ec 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -36,15 +36,15 @@ func TestRepository_GetCollaborators(t *testing.T) { repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 22}) collaborators1, _, err := repo_model.GetCollaborators(t.Context(), &repo_model.FindCollaborationOptions{ - ListOptions: db.ListOptions{PageSize: 1, Page: 1}, - RepoID: repo.ID, + PageSize: 1, Page: 1, + RepoID: repo.ID, }) assert.NoError(t, err) assert.Len(t, collaborators1, 1) collaborators2, _, err := repo_model.GetCollaborators(t.Context(), &repo_model.FindCollaborationOptions{ - ListOptions: db.ListOptions{PageSize: 1, Page: 2}, - RepoID: repo.ID, + PageSize: 1, Page: 2, + RepoID: repo.ID, }) assert.NoError(t, err) assert.Len(t, collaborators2, 1) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 88a49b864c..f0211a283f 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -617,7 +617,7 @@ func searchRepositoryByCondition(ctx context.Context, opts SearchRepoOptions, co args = append(args, opts.PriorityOwnerID) } else if strings.Count(opts.Keyword, "/") == 1 { // With "owner/repo" search times, prioritise results which match the owner field - orgName := strings.Split(opts.Keyword, "/")[0] + orgName, _, _ := strings.Cut(opts.Keyword, "/") orderBy = db.SearchOrderBy(fmt.Sprintf("CASE WHEN owner_name LIKE ? THEN 0 ELSE 1 END, %s", orderBy)) args = append(args, orgName) } diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 742b0d97c7..8fedab4a2d 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -200,10 +200,8 @@ func TestSearchRepository(t *testing.T) { func testSearchRepositoryPublic(t *testing.T) { // test search public repository on explore page repos, count, err := repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "repo_12", Collaborate: optional.Some(false), }) @@ -215,10 +213,8 @@ func testSearchRepositoryPublic(t *testing.T) { assert.Equal(t, int64(1), count) repos, count, err = repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "test_repo", Collaborate: optional.Some(false), }) @@ -234,8 +230,8 @@ func testSearchRepositoryRestricted(t *testing.T) { performSearch := func(t *testing.T, user *user_model.User) (publicRepoIDs []int64) { repos, count, err := repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{Page: 1, PageSize: 10000}, - Actor: user, + Page: 1, PageSize: 10000, + Actor: user, }) require.NoError(t, err) assert.Len(t, repos, int(count)) @@ -274,10 +270,8 @@ func testSearchRepositoryRestricted(t *testing.T) { func testSearchRepositoryPrivate(t *testing.T) { // test search private repository on explore page repos, count, err := repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "repo_13", Private: true, Collaborate: optional.Some(false), @@ -290,10 +284,8 @@ func testSearchRepositoryPrivate(t *testing.T) { assert.Equal(t, int64(1), count) repos, count, err = repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "test_repo", Private: true, Collaborate: optional.Some(false), @@ -314,10 +306,8 @@ func testSearchRepositoryNonExistingOwner(t *testing.T) { func testSearchRepositoryWithInDescription(t *testing.T) { repos, count, err := repo_model.SearchRepository(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "description_14", Collaborate: optional.Some(false), IncludeDescription: true, @@ -332,10 +322,8 @@ func testSearchRepositoryWithInDescription(t *testing.T) { func testSearchRepositoryNotInDescription(t *testing.T) { repos, count, err := repo_model.SearchRepository(t.Context(), repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, + Page: 1, + PageSize: 10, Keyword: "description_14", Collaborate: optional.Some(false), IncludeDescription: false, diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index 09b75e5c60..4e57bc90a5 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -24,7 +24,7 @@ func TestAddTopic(t *testing.T) { assert.Len(t, topics, totalNrOfTopics) topics, total, err := db.FindAndCount[repo_model.Topic](t.Context(), &repo_model.FindTopicOptions{ - ListOptions: db.ListOptions{Page: 1, PageSize: 2}, + Page: 1, PageSize: 2, }) assert.NoError(t, err) assert.Len(t, topics, 2) diff --git a/models/repo/upload.go b/models/repo/upload.go index 0a0a5c0943..3004c1d565 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -11,13 +11,12 @@ import ( "mime/multipart" "os" "path/filepath" + "uuid" "gitea.dev/models/db" "gitea.dev/modules/log" "gitea.dev/modules/setting" "gitea.dev/modules/util" - - "uuid" ) // ErrUploadNotExist represents a "UploadNotExist" kind of error. diff --git a/models/user/badge_test.go b/models/user/badge_test.go index 72d2aedc1e..bd2681605e 100644 --- a/models/user/badge_test.go +++ b/models/user/badge_test.go @@ -69,10 +69,8 @@ func testGetBadgeUsers(t *testing.T) { // Test getting users with pagination opts := &user_model.GetBadgeUsersOptions{ BadgeSlug: badge.Slug, - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 1, - }, + Page: 1, + PageSize: 1, } users, count, err := user_model.GetBadgeUsers(t.Context(), opts) @@ -140,9 +138,9 @@ func testSearchBadgesOrderingAndKeyword(t *testing.T) { } opts := &user_model.SearchBadgeOptions{ - ListOptions: db.ListOptions{ListAll: true}, - Keyword: "badge-sort-", - OrderBy: db.SearchOrderBy("`badge`.id ASC"), + ListAll: true, + Keyword: "badge-sort-", + OrderBy: db.SearchOrderBy("`badge`.id ASC"), } oldestFirst, count, err := user_model.SearchBadges(t.Context(), opts) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 06ab883779..fbc86e66ce 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,7 +7,6 @@ import ( "slices" "testing" - "gitea.dev/models/db" "gitea.dev/models/unittest" user_model "gitea.dev/models/user" "gitea.dev/modules/optional" @@ -92,9 +91,7 @@ func TestListEmails(t *testing.T) { // Must find all users and their emails opts := &user_model.SearchEmailOptions{ - ListOptions: db.ListOptions{ - PageSize: 10000, - }, + PageSize: 10000, } emails, count, err := user_model.SearchEmails(t.Context(), opts) assert.NoError(t, err) @@ -138,10 +135,8 @@ func TestListEmails(t *testing.T) { // Must find more than one page, but retrieve only one opts = &user_model.SearchEmailOptions{ - ListOptions: db.ListOptions{ - PageSize: 5, - Page: 1, - }, + PageSize: 5, + Page: 1, } emails, count, err = user_model.SearchEmails(t.Context(), opts) assert.NoError(t, err) diff --git a/models/user/user_test.go b/models/user/user_test.go index 2bf32a5038..4c1139917f 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -157,22 +157,22 @@ func TestSearchUsers(t *testing.T) { testSuccess(opts, expectedOrgIDs) } - testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 1, PageSize: 2}, []int64{3, 6}) - testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 2, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 2, PageSize: 2}, []int64{7, 17}) - testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 3, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 3, PageSize: 2}, []int64{19, 25}) - testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 4, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 4, PageSize: 2}, []int64{26, 41}) - testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 5, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 5, PageSize: 2}, []int64{42}) - testOrgSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 6, PageSize: 2}}, + testOrgSuccess(user_model.SearchUserOptions{Page: 6, PageSize: 2}, []int64{}) // test users @@ -181,32 +181,32 @@ func TestSearchUsers(t *testing.T) { testSuccess(opts, expectedUserIDs) } - testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}}, + testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 1}, []int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40}) - testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(false)}, + testUserSuccess(user_model.SearchUserOptions{Page: 1, IsActive: optional.Some(false)}, []int64{9}) - testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", Page: 1, IsActive: optional.Some(true)}, []int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40}) - testUserSuccess(user_model.SearchUserOptions{Keyword: "user1", OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Keyword: "user1", OrderBy: "id ASC", Page: 1, IsActive: optional.Some(true)}, []int64{1, 10, 11, 12, 13, 14, 15, 16, 18}) // order by name asc default - testUserSuccess(user_model.SearchUserOptions{Keyword: "user1", ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Keyword: "user1", Page: 1, IsActive: optional.Some(true)}, []int64{1, 10, 11, 12, 13, 14, 15, 16, 18}) - testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsAdmin: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Page: 1, IsAdmin: optional.Some(true)}, []int64{1}) - testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsRestricted: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Page: 1, IsRestricted: optional.Some(true)}, []int64{29}) - testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsProhibitLogin: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Page: 1, IsProhibitLogin: optional.Some(true)}, []int64{37}) - testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsTwoFactorEnabled: optional.Some(true)}, + testUserSuccess(user_model.SearchUserOptions{Page: 1, IsTwoFactorEnabled: optional.Some(true)}, []int64{24}) } diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 0464d697aa..2c60e34227 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -7,6 +7,7 @@ import ( "context" "errors" "time" + "uuid" "gitea.dev/models/db" "gitea.dev/modules/json" @@ -15,7 +16,6 @@ import ( "gitea.dev/modules/timeutil" webhook_module "gitea.dev/modules/webhook" - "uuid" "xorm.io/builder" ) diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index e785325a65..4e2a4ec36d 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -7,6 +7,7 @@ import ( "context" "testing" "time" + "uuid" "gitea.dev/models/db" "gitea.dev/models/unittest" @@ -17,7 +18,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "uuid" "xorm.io/builder" ) diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index 360e77782f..cd6fa063a9 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -38,11 +38,9 @@ func escapeStream(locale translation.Locale, in io.Reader, out io.Writer, opts . escaped: &EscapeStatus{}, locale: locale, ambiguousTables: AmbiguousTablesForLocale(locale), - htmlChunkReader: htmlChunkReader{ - in: in, - readBuf: make([]byte, 0, 32*1024), - }, - out: out, + in: in, + readBuf: make([]byte, 0, 32*1024), + out: out, } if len(opts) > 0 { diff --git a/modules/git/commit.go b/modules/git/commit.go index 05397f11d8..600ed15ef8 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -114,8 +114,7 @@ func (c *Commit) HasPreviousCommit(ctx context.Context, gitRepo *Repository, obj if err == nil { return true, nil } - var exitError *exec.ExitError - if errors.As(err, &exitError) { + if exitError, ok := errors.AsType[*exec.ExitError](err); ok { if exitError.ProcessState.ExitCode() == 1 && len(exitError.Stderr) == 0 { return false, nil } diff --git a/modules/git/commit_message_test.go b/modules/git/commit_message_test.go index 94c0317efc..9c075ebdee 100644 --- a/modules/git/commit_message_test.go +++ b/modules/git/commit_message_test.go @@ -11,7 +11,7 @@ import ( func TestCommitMessageSanitizesInvalidUTF8(t *testing.T) { commit := &Commit{ - CommitMessage: CommitMessage{MessageRaw: "title \xff\n\n\n\nbody \xff\n\n\n"}, + MessageRaw: "title \xff\n\n\n\nbody \xff\n\n\n", } assert.Equal(t, "title ÿ", commit.MessageTitle()) assert.Equal(t, "body ÿ", commit.MessageBody()) @@ -65,7 +65,7 @@ func TestCommitMessageParticipants(t *testing.T) { "CommitterExcluded", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "CO-Authored-BY: Full Name "}, + MessageRaw: "CO-Authored-BY: Full Name ", }, []*CommitIdentity{idt("a", "a@m.com", roleAuthor), idt("Full Name", "x@m.com", roleCoAuthor)}, }, @@ -73,7 +73,7 @@ func TestCommitMessageParticipants(t *testing.T) { "AuthorIsCoAuthor", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "CO-Authored-BY: other-name "}, + MessageRaw: "CO-Authored-BY: other-name ", }, []*CommitIdentity{idt("a", "a@m.com", roleAuthor)}, }, @@ -81,7 +81,7 @@ func TestCommitMessageParticipants(t *testing.T) { "EmptyAuthor", // synthesized commits (push feed) may have no author signature at all &Commit{ Author: sig("", ""), Committer: sig("", ""), - CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: c "}, + MessageRaw: "Co-authored-by: c ", }, // but if the commit message contains co-authors, the co-authors are still parsed for "all authors" // if it is a problem, the caller should fix the problem (provide correct "author") @@ -98,7 +98,7 @@ func TestCommitMessageParticipants(t *testing.T) { "GenuineCoAuthor", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: x "}, + MessageRaw: "Co-authored-by: x ", }, []*CommitIdentity{idt("x", "x@m.com", roleCoAuthor)}, }, @@ -106,7 +106,7 @@ func TestCommitMessageParticipants(t *testing.T) { "CoAuthorIsCommitter", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: c "}, + MessageRaw: "Co-authored-by: c ", }, []*CommitIdentity{idt("c", "c@m.com", roleCoAuthor)}, }, @@ -114,7 +114,7 @@ func TestCommitMessageParticipants(t *testing.T) { "CoAuthorIsAuthor", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: a "}, + MessageRaw: "Co-authored-by: a ", }, []*CommitIdentity{}, }, @@ -122,7 +122,7 @@ func TestCommitMessageParticipants(t *testing.T) { "CoAuthorNameOnlyAndDuplicate", &Commit{ Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"), - CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: b\nCo-authored-by: b\nCo-authored-by: c"}, + MessageRaw: "Co-authored-by: b\nCo-authored-by: b\nCo-authored-by: c", }, []*CommitIdentity{idt("b", "", roleCoAuthor), idt("c", "", roleCoAuthor)}, }, diff --git a/modules/git/grep_test.go b/modules/git/grep_test.go index cfde0b0f94..9ac86b5693 100644 --- a/modules/git/grep_test.go +++ b/modules/git/grep_test.go @@ -79,7 +79,7 @@ func TestGrepSearch(t *testing.T) { assert.NoError(t, err) assert.Empty(t, res) - nonExistingRepo := &Repository{RepositoryBase: RepositoryBase{repoFacade: gitrepo.RepositoryUnmanaged("no-such-git-repo")}} + nonExistingRepo := &Repository{repoFacade: gitrepo.RepositoryUnmanaged("no-such-git-repo")} res, err = GrepSearch(t.Context(), nonExistingRepo, "no-such-content", GrepOptions{}) assert.Error(t, err) assert.Empty(t, res) diff --git a/modules/git/key.go b/modules/git/key.go index 98ffd1ff15..76750461b0 100644 --- a/modules/git/key.go +++ b/modules/git/key.go @@ -54,24 +54,28 @@ func GetSigningKey(ctx context.Context) (*SigningKey, *Signature) { return nil, nil } - return &SigningKey{ + key := &SigningKey{ KeyID: strings.TrimSpace(signingKey), Format: strings.TrimSpace(format), - }, &Signature{ + } + sig := &Signature{ Name: strings.TrimSpace(signingName), Email: strings.TrimSpace(signingEmail), } + return key, sig } if setting.Repository.Signing.SigningKey == "" { return nil, nil } - return &SigningKey{ + key := &SigningKey{ KeyID: setting.Repository.Signing.SigningKey, Format: setting.Repository.Signing.SigningFormat, - }, &Signature{ + } + sig := &Signature{ Name: setting.Repository.Signing.SigningName, Email: setting.Repository.Signing.SigningEmail, } + return key, sig } diff --git a/modules/git/repo.go b/modules/git/repo.go index 10e04f4b27..dee9cb6f46 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -70,7 +70,7 @@ func OpenRepository(catFileBatchCtx context.Context, repo RepositoryFacade) (*Re return nil, util.NewNotExistErrorf("no such file or directory") } gitRepo := &Repository{ - RepositoryBase: RepositoryBase{tagCache: newObjectCache[*Tag](), repoFacade: repo, catFileBatchCtx: catFileBatchCtx}, + tagCache: newObjectCache[*Tag](), repoFacade: repo, catFileBatchCtx: catFileBatchCtx, } gitRepo.RepositoryBase.LastCommitCache = &LastCommitCache{ repo: gitRepo, diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go index e557f45d29..f6addd66a6 100644 --- a/modules/git/repo_tag_test.go +++ b/modules/git/repo_tag_test.go @@ -211,13 +211,13 @@ func TestRepository_parseTagRef(t *testing.T) { }, want: &Tag{ - Name: "v1.9.1", - ID: MustIDFromString("ab23e4b7f4cd0caafe0174c0e7ef6d651ba72889"), - Object: MustIDFromString("ab23e4b7f4cd0caafe0174c0e7ef6d651ba72889"), - Type: "commit", - Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), - CommitMessage: CommitMessage{MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n"}, - Signature: nil, + Name: "v1.9.1", + ID: MustIDFromString("ab23e4b7f4cd0caafe0174c0e7ef6d651ba72889"), + Object: MustIDFromString("ab23e4b7f4cd0caafe0174c0e7ef6d651ba72889"), + Type: "commit", + Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), + MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n", + Signature: nil, }, }, @@ -240,13 +240,13 @@ func TestRepository_parseTagRef(t *testing.T) { }, want: &Tag{ - Name: "v0.0.1", - ID: MustIDFromString("8c68a1f06fc59c655b7e3905b159d761e91c53c9"), - Object: MustIDFromString("3325fd8a973321fd59455492976c042dde3fd1ca"), - Type: "tag", - Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), - CommitMessage: CommitMessage{MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n"}, - Signature: nil, + Name: "v0.0.1", + ID: MustIDFromString("8c68a1f06fc59c655b7e3905b159d761e91c53c9"), + Object: MustIDFromString("3325fd8a973321fd59455492976c042dde3fd1ca"), + Type: "tag", + Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), + MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n", + Signature: nil, }, }, @@ -299,12 +299,12 @@ qbHDASXl }, want: &Tag{ - Name: "v0.0.1", - ID: MustIDFromString("8c68a1f06fc59c655b7e3905b159d761e91c53c9"), - Object: MustIDFromString("3325fd8a973321fd59455492976c042dde3fd1ca"), - Type: "tag", - Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), - CommitMessage: CommitMessage{MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n"}, + Name: "v0.0.1", + ID: MustIDFromString("8c68a1f06fc59c655b7e3905b159d761e91c53c9"), + Object: MustIDFromString("3325fd8a973321fd59455492976c042dde3fd1ca"), + Type: "tag", + Tagger: parseSignatureFromCommitLine("Foo Bar 1565789218 +0300"), + MessageRaw: "Add changelog of v1.9.1 (#7859)\n\n* add changelog of v1.9.1\n* Update CHANGELOG.md\n", Signature: &CommitSignature{ Signature: `-----BEGIN PGP SIGNATURE----- diff --git a/modules/git/tree.go b/modules/git/tree.go index a397452d9c..b895936fef 100644 --- a/modules/git/tree.go +++ b/modules/git/tree.go @@ -17,7 +17,7 @@ type TreeCommon struct { } func newTree(id ObjectID) *Tree { - return &Tree{TreeCommon: TreeCommon{ID: id}} + return &Tree{ID: id} } // SubTree get a subtree by the sub dir path diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index f22e2c2ad5..c8f690bde2 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -219,7 +219,7 @@ func PopulateIssueIndexer(ctx context.Context) error { default: } repos, _, err := repo_model.SearchRepositoryByName(ctx, repo_model.SearchRepoOptions{ - ListOptions: db_model.ListOptions{Page: page, PageSize: repo_model.RepositoryListDefaultPageSize}, + Page: page, PageSize: repo_model.RepositoryListDefaultPageSize, OrderBy: db_model.SearchOrderByID, Private: true, Collaborate: optional.Some(false), diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index 082ab21ace..909d1dad1e 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -184,7 +184,7 @@ func asLogStringer(v any) LogStringer { // in case the receiver is a pointer, but the value is a struct vp := reflect.New(a.Type()) vp.Elem().Set(a) - if s, ok := vp.Interface().(LogStringer); ok { + if s, ok := reflect.TypeAssert[LogStringer](vp); ok { return s } } diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index 154557512c..2d56dec9fb 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -56,13 +56,11 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidPackageName", func(t *testing.T) { test := func(t *testing.T, name string) { b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: name, - Name: name, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: name, - }, + ID: name, + Name: name, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: name, }, }, }) @@ -95,13 +93,11 @@ func TestParsePackage(t *testing.T) { t.Run("ValidPackageName", func(t *testing.T) { test := func(t *testing.T, name string) { b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: name, - Name: name, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: name, - }, + ID: name, + Name: name, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: name, }, }, }) @@ -126,14 +122,12 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidPackageVersion", func(t *testing.T) { version := "first-version" b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - Versions: map[string]*PackageMetadataVersion{ - version: { - Name: packageFullName, - Version: version, - }, + ID: packageFullName, + Name: packageFullName, + Versions: map[string]*PackageMetadataVersion{ + version: { + Name: packageFullName, + Version: version, }, }, }) @@ -145,14 +139,12 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidAttachment", func(t *testing.T) { b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: packageFullName, - Version: packageVersion, - }, + ID: packageFullName, + Name: packageFullName, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: packageFullName, + Version: packageVersion, }, }, Attachments: map[string]*PackageAttachment{ @@ -168,14 +160,12 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidData", func(t *testing.T) { filename := fmt.Sprintf("%s-%s.tgz", packageFullName, packageVersion) b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: packageFullName, - Version: packageVersion, - }, + ID: packageFullName, + Name: packageFullName, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: packageFullName, + Version: packageVersion, }, }, Attachments: map[string]*PackageAttachment{ @@ -193,16 +183,14 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidIntegrity", func(t *testing.T) { filename := fmt.Sprintf("%s-%s.tgz", packageFullName, packageVersion) b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: packageFullName, - Version: packageVersion, - Dist: PackageDistribution{ - Integrity: "sha512-test==", - }, + ID: packageFullName, + Name: packageFullName, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: packageFullName, + Version: packageVersion, + Dist: PackageDistribution{ + Integrity: "sha512-test==", }, }, }, @@ -221,16 +209,14 @@ func TestParsePackage(t *testing.T) { t.Run("InvalidIntegrity2", func(t *testing.T) { filename := fmt.Sprintf("%s-%s.tgz", packageFullName, packageVersion) b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: packageFullName, - Version: packageVersion, - Dist: PackageDistribution{ - Integrity: integrity, - }, + ID: packageFullName, + Name: packageFullName, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: packageFullName, + Version: packageVersion, + Dist: PackageDistribution{ + Integrity: integrity, }, }, }, @@ -249,32 +235,30 @@ func TestParsePackage(t *testing.T) { t.Run("Valid", func(t *testing.T) { filename := fmt.Sprintf("%s-%s.tgz", packageFullName, packageVersion) b, _ := json.Marshal(packageUpload{ - PackageMetadata: PackageMetadata{ - ID: packageFullName, - Name: packageFullName, - DistTags: map[string]string{ - packageTag: packageVersion, - }, - Versions: map[string]*PackageMetadataVersion{ - packageVersion: { - Name: packageFullName, - Version: packageVersion, - Description: packageDescription, - Author: User{Name: packageAuthor}, - License: "MIT", - Homepage: "https://gitea.io/", - Readme: packageDescription, - Dependencies: map[string]string{ - "package": "1.2.0", - }, - Bin: map[string]string{ - "bin": packageBin, - }, - Dist: PackageDistribution{ - Integrity: integrity, - }, - Repository: repository, + ID: packageFullName, + Name: packageFullName, + DistTags: map[string]string{ + packageTag: packageVersion, + }, + Versions: map[string]*PackageMetadataVersion{ + packageVersion: { + Name: packageFullName, + Version: packageVersion, + Description: packageDescription, + Author: User{Name: packageAuthor}, + License: "MIT", + Homepage: "https://gitea.io/", + Readme: packageDescription, + Dependencies: map[string]string{ + "package": "1.2.0", }, + Bin: map[string]string{ + "bin": packageBin, + }, + Dist: PackageDistribution{ + Integrity: integrity, + }, + Repository: repository, }, }, Attachments: map[string]*PackageAttachment{ diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 5e6266d9f2..f43f5a6e52 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -108,10 +108,10 @@ func TestCommitToPushCommit(t *testing.T) { sha1, err := git.NewIDFromString(hexString) assert.NoError(t, err) pushCommit := CommitToPushCommit(&git.Commit{ - ID: sha1, - Author: sig, - Committer: sig, - CommitMessage: git.CommitMessage{MessageRaw: "Commit Message"}, + ID: sha1, + Author: sig, + Committer: sig, + MessageRaw: "Commit Message", }) assert.Equal(t, hexString, pushCommit.Sha1) assert.Equal(t, "Commit Message", pushCommit.Message) @@ -139,16 +139,16 @@ func TestListToPushCommits(t *testing.T) { l := []*git.Commit{ { - ID: hash1, - Author: sig, - Committer: sig, - CommitMessage: git.CommitMessage{MessageRaw: "Message1"}, + ID: hash1, + Author: sig, + Committer: sig, + MessageRaw: "Message1", }, { - ID: hash2, - Author: sig, - Committer: sig, - CommitMessage: git.CommitMessage{MessageRaw: "Message2"}, + ID: hash2, + Author: sig, + Committer: sig, + MessageRaw: "Message2", }, } diff --git a/modules/setting/actions.go b/modules/setting/actions.go index 6043d53ae5..e35f27fa52 100644 --- a/modules/setting/actions.go +++ b/modules/setting/actions.go @@ -93,7 +93,7 @@ func loadActionsFrom(rootCfg ConfigProvider) error { } if urls := string(Actions.DefaultActionsURL); urls != defaultActionsURLGitHub && urls != defaultActionsURLSelf { - url := strings.Split(urls, ",")[0] + url, _, _ := strings.Cut(urls, ",") if strings.HasPrefix(url, "https://") || strings.HasPrefix(url, "http://") { log.Error("[actions] DEFAULT_ACTIONS_URL does not support %q as custom URL any longer, fallback to %q", urls, diff --git a/modules/setting/cache.go b/modules/setting/cache.go index 115c324678..1e5b20c2ec 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -25,11 +25,9 @@ var CacheService = struct { TTL time.Duration `ini:"ITEM_TTL"` } `ini:"cache.last_commit"` }{ - Cache: Cache{ - Adapter: "memory", - Interval: 60, - TTL: 16 * time.Hour, - }, + Adapter: "memory", + Interval: 60, + TTL: 16 * time.Hour, LastCommit: struct { TTL time.Duration `ini:"ITEM_TTL"` }{ diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go index d2f138a892..18c94262e3 100644 --- a/modules/setting/config_env.go +++ b/modules/setting/config_env.go @@ -125,7 +125,7 @@ func EnvironmentToConfig(cfg ConfigProvider, envs []string) (changed bool) { } // use environment value as config value, or read the file content as value if the key indicates a file - keyValue := envValue //nolint:staticcheck // false positive + keyValue := envValue if useFileValue { fileContent, err := os.ReadFile(envValue) if err != nil { diff --git a/modules/setting/cron_test.go b/modules/setting/cron_test.go index 53996b5de9..54bbff9c84 100644 --- a/modules/setting/cron_test.go +++ b/modules/setting/cron_test.go @@ -30,9 +30,7 @@ EXTEND = true assert.NoError(t, err) extended := &Extended{ - BaseStruct: BaseStruct{ - Second: "queen of hearts", - }, + Second: "queen of hearts", } _, err = getCronSettings(cfg, "test", extended) @@ -71,15 +69,11 @@ THIRD = white rabbit assert.NoError(t, err) extended := &Extended2{ - Extended: Extended{ - BaseStruct: BaseStruct{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 72h", - }, - Extend: false, - }, - Third: "black rabbit", + Enabled: false, + RunAtStart: false, + Schedule: "@every 72h", + Extend: false, + Third: "black rabbit", } _, err = getCronSettings(cfg, "test", extended) diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index 5d1788f715..b2ace3e6cf 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -1,7 +1,7 @@ // Copyright 2017 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package structs // import "gitea.dev/modules/structs" +package structs import ( "time" diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 0197ab6045..80eff171da 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -369,8 +369,8 @@ func (ut *RenderUtils) writeAvatarStackItem(b *htmlutil.HTMLBuilder, data *user_ func (ut *RenderUtils) AvatarStackPushCommit(pushCommit *repository.PushCommit) template.HTML { fakeGitCommit := git.Commit{ - CommitMessage: git.CommitMessage{MessageRaw: pushCommit.Message}, - Author: &git.Signature{Name: pushCommit.AuthorName, Email: pushCommit.AuthorEmail}, + MessageRaw: pushCommit.Message, + Author: &git.Signature{Name: pushCommit.AuthorName, Email: pushCommit.AuthorEmail}, // there is no way to know the real committer, but the field can't be nil Committer: &git.Signature{Name: pushCommit.AuthorName, Email: pushCommit.AuthorEmail}, } diff --git a/modules/util/error.go b/modules/util/error.go index 4c2566a2a3..d503cadf28 100644 --- a/modules/util/error.go +++ b/modules/util/error.go @@ -99,8 +99,7 @@ func ErrorWrapTranslatable(err error, trKey string, trArgs ...any) ErrorTranslat } func ErrorAsTranslatable(err error) ErrorTranslatable { - var e *errorTranslatableWrapper - if errors.As(err, &e) { + if e, ok := errors.AsType[*errorTranslatableWrapper](err); ok { return e } return nil diff --git a/modules/web/handler.go b/modules/web/handler.go index d8ce8df955..62fb0709b4 100644 --- a/modules/web/handler.go +++ b/modules/web/handler.go @@ -66,7 +66,7 @@ var ( func preCheckHandler(fn reflect.Value, argsIn []reflect.Value) { hasStatusProvider := false for _, argIn := range argsIn { - if _, hasStatusProvider = argIn.Interface().(types.ResponseStatusProvider); hasStatusProvider { + if _, hasStatusProvider = reflect.TypeAssert[types.ResponseStatusProvider](argIn); hasStatusProvider { break } } @@ -119,7 +119,7 @@ func handleResponse(fn reflect.Value, ret []reflect.Value) { func hasResponseBeenWritten(argsIn []reflect.Value) bool { for _, argIn := range argsIn { - if statusProvider, ok := argIn.Interface().(types.ResponseStatusProvider); ok { + if statusProvider, ok := reflect.TypeAssert[types.ResponseStatusProvider](argIn); ok { if statusProvider.WrittenStatus() != 0 { return true } diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index b4962939e0..64bf649795 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -83,7 +83,7 @@ func parseArtifactItemPath(ctx *ArtifactContext) (string, string, bool) { // it's formatted as {artifact_name}/{artfict_path_in_runner} // runner in host mode on Windows, itemPath is joined by Windows slash '\' itemPath := util.PathJoinRelX(ctx.Req.URL.Query().Get("itemPath")) - artifactName := strings.Split(itemPath, "/")[0] + artifactName, _, _ := strings.Cut(itemPath, "/") artifactPath := strings.TrimPrefix(itemPath, artifactName+"/") if !validateArtifactHash(ctx, artifactName) { return "", "", false diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index dda28793c2..3a05cc7315 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -8,6 +8,7 @@ import ( "errors" "net/http" "slices" + "uuid" runnerv1 "gitea.dev/actionslib/runner/v1" "gitea.dev/actionslib/runner/v1/runnerv1connect" @@ -23,7 +24,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" - "uuid" ) func NewRunnerServiceHandler() (string, http.Handler) { diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index 9a593f7caa..a9d3cc86f7 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -155,23 +155,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeAlpine, - Name: pck.Name, - Version: pck.Version, - }, - Creator: ctx.Doer, - Metadata: pck.VersionMetadata, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeAlpine, + Name: pck.Name, + Version: pck.Version, + Creator: ctx.Doer, + Metadata: pck.VersionMetadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s.apk", pck.Name, pck.Version), - CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, pck.FileMetadata.Architecture), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s-%s.apk", pck.Name, pck.Version), + CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, pck.FileMetadata.Architecture), + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ alpine_module.PropertyBranch: branch, alpine_module.PropertyRepository: repository, diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index eab2733f57..948f5505b2 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -120,23 +120,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeArch, - Name: pck.Name, - Version: pck.Version, - }, - Creator: ctx.Doer, - Metadata: pck.VersionMetadata, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeArch, + Name: pck.Name, + Version: pck.Version, + Creator: ctx.Doer, + Metadata: pck.VersionMetadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s-%s.pkg.tar.%s", pck.Name, pck.Version, pck.FileMetadata.Architecture, pck.FileCompressionExtension), - CompositeKey: fmt.Sprintf("%s|%s", repository, pck.FileMetadata.Architecture), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s-%s-%s.pkg.tar.%s", pck.Name, pck.Version, pck.FileMetadata.Architecture, pck.FileCompressionExtension), + CompositeKey: fmt.Sprintf("%s|%s", repository, pck.FileMetadata.Architecture), + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ arch_module.PropertyRepository: repository, arch_module.PropertyArchitecture: pck.FileMetadata.Architecture, diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 6c8d04bf50..22ba8d9ce8 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -214,12 +214,10 @@ func UploadPackage(ctx *context.Context) { pv, _, err := packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeCargo, - Name: cp.Name, - Version: cp.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeCargo, + Name: cp.Name, + Version: cp.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: cp.Metadata, @@ -228,12 +226,10 @@ func UploadPackage(ctx *context.Context) { }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(fmt.Sprintf("%s-%s.crate", cp.Name, cp.Version)), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: strings.ToLower(fmt.Sprintf("%s-%s.crate", cp.Name, cp.Version)), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index ae4a874de1..40c2fb47bd 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -288,23 +288,19 @@ func UploadPackage(ctx *context.Context) { _, _, err = packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeChef, - Name: pck.Name, - Version: pck.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeChef, + Name: pck.Name, + Version: pck.Version, Creator: ctx.Doer, SemverCompatible: true, Metadata: pck.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(pck.Version + ".tar.gz"), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: strings.ToLower(pck.Version + ".tar.gz"), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index f09263a923..bc25fa3545 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -214,12 +214,10 @@ func UploadPackage(ctx *context.Context) { _, _, err = packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeComposer, - Name: cp.Name, - Version: cp.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeComposer, + Name: cp.Name, + Version: cp.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: cp.Metadata, @@ -228,12 +226,10 @@ func UploadPackage(ctx *context.Context) { }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: cp.Filename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: cp.Filename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index cbf23aa501..850ceab7e6 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -365,22 +365,18 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey isConaninfoFile := filename == conaninfoFile pci := &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeConan, - Name: rref.Name, - Version: rref.Version, - }, - Creator: ctx.Doer, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeConan, + Name: rref.Name, + Version: rref.Version, + Creator: ctx.Doer, } pfci := &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(filename), - CompositeKey: fileKey, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: isConanfileFile, + Filename: strings.ToLower(filename), + CompositeKey: fileKey, + Creator: ctx.Doer, + Data: buf, + IsLead: isConanfileFile, Properties: map[string]string{ conan_module.PropertyRecipeUser: rref.User, conan_module.PropertyRecipeChannel: rref.Channel, diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index 48cb85192b..84e50b69ef 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -250,12 +250,10 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeConda, - Name: fullName, - Version: pck.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeConda, + Name: fullName, + Version: pck.Version, SemverCompatible: false, Creator: ctx.Doer, Metadata: pck.VersionMetadata, @@ -265,13 +263,11 @@ func UploadPackageFile(ctx *context.Context) { }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s-%s%s", pck.Name, pck.Version, pck.FileMetadata.Build, extension), - CompositeKey: pck.Subdir, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s-%s-%s%s", pck.Name, pck.Version, pck.FileMetadata.Build, extension), + CompositeKey: pck.Subdir, + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ conda_module.PropertySubdir: pck.Subdir, conda_module.PropertyMetadata: string(fileMetadataRaw), diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index a293cac08d..8d58f11aff 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -294,10 +294,8 @@ func PostBlobsUploads(ctx *context.Context) { if _, err := saveAsPackageBlob(ctx, buf, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - Name: image, - }, + Owner: ctx.Package.Owner, + Name: image, Creator: ctx.Doer, }, ); err != nil { @@ -443,10 +441,8 @@ func PutBlobsUpload(ctx *context.Context) { if _, err := saveAsPackageBlob(ctx, uploader, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - Name: image, - }, + Owner: ctx.Package.Owner, + Name: image, Creator: ctx.Doer, }, ); err != nil { @@ -598,8 +594,7 @@ func PutManifest(ctx *context.Context) { digest, err := processManifest(ctx, mci, buf) if err != nil { - var namedError *namedError - if errors.As(err, &namedError) { + if namedError, ok := errors.AsType[*namedError](err); ok { apiErrorDefined(ctx, namedError) } else if errors.Is(err, container_model.ErrContainerBlobNotExist) { apiErrorDefined(ctx, errBlobUnknown) diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index 13357661ff..b2eeddff22 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -184,25 +184,21 @@ func uploadPackageFile(ctx *context.Context, compositeKey string, properties map _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeCran, - Name: pck.Name, - Version: pck.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeCran, + Name: pck.Name, + Version: pck.Version, SemverCompatible: false, Creator: ctx.Doer, Metadata: pck.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s_%s%s", pck.Name, pck.Version, pck.FileExtension), - CompositeKey: compositeKey, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, - Properties: properties, + Filename: fmt.Sprintf("%s_%s%s", pck.Name, pck.Version, pck.FileExtension), + CompositeKey: compositeKey, + Creator: ctx.Doer, + Data: buf, + IsLead: true, + Properties: properties, }, ) if err != nil { diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index ee9d4d554a..0711accd92 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -161,23 +161,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeDebian, - Name: pck.Name, - Version: pck.Version, - }, - Creator: ctx.Doer, - Metadata: pck.Metadata, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeDebian, + Name: pck.Name, + Version: pck.Version, + Creator: ctx.Doer, + Metadata: pck.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s_%s_%s.deb", pck.Name, pck.Version, pck.Architecture), - CompositeKey: fmt.Sprintf("%s|%s", distribution, component), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s_%s_%s.deb", pck.Name, pck.Version, pck.Architecture), + CompositeKey: fmt.Sprintf("%s|%s", distribution, component), + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ debian_module.PropertyDistribution: distribution, debian_module.PropertyComponent: component, diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index 32abf661aa..4971a59b92 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -108,21 +108,17 @@ func UploadPackage(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeGeneric, - Name: packageName, - Version: packageVersion, - }, - Creator: ctx.Doer, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeGeneric, + Name: packageName, + Version: packageVersion, + Creator: ctx.Doer, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: filename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: filename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 9d3ea6515f..c49099479e 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -187,24 +187,20 @@ func UploadPackage(ctx *context.Context) { _, _, err = packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeGo, - Name: pck.Name, - Version: pck.Version, - }, - Creator: ctx.Doer, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeGo, + Name: pck.Name, + Version: pck.Version, + Creator: ctx.Doer, VersionProperties: map[string]string{ goproxy_module.PropertyGoMod: pck.GoMod, }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%v.zip", pck.Version), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%v.zip", pck.Version), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index 8b732d8547..8d93864698 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -174,20 +174,16 @@ func UploadPackage(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeHelm, - Name: metadata.Name, - Version: metadata.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeHelm, + Name: metadata.Name, + Version: metadata.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: createFilename(metadata), - }, + Filename: createFilename(metadata), Creator: ctx.Doer, Data: buf, IsLead: true, @@ -251,9 +247,7 @@ func UploadProvenanceFile(ctx *context.Context) { Version: metadata.Version, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: createProvenanceFilename(metadata), - }, + Filename: createProvenanceFilename(metadata), Creator: ctx.Doer, Data: buf, IsLead: false, diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 250074a554..21a91a67d9 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -268,12 +268,10 @@ func UploadPackageFile(ctx *context.Context) { defer buf.Close() pvci := &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeMaven, - Name: packageName, - Version: params.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeMaven, + Name: packageName, + Version: params.Version, SemverCompatible: false, Creator: ctx.Doer, } @@ -338,9 +336,7 @@ func UploadPackageFile(ctx *context.Context) { } pfci := &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: params.Filename, - }, + Filename: params.Filename, Creator: ctx.Doer, Data: buf, IsLead: false, diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index e2b4474bc0..22ed01158c 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -201,23 +201,19 @@ func UploadPackage(ctx *context.Context) { pv, _, err := packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeNpm, - Name: npmPackage.Name, - Version: npmPackage.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeNpm, + Name: npmPackage.Name, + Version: npmPackage.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: npmPackage.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: npmPackage.Filename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: npmPackage.Filename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 4c3e1f8c8c..ea12a6bab7 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -441,23 +441,19 @@ func UploadPackage(ctx *context.Context) { pv, _, err := packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeNuGet, - Name: np.ID, - Version: np.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeNuGet, + Name: np.ID, + Version: np.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: np.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(fmt.Sprintf("%s.%s.nupkg", np.ID, np.Version)), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: strings.ToLower(fmt.Sprintf("%s.%s.nupkg", np.ID, np.Version)), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { @@ -483,10 +479,8 @@ func UploadPackage(ctx *context.Context) { ctx, pv, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(np.ID + ".nuspec"), - }, - Data: nuspecBuf, + Filename: strings.ToLower(np.ID + ".nuspec"), + Data: nuspecBuf, }, ) if err != nil { @@ -542,12 +536,10 @@ func UploadSymbolPackage(ctx *context.Context) { ctx, pi, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(fmt.Sprintf("%s.%s.snupkg", np.ID, np.Version)), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: false, + Filename: strings.ToLower(fmt.Sprintf("%s.%s.snupkg", np.ID, np.Version)), + Creator: ctx.Doer, + Data: buf, + IsLead: false, }, ) if err != nil { @@ -569,13 +561,11 @@ func UploadSymbolPackage(ctx *context.Context) { ctx, pi, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(pdb.Name), - CompositeKey: strings.ToLower(pdb.ID), - }, - Creator: ctx.Doer, - Data: pdb.Content, - IsLead: false, + Filename: strings.ToLower(pdb.Name), + CompositeKey: strings.ToLower(pdb.ID), + Creator: ctx.Doer, + Data: pdb.Content, + IsLead: false, Properties: map[string]string{ nuget_module.PropertySymbolID: strings.ToLower(pdb.ID), }, diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index 4ca10eaea0..32db42887a 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -187,23 +187,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypePub, - Name: pck.Name, - Version: pck.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypePub, + Name: pck.Name, + Version: pck.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: pck.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(pck.Version + ".tar.gz"), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: strings.ToLower(pck.Version + ".tar.gz"), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 3526d1aac2..14554dd2fb 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -170,12 +170,10 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypePyPI, - Name: packageName, - Version: packageVersion, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypePyPI, + Name: packageName, + Version: packageVersion, SemverCompatible: false, Creator: ctx.Doer, Metadata: &pypi_module.Metadata{ @@ -189,12 +187,10 @@ func UploadPackageFile(ctx *context.Context) { }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fileHeader.Filename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fileHeader.Filename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index c1475cf5c8..1f01156323 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -174,23 +174,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeRpm, - Name: pck.Name, - Version: pck.Version, - }, - Creator: ctx.Doer, - Metadata: pck.VersionMetadata, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeRpm, + Name: pck.Name, + Version: pck.Version, + Creator: ctx.Doer, + Metadata: pck.VersionMetadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s.%s.rpm", pck.Name, pck.Version, pck.FileMetadata.Architecture), - CompositeKey: group, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s-%s.%s.rpm", pck.Name, pck.Version, pck.FileMetadata.Architecture), + CompositeKey: group, + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ rpm_module.PropertyGroup: group, rpm_module.PropertyArchitecture: pck.FileMetadata.Architecture, diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index c78a1dc63a..11d78b07c8 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -234,23 +234,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeRubyGems, - Name: rp.Name, - Version: rp.Version, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeRubyGems, + Name: rp.Name, + Version: rp.Version, SemverCompatible: true, Creator: ctx.Doer, Metadata: rp.Metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: filename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: filename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index f81cd6e74b..eb89f191e1 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -373,12 +373,10 @@ func UploadPackageFile(ctx *context.Context) { pv, _, err := packages_service.CreatePackageAndAddFile( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeSwift, - Name: buildPackageID(packageScope, packageName), - Version: packageVersion, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeSwift, + Name: buildPackageID(packageScope, packageName), + Version: packageVersion, SemverCompatible: true, Creator: ctx.Doer, Metadata: pck.Metadata, @@ -388,12 +386,10 @@ func UploadPackageFile(ctx *context.Context) { }, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s.zip", packageName, packageVersion), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: fmt.Sprintf("%s-%s.zip", packageName, packageVersion), + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/terraform/terraform.go b/routers/api/packages/terraform/terraform.go index ee188e685f..41b3ff71c9 100644 --- a/routers/api/packages/terraform/terraform.go +++ b/routers/api/packages/terraform/terraform.go @@ -155,21 +155,17 @@ func UploadState(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeTerraformState, - Name: packageName, - Version: strconv.FormatUint(state.Serial, 10), - }, - Creator: ctx.Doer, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeTerraformState, + Name: packageName, + Version: strconv.FormatUint(state.Serial, 10), + Creator: ctx.Doer, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: stateFilename, - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: stateFilename, + Creator: ctx.Doer, + Data: buf, + IsLead: true, }, ) if err != nil { diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 5f275fcb48..a25b14f42f 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -179,23 +179,19 @@ func UploadPackageFile(ctx *context.Context) { _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: ctx.Package.Owner, - PackageType: packages_model.TypeVagrant, - Name: boxName, - Version: boxVersion, - }, + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeVagrant, + Name: boxName, + Version: boxVersion, SemverCompatible: true, Creator: ctx.Doer, Metadata: metadata, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: strings.ToLower(boxProvider), - }, - Creator: ctx.Doer, - Data: buf, - IsLead: true, + Filename: strings.ToLower(boxProvider), + Creator: ctx.Doer, + Data: buf, + IsLead: true, Properties: map[string]string{ vagrant_module.PropertyProvider: strings.TrimSuffix(boxProvider, ".box"), }, diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index b2c932f4af..9a36850262 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -795,7 +795,7 @@ func mustEnableIssuesOrPulls(ctx *context.APIContext) { } func mustEnableWiki(ctx *context.APIContext) { - if !(ctx.Repo.Permission.CanRead(unit.TypeWiki)) { + if !ctx.Repo.Permission.CanRead(unit.TypeWiki) { ctx.APIErrorNotFound() return } diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index 615eea9a36..b16c417bb3 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -110,20 +110,16 @@ func GetIssueDependencies(ctx *context.APIContext) { if !perm.CanReadIssuesOrPulls(blocker.Issue.IsPull) { if !canWrite { hiddenBlocker := &issues_model.DependencyInfo{ - Issue: issues_model.Issue{ - Title: "HIDDEN", - }, + Title: "HIDDEN", } blocker = hiddenBlocker } else { confidentialBlocker := &issues_model.DependencyInfo{ - Issue: issues_model.Issue{ - RepoID: blocker.Issue.RepoID, - Index: blocker.Index, - Title: blocker.Title, - IsClosed: blocker.IsClosed, - IsPull: blocker.IsPull, - }, + RepoID: blocker.Issue.RepoID, + Index: blocker.Index, + Title: blocker.Title, + IsClosed: blocker.IsClosed, + IsPull: blocker.IsPull, Repository: repo_model.Repository{ ID: blocker.Issue.Repo.ID, Name: blocker.Issue.Repo.Name, diff --git a/routers/web/admin/badges.go b/routers/web/admin/badges.go index 5880f19e3a..e4cd4cfa1d 100644 --- a/routers/web/admin/badges.go +++ b/routers/web/admin/badges.go @@ -37,10 +37,8 @@ func Badges(ctx *context.Context) { ctx.Data["PageIsAdminBadges"] = true RenderBadgeSearch(ctx, &user_model.SearchBadgeOptions{ - ListOptions: db.ListOptions{ - Page: max(ctx.FormInt("page"), 1), - PageSize: setting.UI.Admin.UserPagingNum, - }, + Page: max(ctx.FormInt("page"), 1), + PageSize: setting.UI.Admin.UserPagingNum, }, tplBadges) } @@ -106,10 +104,8 @@ func ViewBadge(ctx *context.Context) { } opts := &user_model.GetBadgeUsersOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: setting.UI.Admin.UserPagingNum, - }, + Page: 1, + PageSize: setting.UI.Admin.UserPagingNum, BadgeSlug: badge.Slug, } users, count, err := user_model.GetBadgeUsers(ctx, opts) @@ -189,10 +185,8 @@ func BadgeUsers(ctx *context.Context) { badge := &user_model.Badge{Slug: ctx.PathParam("badge_slug")} opts := &user_model.GetBadgeUsersOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.Admin.UserPagingNum, - }, + Page: page, + PageSize: setting.UI.Admin.UserPagingNum, BadgeSlug: badge.Slug, } users, count, err := user_model.GetBadgeUsers(ctx, opts) diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index e6d182f0bb..3567b46d90 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -70,7 +70,7 @@ func MonitorDiagnosis(ctx *context.Context) { for _, record := range tailmsg.GetManager().GetTraceRecorder().GetRecords() { _, _ = f.Write(util.UnsafeStringToBytes(record.Time.Format(time.RFC3339))) _, _ = f.Write([]byte(" ")) - _, _ = f.Write(util.UnsafeStringToBytes((record.Content))) + _, _ = f.Write(util.UnsafeStringToBytes(record.Content)) _, _ = f.Write([]byte("\n\n")) } } diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index 27b7745b3f..8ff09c942c 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,7 +8,6 @@ import ( "net/http" "net/url" - "gitea.dev/models/db" user_model "gitea.dev/models/user" "gitea.dev/modules/log" "gitea.dev/modules/optional" @@ -28,10 +27,8 @@ func Emails(ctx *context.Context) { ctx.Data["PageIsAdminEmails"] = true opts := &user_model.SearchEmailOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.Admin.UserPagingNum, - Page: ctx.FormInt("page"), - }, + PageSize: setting.UI.Admin.UserPagingNum, + Page: ctx.FormInt("page"), } if opts.Page <= 1 { diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index 02037af89f..382e75c16b 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -28,10 +28,8 @@ func Organizations(ctx *context.Context) { Actor: ctx.Doer, Types: []user_model.UserType{user_model.UserTypeOrganization}, IncludeReserved: true, // administrator needs to list all accounts include reserved - ListOptions: db.ListOptions{ - PageSize: setting.UI.Admin.OrgPagingNum, - }, - Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}, - OrderBy: db.SearchOrderBy(sortOrder), + PageSize: setting.UI.Admin.OrgPagingNum, + Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}, + OrderBy: db.SearchOrderBy(sortOrder), }, tplOrgs) } diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index f9ae597527..5b0713ec22 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -63,11 +63,9 @@ func Users(ctx *context.Context) { } explore.RenderUserSearch(ctx, user_model.SearchUserOptions{ - Actor: ctx.Doer, - Types: []user_model.UserType{user_model.UserTypeIndividual}, - ListOptions: db.ListOptions{ - PageSize: setting.UI.Admin.UserPagingNum, - }, + Actor: ctx.Doer, + Types: []user_model.UserType{user_model.UserTypeIndividual}, + PageSize: setting.UI.Admin.UserPagingNum, SearchByEmail: true, IsActive: optional.ParseBool(statusFilterMap["is_active"]), IsAdmin: optional.ParseBool(statusFilterMap["is_admin"]), diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index e515545e08..da014097ac 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -58,7 +58,7 @@ func prepareMockDataGiteaUI(_ *context.Context) {} func prepareMockDataBadgeCommitSign(ctx *context.Context) { var commits []*asymkey.SignCommit - mockUsers, _ := db.Find[user_model.User](ctx, user_model.SearchUserOptions{ListOptions: db.ListOptions{PageSize: 1}}) + mockUsers, _ := db.Find[user_model.User](ctx, user_model.SearchUserOptions{PageSize: 1}) mockUser := mockUsers[0] commits = append(commits, &asymkey.SignCommit{ Verification: &asymkey.CommitVerification{}, diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index 687d83ff36..2c92b0ce65 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -41,11 +41,11 @@ func Organizations(ctx *context.Context) { sortOrderDefault := util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest") sortOrder := ctx.FormString("sort", sortOrderDefault) RenderUserSearch(ctx, user_model.SearchUserOptions{ - Actor: ctx.Doer, - Types: []user_model.UserType{user_model.UserTypeOrganization}, - ListOptions: db.ListOptions{PageSize: setting.UI.ExplorePagingNum}, - Visible: visibleTypes, - OrderBy: db.SearchOrderBy(sortOrder), + Actor: ctx.Doer, + Types: []user_model.UserType{user_model.UserTypeOrganization}, + PageSize: setting.UI.ExplorePagingNum, + Visible: visibleTypes, + OrderBy: db.SearchOrderBy(sortOrder), SupportedSortOrders: supportedSortOrders, }, tplExploreUsers) diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 2399aa5880..9a8cbb9997 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -95,10 +95,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { ctx.Data["IsPrivate"] = private repos, count, err = repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: opts.PageSize, - }, + Page: page, + PageSize: opts.PageSize, Actor: ctx.Doer, OrderBy: orderBy, Private: opts.Private, diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index aae0522b06..dcb79c6239 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -16,11 +16,9 @@ import ( // TopicSearch search for creating topic func TopicSearch(ctx *context.Context) { opts := &repo_model.FindTopicOptions{ - Keyword: ctx.FormString("q"), - ListOptions: db.ListOptions{ - Page: ctx.FormInt("page"), - PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), - }, + Keyword: ctx.FormString("q"), + Page: ctx.FormInt("page"), + PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), } topics, total, err := db.FindAndCount[repo_model.Topic](ctx, opts) diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 64e2a92d68..5e9bbbb302 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -144,12 +144,12 @@ func Users(ctx *context.Context) { sortOrderDefault := util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest") sortOrder := ctx.FormString("sort", sortOrderDefault) RenderUserSearch(ctx, user_model.SearchUserOptions{ - Actor: ctx.Doer, - Types: []user_model.UserType{user_model.UserTypeIndividual}, - ListOptions: db.ListOptions{PageSize: setting.UI.ExplorePagingNum}, - IsActive: optional.Some(true), - Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}, - OrderBy: db.SearchOrderBy(sortOrder), + Actor: ctx.Doer, + Types: []user_model.UserType{user_model.UserTypeIndividual}, + PageSize: setting.UI.ExplorePagingNum, + IsActive: optional.Some(true), + Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}, + OrderBy: db.SearchOrderBy(sortOrder), SupportedSortOrders: supportedSortOrders, }, tplExploreUsers) diff --git a/routers/web/home.go b/routers/web/home.go index 38496aaa28..90ca57faa1 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,7 +8,6 @@ import ( "net/http" "strconv" - "gitea.dev/models/db" repo_model "gitea.dev/models/repo" user_model "gitea.dev/models/user" "gitea.dev/modules/log" @@ -69,10 +68,10 @@ func HomeSitemap(ctx *context.Context) { m := sitemap.NewSitemapIndex() if !setting.Service.Explore.DisableUsersPage { _, cnt, err := user_model.SearchUsers(ctx, user_model.SearchUserOptions{ - Types: []user_model.UserType{user_model.UserTypeIndividual}, - ListOptions: db.ListOptions{PageSize: 1}, - IsActive: optional.Some(true), - Visible: []structs.VisibleType{structs.VisibleTypePublic}, + Types: []user_model.UserType{user_model.UserTypeIndividual}, + PageSize: 1, + IsActive: optional.Some(true), + Visible: []structs.VisibleType{structs.VisibleTypePublic}, }) if err != nil { ctx.ServerError("SearchUsers", err) @@ -87,9 +86,7 @@ func HomeSitemap(ctx *context.Context) { } _, cnt, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: 1, - }, + PageSize: 1, Actor: ctx.Doer, AllPublic: true, }) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index b4fdf28fb9..d62fe893ea 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -89,7 +89,7 @@ func home(ctx *context.Context, viewRepositories bool) { Doer: ctx.Doer, OrgID: org.ID, IsDoerMember: ctx.Org.IsMember, - ListOptions: db.ListOptions{Page: 1, PageSize: 25}, + Page: 1, PageSize: 25, } members, _, err := organization.FindOrgMembers(ctx, opts) @@ -109,9 +109,9 @@ func home(ctx *context.Context, viewRepositories bool) { overviewTeams = nil if ctx.Org.IsMember { overviewTeams, _, err = organization.SearchTeam(ctx, &organization.SearchTeamOptions{ - OrgID: org.ID, - UserID: ctx.Doer.ID, - ListOptions: db.ListOptions{Page: 1, PageSize: orgOverviewTeamsLimit}, + OrgID: org.ID, + UserID: ctx.Doer.ID, + Page: 1, PageSize: orgOverviewTeamsLimit, }) if err != nil { ctx.ServerError("SearchTeam", err) @@ -136,10 +136,8 @@ func home(ctx *context.Context, viewRepositories bool) { ctx.Data["ShowOrgProfileReadmeSelector"] = isViewOverview && prepareResult.ProfilePublicReadmeBlob != nil && prepareResult.ProfilePrivateReadmeBlob != nil repos, count, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.User.RepoPagingNum, - Page: page, - }, + PageSize: setting.UI.User.RepoPagingNum, + Page: page, Keyword: keyword, OwnerID: org.ID, OrderBy: orderBy, diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index b3abb6cafe..f71106ccf8 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -53,10 +53,8 @@ func Projects(ctx *context.Context) { projectType = project_model.TypeIndividual } projects, total, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, OwnerID: ctx.ContextUser.ID, IsClosed: optional.Some(isShowClosed), OrderBy: project_model.GetSearchOrderByBySortType(sortType), diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 233a8b1907..7caff9cfdd 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -83,7 +83,7 @@ func Teams(ctx *context.Context) { IncludeDesc: true, IncludeVisibilities: util.Iif(shouldSeeAllOrgTeams, nil, org_model.VisibleTeamVisibilitiesFor(ctx.Org.IsMember, ctx.IsSigned)), - ListOptions: db.ListOptions{Page: page, PageSize: pagingNum}, + Page: page, PageSize: pagingNum, } return org_model.SearchTeam(ctx, opts) } diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index ca6db69144..1048abd4ed 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -451,9 +451,7 @@ func prepareWorkflowDispatchTemplate(ctx *context.Context, workflowInfos []Workf branchOpts := git_model.FindBranchOptions{ RepoID: ctx.Repo.Repository.ID, IsDeletedBranch: optional.Some(false), - ListOptions: db.ListOptions{ - ListAll: true, - }, + ListAll: true, } branches, err := git_model.FindBranchNames(ctx, branchOpts) if err != nil { @@ -475,10 +473,8 @@ func prepareWorkflowDispatchTemplate(ctx *context.Context, workflowInfos []Workf func (data *actionRunListData) prepareFullPageRuns(ctx *context.Context, otherWorkflows []string) bool { opts := actions_model.FindRunOptions{ - ListOptions: db.ListOptions{ - Page: max(ctx.FormInt("page"), 1), - PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), - }, + Page: max(ctx.FormInt("page"), 1), + PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), RepoID: ctx.Repo.Repository.ID, WorkflowID: data.workflowID, WorkflowRepoID: data.scopedWorkflowSourceRepoID, diff --git a/routers/web/repo/compare_test.go b/routers/web/repo/compare_test.go index d5b7609fa3..c4ec5c0072 100644 --- a/routers/web/repo/compare_test.go +++ b/routers/web/repo/compare_test.go @@ -54,7 +54,7 @@ func TestNewPullRequestTitleContent(t *testing.T) { SignCommit: &asymkey_model.SignCommit{ UserCommit: &gituser.UserCommit{ GitCommit: &git.Commit{ - CommitMessage: git.CommitMessage{MessageRaw: msg}, + MessageRaw: msg, }, }, }, diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index 7571d156d4..322e09423a 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -41,10 +41,8 @@ func Milestones(ctx *context.Context) { page := max(ctx.FormInt("page"), 1) miles, total, err := db.FindAndCount[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoID: ctx.Repo.Repository.ID, IsClosed: optional.Some(isShowClosed), SortType: sortType, diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index b48a4fd7bc..35d5a9e215 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -66,10 +66,8 @@ func Projects(ctx *context.Context) { ctx.Data["ClosedCount"] = repo.NumClosedProjects projects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.IssuePagingNum, - Page: page, - }, + PageSize: setting.UI.IssuePagingNum, + Page: page, RepoID: repo.ID, IsClosed: optional.Some(isShowClosed), OrderBy: project_model.GetSearchOrderByBySortType(sortType), diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 09a535b307..ce22530a40 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -281,9 +281,9 @@ func SingleRelease(ctx *context.Context) { ctx.Data["CanCreateRelease"] = writeAccess && !ctx.Repo.Repository.IsArchived releases, err := getReleaseInfos(ctx, &repo_model.FindReleasesOptions{ - ListOptions: db.ListOptions{Page: 1, PageSize: 1}, - RepoID: ctx.Repo.Repository.ID, - TagNames: []string{ctx.PathParam("*")}, + Page: 1, PageSize: 1, + RepoID: ctx.Repo.Repository.ID, + TagNames: []string{ctx.PathParam("*")}, // only show draft releases for users who can write, read-only users shouldn't see draft releases. IncludeDrafts: writeAccess, IncludeTags: true, diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 2e195dd32d..8f52f06c7c 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -429,10 +429,8 @@ func SearchRepo(ctx *context.Context) { page = 1 } opts := repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), - }, + Page: page, + PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), Actor: ctx.Doer, Keyword: ctx.FormTrim("q"), OwnerID: ctx.FormInt64("uid"), diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index b54f3227e3..7cbb19a896 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -668,10 +668,10 @@ func TestWebhook(ctx *context.Context) { ghostUser := user_model.NewGhostUser() objectFormat := git.ObjectFormatFromName(ctx.Repo.Repository.ObjectFormatName) commit := &git.Commit{ - ID: objectFormat.EmptyObjectID(), - Author: ghostUser.NewGitSig(), - Committer: ghostUser.NewGitSig(), - CommitMessage: git.CommitMessage{MessageRaw: "This is a fake commit for webhook push test"}, + ID: objectFormat.EmptyObjectID(), + Author: ghostUser.NewGitSig(), + Committer: ghostUser.NewGitSig(), + MessageRaw: "This is a fake commit for webhook push test", } apiUser := convert.ToUserWithAccessMode(ctx, ctx.Doer, perm.AccessModeNone) diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index b68eb11f9a..86713d22e8 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -112,12 +112,10 @@ func Runners(ctx *context.Context) { page := max(ctx.FormInt("page"), 1) opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), + Page: page, + PageSize: 100, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), } if rCtx.IsRepo { opts.RepoID = rCtx.RepoID @@ -202,10 +200,8 @@ func RunnersEdit(ctx *context.Context) { ctx.Data["Runner"] = runner opts := actions_model.FindTaskOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 30, - }, + Page: page, + PageSize: 30, Status: actions_model.StatusUnknown, // Unknown means all RunnerID: runner.ID, } diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 0114dc8ea7..4eb38ed219 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -50,11 +50,9 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) { orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{ UserID: ctx.ContextUser.ID, IncludeVisibility: organization.DoerViewOtherVisibility(ctx.Doer, ctx.ContextUser), - ListOptions: db.ListOptions{ - Page: 1, - // query one more result (without a separate counting) to see whether we need to add the "show more orgs" link - PageSize: setting.UI.User.OrgPagingNum + 1, - }, + Page: 1, + // query one more result (without a separate counting) to see whether we need to add the "show more orgs" link + PageSize: setting.UI.User.OrgPagingNum + 1, }) if err != nil { ctx.ServerError("FindOrgs", err) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index ffe3106c33..59fc06a0cd 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -120,7 +120,7 @@ func Dashboard(ctx *context.Context) { OnlyPerformedBy: false, IncludeDeleted: false, Date: ctx.FormString("date"), - ListOptions: db.ListOptions{Page: page, PageSize: pageSize}, + Page: page, PageSize: pageSize, }) if err != nil { ctx.ServerError("GetFeeds", err) @@ -221,10 +221,8 @@ func Milestones(ctx *context.Context) { } milestones, err := db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: setting.UI.IssuePagingNum, - }, + Page: page, + PageSize: setting.UI.IssuePagingNum, RepoCond: repoCond, IsClosed: optional.Some(isShowClosed), SortType: sortType, diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index 11bb5ec3ee..1d22890f28 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -74,12 +74,10 @@ func prepareUserNotificationsData(ctx *context.Context) { statuses := []activities_model.NotificationStatus{queryStatus, activities_model.NotificationStatusPinned} nls, err := db.Find[activities_model.Notification](ctx, activities_model.FindNotificationOptions{ - ListOptions: db.ListOptions{ - PageSize: perPage, - Page: page, - }, - UserID: ctx.Doer.ID, - Status: statuses, + PageSize: perPage, + Page: page, + UserID: ctx.Doer.ID, + Status: statuses, }) if err != nil { ctx.ServerError("db.Find[activities_model.Notification]", err) @@ -374,10 +372,8 @@ func NotificationWatching(ctx *context.Context) { ctx.Data["IsPrivate"] = private repos, count, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.User.RepoPagingNum, - Page: page, - }, + PageSize: setting.UI.User.RepoPagingNum, + Page: page, Actor: ctx.Doer, Keyword: keyword, OrderBy: orderBy, diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 8f2be83f77..22bb60dc5d 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -9,6 +9,7 @@ import ( "net/http" "net/url" "time" + "uuid" "gitea.dev/models/db" org_model "gitea.dev/models/organization" @@ -35,8 +36,6 @@ import ( "gitea.dev/services/forms" packages_service "gitea.dev/services/packages" container_service "gitea.dev/services/packages/container" - - "uuid" ) const ( diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 7357bf571c..1292d31673 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -179,10 +179,8 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R OnlyPerformedBy: true, IncludeDeleted: false, Date: date, - ListOptions: db.ListOptions{ - PageSize: pagingNum, - Page: page, - }, + PageSize: pagingNum, + Page: page, }) if err != nil { ctx.ServerError("GetFeeds", err) @@ -196,10 +194,8 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R ctx.Data["PageIsProfileStarList"] = true ctx.Data["ShowRepoOwnerOnList"] = true repos, count, err = repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: pagingNum, - Page: page, - }, + PageSize: pagingNum, + Page: page, Actor: ctx.Doer, Keyword: keyword, OrderBy: orderBy, @@ -223,10 +219,8 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R total = count case "watching": repos, count, err = repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: pagingNum, - Page: page, - }, + PageSize: pagingNum, + Page: page, Actor: ctx.Doer, Keyword: keyword, OrderBy: orderBy, @@ -265,10 +259,8 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R orgs, count, err := db.FindAndCount[organization.Organization](ctx, organization.FindOrgOptions{ UserID: ctx.ContextUser.ID, IncludeVisibility: organization.DoerViewOtherVisibility(ctx.Doer, ctx.ContextUser), - ListOptions: db.ListOptions{ - Page: page, - PageSize: pagingNum, - }, + Page: page, + PageSize: pagingNum, }) if err != nil { ctx.ServerError("GetUserOrganizations", err) @@ -278,10 +270,8 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R total = count default: // default to "repositories" repos, count, err = repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: pagingNum, - Page: page, - }, + PageSize: pagingNum, + Page: page, Actor: ctx.Doer, Keyword: keyword, OwnerID: ctx.ContextUser.ID, diff --git a/routers/web/user/search.go b/routers/web/user/search.go index 467333a6b5..7997a1b398 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,7 +6,6 @@ package user import ( "net/http" - "gitea.dev/models/db" user_model "gitea.dev/models/user" "gitea.dev/modules/optional" "gitea.dev/modules/setting" @@ -21,11 +20,11 @@ func SearchCandidates(ctx *context.Context) { searchUserTypes = append(searchUserTypes, user_model.UserTypeOrganization) } users, _, err := user_model.SearchUsers(ctx, user_model.SearchUserOptions{ - Actor: ctx.Doer, - Keyword: ctx.FormTrim("q"), - Types: searchUserTypes, - IsActive: optional.Some(true), - ListOptions: db.ListOptions{PageSize: setting.UI.MembersPagingNum}, + Actor: ctx.Doer, + Keyword: ctx.FormTrim("q"), + Types: searchUserTypes, + IsActive: optional.Some(true), + PageSize: setting.UI.MembersPagingNum, }) if err != nil { ctx.ServerError("Unable to search users", err) diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 876dbb2961..18115f763e 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -195,10 +195,8 @@ func Organization(ctx *context.Context) { ctx.Data["PageIsSettingsOrganization"] = true opts := organization.FindOrgOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.Admin.UserPagingNum, - Page: ctx.FormInt("page"), - }, + PageSize: setting.UI.Admin.UserPagingNum, + Page: ctx.FormInt("page"), UserID: ctx.Doer.ID, IncludeVisibility: structs.VisibleTypePrivate, } @@ -277,12 +275,10 @@ func Repos(ctx *context.Context) { } userRepos, _, err := repo_model.GetUserRepositories(ctx, repo_model.SearchRepoOptions{ - Actor: ctxUser, - Private: true, - ListOptions: db.ListOptions{ - Page: 1, - PageSize: setting.UI.Admin.UserPagingNum, - }, + Actor: ctxUser, + Private: true, + Page: 1, + PageSize: setting.UI.Admin.UserPagingNum, LowerNames: repoNames, }) if err != nil { diff --git a/services/actions/auth.go b/services/actions/auth.go index 6a160102f1..067aaee987 100644 --- a/services/actions/auth.go +++ b/services/actions/auth.go @@ -52,15 +52,13 @@ func CreateAuthorizationToken(taskID, runID, jobID int64) (string, error) { } claims := actionsClaims{ - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(now.Add(1*time.Hour + setting.Actions.EndlessTaskTimeout)), - NotBefore: jwt.NewNumericDate(now), - }, - Scp: fmt.Sprintf("Actions.Results:%d:%d", runID, jobID), - Ac: string(ac), - TaskID: taskID, - RunID: runID, - JobID: jobID, + ExpiresAt: jwt.NewNumericDate(now.Add(1*time.Hour + setting.Actions.EndlessTaskTimeout)), + NotBefore: jwt.NewNumericDate(now), + Scp: fmt.Sprintf("Actions.Results:%d:%d", runID, jobID), + Ac: string(ac), + TaskID: taskID, + RunID: runID, + JobID: jobID, } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index 0decf7b968..0c2bd1423f 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -10,7 +10,6 @@ import ( "time" actions_model "gitea.dev/models/actions" - "gitea.dev/models/db" "gitea.dev/models/organization" perm_model "gitea.dev/models/perm" access_model "gitea.dev/models/perm/access" @@ -41,11 +40,9 @@ func startTasks(ctx context.Context) error { for page := 1; ; page++ { // Retrieve the specs for the current page specs, _, err := actions_model.FindSpecs(ctx, actions_model.FindSpecOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: pageSize, - }, - Next: now.Unix(), + Page: page, + PageSize: pageSize, + Next: now.Unix(), }) if err != nil { return fmt.Errorf("find specs: %w", err) diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index c7ca9ebfc0..61b0d7d443 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -10,6 +10,7 @@ import ( "fmt" "io" "net/http" + "uuid" "gitea.dev/models/db" repo_model "gitea.dev/models/repo" @@ -17,8 +18,6 @@ import ( "gitea.dev/modules/storage" "gitea.dev/modules/util" "gitea.dev/services/context/upload" - - "uuid" ) // NewAttachment creates a new attachment object, but do not verify. @@ -85,8 +84,7 @@ func uploadAttachment(ctx context.Context, file *UploaderFile, allowedTypes stri } attach, err := NewAttachment(ctx, attach, io.MultiReader(bytes.NewReader(buf), src), file.size) - var maxBytesError *http.MaxBytesError - if errors.As(err, &maxBytesError) { + if _, ok := errors.AsType[*http.MaxBytesError](err); ok { return nil, util.ErrorWrap(util.ErrContentTooLarge, "attachment exceeds limit %d", maxFileSize) } return attach, err diff --git a/services/auth/auth.go b/services/auth/auth.go index 97f29cdbf4..80910866ae 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -25,8 +25,7 @@ func (e ErrUserAuthMessage) Error() string { } func ErrAsUserAuthMessage(err error) (string, bool) { - var msg ErrUserAuthMessage - if errors.As(err, &msg) { + if msg, ok := errors.AsType[ErrUserAuthMessage](err); ok { return msg.Error(), true } return "", false diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index f6007616c5..1c8e0c68c6 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -7,14 +7,13 @@ package auth import ( "net/http" "strings" + "uuid" user_model "gitea.dev/models/user" "gitea.dev/modules/log" "gitea.dev/modules/optional" "gitea.dev/modules/session" "gitea.dev/modules/setting" - - "uuid" ) // Ensure the struct implements the interface. diff --git a/services/auth/source/db/assert_interface_test.go b/services/auth/source/db/assert_interface_test.go index c45bd75219..413d5d476b 100644 --- a/services/auth/source/db/assert_interface_test.go +++ b/services/auth/source/db/assert_interface_test.go @@ -17,4 +17,4 @@ type sourceInterface interface { auth_model.Config } -var _ (sourceInterface) = &db.Source{} +var _ sourceInterface = &db.Source{} diff --git a/services/auth/source/ldap/assert_interface_test.go b/services/auth/source/ldap/assert_interface_test.go index aafe51f9c6..a5e1ab6bef 100644 --- a/services/auth/source/ldap/assert_interface_test.go +++ b/services/auth/source/ldap/assert_interface_test.go @@ -22,4 +22,4 @@ type sourceInterface interface { auth_model.UseTLSer } -var _ (sourceInterface) = &ldap.Source{} +var _ sourceInterface = &ldap.Source{} diff --git a/services/auth/source/oauth2/assert_interface_test.go b/services/auth/source/oauth2/assert_interface_test.go index db2c36dde4..fd64a08c76 100644 --- a/services/auth/source/oauth2/assert_interface_test.go +++ b/services/auth/source/oauth2/assert_interface_test.go @@ -18,4 +18,4 @@ type sourceInterface interface { auth.PasswordAuthenticator } -var _ (sourceInterface) = &oauth2.Source{} +var _ sourceInterface = &oauth2.Source{} diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 676f5187b8..1a15972a68 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -8,6 +8,7 @@ import ( "encoding/gob" "net/http" "sync" + "uuid" "gitea.dev/models/auth" "gitea.dev/models/db" @@ -17,7 +18,6 @@ import ( "github.com/gorilla/sessions" "github.com/markbates/goth/gothic" - "uuid" ) var gothRWMutex = sync.RWMutex{} diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go index e9e8df02ea..63ba0b02b7 100644 --- a/services/auth/source/oauth2/providers_custom.go +++ b/services/auth/source/oauth2/providers_custom.go @@ -40,10 +40,8 @@ func (c *CustomProvider) CreateGothProvider(providerName, callbackURL string, so // NewCustomProvider is a constructor function for custom providers func NewCustomProvider(name, displayName string, customURLSetting *CustomURLSettings, newFn CustomProviderNewFn) *CustomProvider { return &CustomProvider{ - BaseProvider: BaseProvider{ - name: name, - displayName: displayName, - }, + name: name, + displayName: displayName, customURLSettings: customURLSetting, newFn: newFn, } diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go index a9052da1c5..49091e999d 100644 --- a/services/auth/source/oauth2/providers_simple.go +++ b/services/auth/source/oauth2/providers_simple.go @@ -39,12 +39,10 @@ func (c *SimpleProvider) CreateGothProvider(providerName, callbackURL string, so // NewSimpleProvider is a constructor function for simple providers func NewSimpleProvider(name, displayName string, scopes []string, newFn SimpleProviderNewFn) *SimpleProvider { return &SimpleProvider{ - BaseProvider: BaseProvider{ - name: name, - displayName: displayName, - }, - scopes: scopes, - newFn: newFn, + name: name, + displayName: displayName, + scopes: scopes, + newFn: newFn, } } diff --git a/services/auth/source/oauth2/source_sync_test.go b/services/auth/source/oauth2/source_sync_test.go index 888ca55e50..27c31f5d4f 100644 --- a/services/auth/source/oauth2/source_sync_test.go +++ b/services/auth/source/oauth2/source_sync_test.go @@ -18,14 +18,12 @@ func TestSource(t *testing.T) { source := &Source{ Provider: "fake", - ConfigBase: auth.ConfigBase{ - AuthSource: &auth.Source{ - ID: 12, - Type: auth.OAuth2, - Name: "fake", - IsActive: true, - IsSyncEnabled: true, - }, + AuthSource: &auth.Source{ + ID: 12, + Type: auth.OAuth2, + Name: "fake", + IsActive: true, + IsSyncEnabled: true, }, } diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go index de01d8b239..28a394a230 100644 --- a/services/auth/source/oauth2/store.go +++ b/services/auth/source/oauth2/store.go @@ -94,4 +94,4 @@ func (s *sizeWriter) Write(data []byte) (int, error) { return len(data), nil } -var _ (sessions.Store) = &SessionsStore{} +var _ sessions.Store = &SessionsStore{} diff --git a/services/auth/source/pam/assert_interface_test.go b/services/auth/source/pam/assert_interface_test.go index ea1b4f9d77..ee93a5bc9b 100644 --- a/services/auth/source/pam/assert_interface_test.go +++ b/services/auth/source/pam/assert_interface_test.go @@ -17,4 +17,4 @@ type sourceInterface interface { auth_model.Config } -var _ (sourceInterface) = &pam.Source{} +var _ sourceInterface = &pam.Source{} diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index c7b48612ae..ee5e3eeeb4 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -7,14 +7,13 @@ import ( "context" "fmt" "strings" + "uuid" "gitea.dev/models/auth" user_model "gitea.dev/models/user" "gitea.dev/modules/auth/pam" "gitea.dev/modules/optional" "gitea.dev/modules/setting" - - "uuid" ) // Authenticate queries if login/password is valid against the PAM, diff --git a/services/auth/source/smtp/assert_interface_test.go b/services/auth/source/smtp/assert_interface_test.go index cb9c3e48b0..fe33cf8996 100644 --- a/services/auth/source/smtp/assert_interface_test.go +++ b/services/auth/source/smtp/assert_interface_test.go @@ -20,4 +20,4 @@ type sourceInterface interface { auth_model.UseTLSer } -var _ (sourceInterface) = &smtp.Source{} +var _ sourceInterface = &smtp.Source{} diff --git a/services/auth/source/sspi/assert_interface_test.go b/services/auth/source/sspi/assert_interface_test.go index 8706158b3c..581ea1a807 100644 --- a/services/auth/source/sspi/assert_interface_test.go +++ b/services/auth/source/sspi/assert_interface_test.go @@ -15,4 +15,4 @@ type sourceInterface interface { auth.Config } -var _ (sourceInterface) = &sspi.Source{} +var _ sourceInterface = &sspi.Source{} diff --git a/services/auth/sspi.go b/services/auth/sspi.go index 3139489a33..b427daa831 100644 --- a/services/auth/sspi.go +++ b/services/auth/sspi.go @@ -9,6 +9,7 @@ import ( "net/http" "strings" "sync" + "uuid" "gitea.dev/models/auth" "gitea.dev/models/db" @@ -19,8 +20,6 @@ import ( "gitea.dev/modules/templates" "gitea.dev/services/auth/source/sspi" gitea_context "gitea.dev/services/context" - - "uuid" ) const ( diff --git a/services/convert/convert.go b/services/convert/convert.go index 3ec8f5ab7a..1db9f193cb 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -170,7 +170,7 @@ func ToBranchProtection(ctx context.Context, bp *git_model.ProtectedBranch, repo } return &api.BranchProtection{ - BranchName: branchName, + BranchName: branchName, //nolint:staticcheck // deprecated field RuleName: bp.RuleName, Priority: bp.Priority, EnablePush: bp.CanPush, diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go index 745b5ef9d6..d273f8987d 100644 --- a/services/convert/git_commit.go +++ b/services/convert/git_commit.go @@ -20,11 +20,9 @@ import ( // ToCommitUser convert a git.Signature to an api.CommitUser func ToCommitUser(sig *git.Signature) *api.CommitUser { return &api.CommitUser{ - Identity: api.Identity{ - Name: sig.Name, - Email: sig.Email, - }, - Date: sig.When.UTC().Format(time.RFC3339), + Name: sig.Name, + Email: sig.Email, + Date: sig.When.UTC().Format(time.RFC3339), } } @@ -157,18 +155,14 @@ func ToCommit(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Rep RepoCommit: &api.RepoCommit{ URL: repo.APIURL() + "/git/commits/" + url.PathEscape(commit.ID.String()), Author: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Author.Name, - Email: commit.Author.Email, - }, - Date: commit.Author.When.Format(time.RFC3339), + Name: commit.Author.Name, + Email: commit.Author.Email, + Date: commit.Author.When.Format(time.RFC3339), }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Committer.Name, - Email: commit.Committer.Email, - }, - Date: commit.Committer.When.Format(time.RFC3339), + Name: commit.Committer.Name, + Email: commit.Committer.Email, + Date: commit.Committer.When.Format(time.RFC3339), }, Message: commit.MessageUTF8(), Tree: &api.CommitMeta{ diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go index fc77e4e8f9..5273bdb559 100644 --- a/services/convert/git_commit_test.go +++ b/services/convert/git_commit_test.go @@ -21,12 +21,12 @@ func TestToCommitMeta(t *testing.T) { sha1 := git.Sha1ObjectFormat signature := &git.Signature{Name: "Test Signature", Email: "test@email.com", When: time.Unix(0, 0)} tag := &git.Tag{ - Name: "Test Tag", - ID: sha1.EmptyObjectID(), - Object: sha1.EmptyObjectID(), - Type: "Test Type", - Tagger: signature, - CommitMessage: git.CommitMessage{MessageRaw: "Test Message"}, + Name: "Test Tag", + ID: sha1.EmptyObjectID(), + Object: sha1.EmptyObjectID(), + Type: "Test Type", + Tagger: signature, + MessageRaw: "Test Message", } commitMeta := ToCommitMeta(headRepo, tag) diff --git a/services/convert/project.go b/services/convert/project.go index 2b3f934048..5886563cd2 100644 --- a/services/convert/project.go +++ b/services/convert/project.go @@ -130,9 +130,9 @@ func toProject(ctx context.Context, p *project_model.Project, doer *user_model.U Description: p.Description, OwnerID: p.OwnerID, RepoID: p.RepoID, - CreatorID: p.CreatorID, + CreatorID: p.CreatorID, //nolint:staticcheck // deprecated field State: state, - IsClosed: p.IsClosed, + IsClosed: p.IsClosed, //nolint:staticcheck // deprecated field TemplateType: projectTemplateTypeToString(p.TemplateType), CardType: projectCardTypeToString(p.CardType), Type: projectTypeToString(p.Type), diff --git a/services/convert/wiki.go b/services/convert/wiki.go index 749eb383a8..b8630dcbcf 100644 --- a/services/convert/wiki.go +++ b/services/convert/wiki.go @@ -15,18 +15,14 @@ func ToWikiCommit(commit *git.Commit) *api.WikiCommit { return &api.WikiCommit{ ID: commit.ID.String(), Author: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Author.Name, - Email: commit.Author.Email, - }, - Date: commit.Author.When.UTC().Format(time.RFC3339), + Name: commit.Author.Name, + Email: commit.Author.Email, + Date: commit.Author.When.UTC().Format(time.RFC3339), }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Committer.Name, - Email: commit.Committer.Email, - }, - Date: commit.Committer.When.UTC().Format(time.RFC3339), + Name: commit.Committer.Name, + Email: commit.Committer.Email, + Date: commit.Committer.When.UTC().Format(time.RFC3339), }, Message: commit.MessageUTF8(), } diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 06be3bdaf8..de6919ec1f 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -29,13 +29,11 @@ func registerUpdateMirrorTask() { } RegisterTaskFatal("update_mirrors", &UpdateMirrorTaskConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: false, - Schedule: "@every 10m", - }, - PullLimit: 50, - PushLimit: 50, + Enabled: true, + RunAtStart: false, + Schedule: "@every 10m", + PullLimit: 50, + PushLimit: 50, }, func(ctx context.Context, _ *user_model.User, cfg *UpdateMirrorTaskConfig) error { return mirror_service.Update(ctx, cfg.PullLimit, cfg.PushLimit) }) @@ -48,13 +46,11 @@ func registerRepoHealthCheck() { Args []string `delim:" "` } RegisterTaskFatal("repo_health_check", &RepoHealthCheckConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: false, - Schedule: "@midnight", - }, - Timeout: time.Duration(setting.Git.Timeout.GC) * time.Second, - Args: []string{}, + Enabled: true, + RunAtStart: false, + Schedule: "@midnight", + Timeout: time.Duration(setting.Git.Timeout.GC) * time.Second, + Args: []string{}, }, func(ctx context.Context, _ *user_model.User, config *RepoHealthCheckConfig) error { // the git args are set by config, they can be safe to be trusted return repo_service.GitFsckRepos(ctx, config.Timeout, gitcmd.ToTrustedCmdArgs(config.Args)) @@ -73,12 +69,10 @@ func registerCheckRepoStats() { func registerArchiveCleanup() { RegisterTaskFatal("archive_cleanup", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: true, - Schedule: "@midnight", - }, - OlderThan: 24 * time.Hour, + Enabled: true, + RunAtStart: true, + Schedule: "@midnight", + OlderThan: 24 * time.Hour, }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { return archiver_service.DeleteOldRepositoryArchives(ctx, config.OlderThan) }) @@ -86,11 +80,9 @@ func registerArchiveCleanup() { func registerSyncExternalUsers() { RegisterTaskFatal("sync_external_users", &UpdateExistingConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: false, - Schedule: "@midnight", - }, + Enabled: true, + RunAtStart: false, + Schedule: "@midnight", UpdateExisting: true, }, func(ctx context.Context, _ *user_model.User, config *UpdateExistingConfig) error { return auth.SyncExternalUsers(ctx, config.UpdateExisting) @@ -99,12 +91,10 @@ func registerSyncExternalUsers() { func registerDeletedBranchesCleanup() { RegisterTaskFatal("deleted_branches_cleanup", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: true, - Schedule: "@midnight", - }, - OlderThan: 24 * time.Hour, + Enabled: true, + RunAtStart: true, + Schedule: "@midnight", + OlderThan: 24 * time.Hour, }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { git_model.RemoveOldDeletedBranches(ctx, config.OlderThan) return nil @@ -123,11 +113,9 @@ func registerUpdateMigrationPosterID() { func registerCleanupHookTaskTable() { RegisterTaskFatal("cleanup_hook_task_table", &CleanupHookTaskConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: false, - Schedule: "@midnight", - }, + Enabled: true, + RunAtStart: false, + Schedule: "@midnight", CleanupType: "OlderThan", OlderThan: 168 * time.Hour, NumberToKeep: 10, @@ -138,12 +126,10 @@ func registerCleanupHookTaskTable() { func registerCleanupPackages() { RegisterTaskFatal("cleanup_packages", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: true, - Schedule: "@midnight", - }, - OlderThan: 24 * time.Hour, + Enabled: true, + RunAtStart: true, + Schedule: "@midnight", + OlderThan: 24 * time.Hour, }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { return packages_cleanup_service.CleanupTask(ctx, config.OlderThan) }) diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index 842d2621d3..5ddf1050d3 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -22,12 +22,10 @@ import ( func registerDeleteInactiveUsers() { RegisterTaskFatal("delete_inactive_accounts", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@annually", - }, - OlderThan: time.Minute * time.Duration(setting.Service.ActiveCodeLives), + Enabled: false, + RunAtStart: false, + Schedule: "@annually", + OlderThan: time.Minute * time.Duration(setting.Service.ActiveCodeLives), }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { return user_service.DeleteInactiveUsers(ctx, config.OlderThan) }) @@ -50,13 +48,11 @@ func registerGarbageCollectRepositories() { Args []string `delim:" "` } RegisterTaskFatal("git_gc_repos", &RepoHealthCheckConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 72h", - }, - Timeout: time.Duration(setting.Git.Timeout.GC) * time.Second, - Args: setting.Git.GCArgs, + Enabled: false, + RunAtStart: false, + Schedule: "@every 72h", + Timeout: time.Duration(setting.Git.Timeout.GC) * time.Second, + Args: setting.Git.GCArgs, }, func(ctx context.Context, _ *user_model.User, config *RepoHealthCheckConfig) error { // the git args are set by config, they can be safe to be trusted return repo_service.GitGcRepos(ctx, config.Timeout, gitcmd.ToTrustedCmdArgs(config.Args)) @@ -125,12 +121,10 @@ func registerRemoveRandomAvatars() { func registerDeleteOldActions() { RegisterTaskFatal("delete_old_actions", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 168h", - }, - OlderThan: 365 * 24 * time.Hour, + Enabled: false, + RunAtStart: false, + Schedule: "@every 168h", + OlderThan: 365 * 24 * time.Hour, }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { return activities_model.DeleteOldActions(ctx, config.OlderThan) }) @@ -142,11 +136,9 @@ func registerUpdateGiteaChecker() { HTTPEndpoint string } RegisterTaskFatal("update_checker", &UpdateCheckerConfig{ - BaseConfig: BaseConfig{ - Enabled: true, - RunAtStart: false, - Schedule: "@every 168h", - }, + Enabled: true, + RunAtStart: false, + Schedule: "@every 168h", HTTPEndpoint: "https://dl.gitea.com/gitea/version.json", }, func(ctx context.Context, _ *user_model.User, config *UpdateCheckerConfig) error { return updatechecker.GiteaUpdateChecker(config.HTTPEndpoint) @@ -155,12 +147,10 @@ func registerUpdateGiteaChecker() { func registerDeleteOldSystemNotices() { RegisterTaskFatal("delete_old_system_notices", &OlderThanConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 168h", - }, - OlderThan: 365 * 24 * time.Hour, + Enabled: false, + RunAtStart: false, + Schedule: "@every 168h", + OlderThan: 365 * 24 * time.Hour, }, func(ctx context.Context, _ *user_model.User, config *OlderThanConfig) error { return system.DeleteOldSystemNotices(ctx, config.OlderThan) }) @@ -180,11 +170,9 @@ func registerGCLFS() { } RegisterTaskFatal("gc_lfs", &GCLFSConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 24h", - }, + Enabled: false, + RunAtStart: false, + Schedule: "@every 24h", // Only attempt to garbage collect lfs meta objects older than a week as the order of git lfs upload // and git object upload is not necessarily guaranteed. It's possible to imagine a situation whereby // an LFS object is uploaded but the git branch is not uploaded immediately, or there are some rapid diff --git a/services/cron/tasks_extended_test.go b/services/cron/tasks_extended_test.go index 7df8eb056b..ff484a1c0c 100644 --- a/services/cron/tasks_extended_test.go +++ b/services/cron/tasks_extended_test.go @@ -28,11 +28,9 @@ PROPORTION_TO_CHECK_PER_REPO = 0.1 defer test.MockVariableValue(&setting.CfgProvider, cfg)() config := &GCLFSConfig{ - BaseConfig: BaseConfig{ - Enabled: false, - RunAtStart: false, - Schedule: "@every 24h", - }, + Enabled: false, + RunAtStart: false, + Schedule: "@every 24h", OlderThan: 24 * time.Hour * 7, LastUpdatedMoreThanAgo: 24 * time.Hour * 3, NumberToCheckPerRepo: 100, diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 04fdf46a5e..672996f6d5 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1198,7 +1198,7 @@ func parseHunks(ctx context.Context, curFile *DiffFile, maxLines, maxLineCharact } else if curFileLFSPrefix && strings.HasPrefix(line[1:], lfs.MetaFileOidPrefix) { oid := strings.TrimPrefix(line[1:], lfs.MetaFileOidPrefix) if len(oid) == 64 { - m := &git_model.LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}} + m := &git_model.LFSMetaObject{Oid: oid} count, err := db.CountByBean(ctx, m) if err == nil && count > 0 { diff --git a/services/lfs/server.go b/services/lfs/server.go index 9338740136..e14e2e43d1 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -64,13 +64,11 @@ type AuthTokenOptions struct { func GetLFSAuthTokenWithBearer(opts AuthTokenOptions) (string, error) { now := time.Now() claims := Claims{ - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(now.Add(setting.LFS.HTTPAuthExpiry)), - NotBefore: jwt.NewNumericDate(now), - }, - RepoID: opts.RepoID, - Op: opts.Op, - UserID: opts.UserID, + ExpiresAt: jwt.NewNumericDate(now.Add(setting.LFS.HTTPAuthExpiry)), + NotBefore: jwt.NewNumericDate(now), + RepoID: opts.RepoID, + Op: opts.Op, + UserID: opts.UserID, } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 2925328307..4bf3a49b96 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -576,8 +576,8 @@ func TestMailPullRequestPush(t *testing.T) { SignCommit: &asymkey.SignCommit{ UserCommit: &gituser.UserCommit{ GitCommit: &git.Commit{ - CommitMessage: git.CommitMessage{MessageRaw: "test commit msg"}, - ID: git.Sha1ObjectFormat.EmptyObjectID(), + MessageRaw: "test commit msg", + ID: git.Sha1ObjectFormat.EmptyObjectID(), }, }, }, diff --git a/services/migrations/dump.go b/services/migrations/dump.go index e979bf38bb..83c1b05f31 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -14,6 +14,7 @@ import ( "strconv" "strings" "time" + "uuid" user_model "gitea.dev/models/user" "gitea.dev/modules/git" @@ -26,7 +27,6 @@ import ( "gitea.dev/modules/structs" "go.yaml.in/yaml/v4" - "uuid" ) var _ base.Uploader = &RepositoryDumper{} diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index 6ec70e2bbb..a1d18fa1de 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -176,11 +176,9 @@ func (g *GiteaDownloader) GetMilestones(ctx context.Context) ([]*base.Milestone, } ms, _, err := g.client.Repositories.ListMilestones(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListMilestoneOption{ - ListOptions: gitea_sdk.ListOptions{ - PageSize: g.maxPerPage, - Page: i, - }, - State: gitea_sdk.StateAll, + PageSize: g.maxPerPage, + Page: i, + State: gitea_sdk.StateAll, }) if err != nil { return nil, err @@ -240,10 +238,10 @@ func (g *GiteaDownloader) GetLabels(ctx context.Context) ([]*base.Label, error) default: } - ls, _, err := g.client.Repositories.ListRepoLabels(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListLabelsOptions{ListOptions: gitea_sdk.ListOptions{ + ls, _, err := g.client.Repositories.ListRepoLabels(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListLabelsOptions{ PageSize: g.maxPerPage, Page: i, - }}) + }) if err != nil { return nil, err } @@ -328,10 +326,10 @@ func (g *GiteaDownloader) GetReleases(ctx context.Context) ([]*base.Release, err default: } - rl, _, err := g.client.Releases.ListReleases(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListReleasesOptions{ListOptions: gitea_sdk.ListOptions{ + rl, _, err := g.client.Releases.ListReleases(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListReleasesOptions{ PageSize: g.maxPerPage, Page: i, - }}) + }) if err != nil { return nil, err } @@ -362,10 +360,10 @@ func (g *GiteaDownloader) getIssueReactions(ctx context.Context, index int64) ([ default: } - reactions, _, err := g.client.Issues.ListIssueReactions(g.ctx, g.repoOwner, g.repoName, index, gitea_sdk.ListIssueReactionsOptions{ListOptions: gitea_sdk.ListOptions{ + reactions, _, err := g.client.Issues.ListIssueReactions(g.ctx, g.repoOwner, g.repoName, index, gitea_sdk.ListIssueReactionsOptions{ PageSize: g.maxPerPage, Page: i, - }}) + }) if err != nil { return nil, err } @@ -414,9 +412,9 @@ func (g *GiteaDownloader) GetIssues(ctx context.Context, page, perPage int) ([]* allIssues := make([]*base.Issue, 0, perPage) issues, _, err := g.client.Issues.ListRepoIssues(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListIssueOption{ - ListOptions: gitea_sdk.ListOptions{Page: page, PageSize: perPage}, - State: gitea_sdk.StateAll, - Type: gitea_sdk.IssueTypeIssue, + Page: page, PageSize: perPage, + State: gitea_sdk.StateAll, + Type: gitea_sdk.IssueTypeIssue, }) if err != nil { return nil, false, fmt.Errorf("error while listing issues: %w", err) @@ -481,10 +479,10 @@ func (g *GiteaDownloader) GetComments(ctx context.Context, commentable base.Comm default: } - comments, _, err := g.client.Issues.ListIssueComments(g.ctx, g.repoOwner, g.repoName, commentable.GetForeignIndex(), gitea_sdk.ListIssueCommentOptions{ListOptions: gitea_sdk.ListOptions{ + comments, _, err := g.client.Issues.ListIssueComments(g.ctx, g.repoOwner, g.repoName, commentable.GetForeignIndex(), gitea_sdk.ListIssueCommentOptions{ PageSize: g.maxPerPage, Page: i, - }}) + }) if err != nil { return nil, false, fmt.Errorf("error while listing comments for issue #%d. Error: %w", commentable.GetForeignIndex(), err) } @@ -523,11 +521,9 @@ func (g *GiteaDownloader) GetPullRequests(ctx context.Context, page, perPage int allPRs := make([]*base.PullRequest, 0, perPage) prs, _, err := g.client.PullRequests.ListRepoPullRequests(g.ctx, g.repoOwner, g.repoName, gitea_sdk.ListPullRequestsOptions{ - ListOptions: gitea_sdk.ListOptions{ - Page: page, - PageSize: perPage, - }, - State: gitea_sdk.StateAll, + Page: page, + PageSize: perPage, + State: gitea_sdk.StateAll, }) if err != nil { return nil, false, fmt.Errorf("error while listing pull requests (page: %d, pagesize: %d). Error: %w", page, perPage, err) @@ -652,10 +648,10 @@ func (g *GiteaDownloader) GetReviews(ctx context.Context, reviewable base.Review default: } - prl, _, err := g.client.PullRequests.ListPullReviews(g.ctx, g.repoOwner, g.repoName, reviewable.GetForeignIndex(), gitea_sdk.ListPullReviewsOptions{ListOptions: gitea_sdk.ListOptions{ + prl, _, err := g.client.PullRequests.ListPullReviews(g.ctx, g.repoOwner, g.repoName, reviewable.GetForeignIndex(), gitea_sdk.ListPullReviewsOptions{ Page: i, PageSize: g.maxPerPage, - }}) + }) if err != nil { return nil, err } diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 25440fd4fe..eb6aad9630 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -12,6 +12,7 @@ import ( "strconv" "strings" "time" + "uuid" "gitea.dev/models/db" issues_model "gitea.dev/models/issues" @@ -32,8 +33,6 @@ import ( "gitea.dev/modules/util" "gitea.dev/services/pull" repo_service "gitea.dev/services/repository" - - "uuid" ) var _ base.Uploader = &GiteaLocalUploader{} diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index ce6b177a26..abe7a28a79 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -80,10 +80,8 @@ func TestGiteaUploadRepo(t *testing.T) { assert.Len(t, labels, 12) releases, err := db.Find[repo_model.Release](t.Context(), repo_model.FindReleasesOptions{ - ListOptions: db.ListOptions{ - PageSize: 10, - Page: 0, - }, + PageSize: 10, + Page: 0, IncludeTags: true, RepoID: repo.ID, }) @@ -91,10 +89,8 @@ func TestGiteaUploadRepo(t *testing.T) { assert.Len(t, releases, 8) releases, err = db.Find[repo_model.Release](t.Context(), repo_model.FindReleasesOptions{ - ListOptions: db.ListOptions{ - PageSize: 10, - Page: 0, - }, + PageSize: 10, + Page: 0, IncludeTags: false, RepoID: repo.ID, }) diff --git a/services/migrations/github.go b/services/migrations/github.go index 7c05e424b0..aa6f2ca7df 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -244,11 +244,9 @@ func (g *GithubDownloaderV3) GetMilestones(ctx context.Context) ([]*base.Milesto g.waitAndPickClient(ctx) ms, resp, err := g.getClient().Issues.ListMilestones(ctx, g.repoOwner, g.repoName, &github.MilestoneListOptions{ - State: "all", - ListOptions: github.ListOptions{ - Page: i, - PerPage: perPage, - }, + State: "all", + Page: i, + PerPage: perPage, }) if err != nil { return nil, err @@ -459,10 +457,8 @@ func (g *GithubDownloaderV3) GetIssues(ctx context.Context, page, perPage int) ( for i := 1; ; i++ { g.waitAndPickClient(ctx) res, resp, err := g.getClient().Reactions.ListIssueReactions(ctx, g.repoOwner, g.repoName, issue.GetNumber(), &github.ListReactionOptions{ - ListOptions: github.ListOptions{ - Page: i, - PerPage: perPage, - }, + Page: i, + PerPage: perPage, }) if err != nil { return nil, false, err @@ -529,9 +525,7 @@ func (g *GithubDownloaderV3) getComments(ctx context.Context, commentable base.C opt := &github.IssueListCommentsOptions{ Sort: &created, Direction: &asc, - ListOptions: github.ListOptions{ - PerPage: g.maxPerPage, - }, + PerPage: g.maxPerPage, } for { g.waitAndPickClient(ctx) @@ -547,10 +541,8 @@ func (g *GithubDownloaderV3) getComments(ctx context.Context, commentable base.C for i := 1; ; i++ { g.waitAndPickClient(ctx) res, resp, err := g.getClient().Reactions.ListIssueCommentReactions(ctx, g.repoOwner, g.repoName, comment.GetID(), &github.ListReactionOptions{ - ListOptions: github.ListOptions{ - Page: i, - PerPage: g.maxPerPage, - }, + Page: i, + PerPage: g.maxPerPage, }) if err != nil { return nil, err @@ -602,10 +594,8 @@ func (g *GithubDownloaderV3) GetAllComments(ctx context.Context, page, perPage i opt := &github.IssueListCommentsOptions{ Sort: &created, Direction: &asc, - ListOptions: github.ListOptions{ - Page: page, - PerPage: perPage, - }, + Page: page, + PerPage: perPage, } g.waitAndPickClient(ctx) @@ -624,10 +614,8 @@ func (g *GithubDownloaderV3) GetAllComments(ctx context.Context, page, perPage i for i := 1; ; i++ { g.waitAndPickClient(ctx) res, resp, err := g.getClient().Reactions.ListIssueCommentReactions(ctx, g.repoOwner, g.repoName, comment.GetID(), &github.ListReactionOptions{ - ListOptions: github.ListOptions{ - Page: i, - PerPage: g.maxPerPage, - }, + Page: i, + PerPage: g.maxPerPage, }) if err != nil { return nil, false, err @@ -672,10 +660,8 @@ func (g *GithubDownloaderV3) GetPullRequests(ctx context.Context, page, perPage Sort: "created", Direction: "asc", State: "all", - ListOptions: github.ListOptions{ - PerPage: perPage, - Page: page, - }, + PerPage: perPage, + Page: page, } allPRs := make([]*base.PullRequest, 0, perPage) g.waitAndPickClient(ctx) @@ -697,10 +683,8 @@ func (g *GithubDownloaderV3) GetPullRequests(ctx context.Context, page, perPage for i := 1; ; i++ { g.waitAndPickClient(ctx) res, resp, err := g.getClient().Reactions.ListIssueReactions(ctx, g.repoOwner, g.repoName, pr.GetNumber(), &github.ListReactionOptions{ - ListOptions: github.ListOptions{ - Page: i, - PerPage: perPage, - }, + Page: i, + PerPage: perPage, }) if err != nil { return nil, false, err @@ -786,10 +770,8 @@ func (g *GithubDownloaderV3) convertGithubReviewComments(ctx context.Context, cs for i := 1; ; i++ { g.waitAndPickClient(ctx) res, resp, err := g.getClient().Reactions.ListPullRequestCommentReactions(ctx, g.repoOwner, g.repoName, c.GetID(), &github.ListReactionOptions{ - ListOptions: github.ListOptions{ - Page: i, - PerPage: g.maxPerPage, - }, + Page: i, + PerPage: g.maxPerPage, }) if err != nil { return nil, err diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index 585b4d8ed8..4bdfe0c7ec 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -210,11 +210,9 @@ func (g *GitlabDownloader) GetMilestones(ctx context.Context) ([]*base.Milestone milestones := make([]*base.Milestone, 0, perPage) for i := 1; ; i++ { ms, _, err := g.client.Milestones.ListMilestones(g.repoID, &gitlab.ListMilestonesOptions{ - State: &state, - ListOptions: gitlab.ListOptions{ - Page: int64(i), - PerPage: int64(perPage), - }, + State: &state, + Page: int64(i), + PerPage: int64(perPage), }, nil, gitlab.WithContext(ctx)) if err != nil { return nil, err @@ -280,10 +278,10 @@ func (g *GitlabDownloader) GetLabels(ctx context.Context) ([]*base.Label, error) perPage := g.maxPerPage labels := make([]*base.Label, 0, perPage) for i := 1; ; i++ { - ls, _, err := g.client.Labels.ListLabels(g.repoID, &gitlab.ListLabelsOptions{ListOptions: gitlab.ListOptions{ + ls, _, err := g.client.Labels.ListLabels(g.repoID, &gitlab.ListLabelsOptions{ Page: int64(i), PerPage: int64(perPage), - }}, nil, gitlab.WithContext(ctx)) + }, nil, gitlab.WithContext(ctx)) if err != nil { return nil, err } @@ -358,10 +356,8 @@ func (g *GitlabDownloader) GetReleases(ctx context.Context) ([]*base.Release, er releases := make([]*base.Release, 0, perPage) for i := 1; ; i++ { ls, _, err := g.client.Releases.ListReleases(g.repoID, &gitlab.ListReleasesOptions{ - ListOptions: gitlab.ListOptions{ - Page: int64(i), - PerPage: int64(perPage), - }, + Page: int64(i), + PerPage: int64(perPage), }, nil, gitlab.WithContext(ctx)) if err != nil { return nil, err @@ -393,12 +389,10 @@ func (g *GitlabDownloader) GetIssues(ctx context.Context, page, perPage int) ([] } opt := &gitlab.ListProjectIssuesOptions{ - State: &state, - Sort: &sort, - ListOptions: gitlab.ListOptions{ - PerPage: int64(perPage), - Page: int64(page), - }, + State: &state, + Sort: &sort, + PerPage: int64(perPage), + Page: int64(page), } allIssues := make([]*base.Issue, 0, perPage) @@ -423,7 +417,7 @@ func (g *GitlabDownloader) GetIssues(ctx context.Context, page, perPage int) ([] var reactions []*gitlab.AwardEmoji awardPage := 1 for { - awards, _, err := g.client.AwardEmoji.ListIssueAwardEmoji(g.repoID, issue.IID, &gitlab.ListAwardEmojiOptions{ListOptions: gitlab.ListOptions{Page: int64(awardPage), PerPage: int64(perPage)}}, gitlab.WithContext(ctx)) + awards, _, err := g.client.AwardEmoji.ListIssueAwardEmoji(g.repoID, issue.IID, &gitlab.ListAwardEmojiOptions{Page: int64(awardPage), PerPage: int64(perPage)}, gitlab.WithContext(ctx)) if err != nil { return nil, false, fmt.Errorf("error while listing issue awards: %w", err) } @@ -480,17 +474,13 @@ func (g *GitlabDownloader) GetComments(ctx context.Context, commentable base.Com var err error if !context.IsMergeRequest { comments, resp, err = g.client.Discussions.ListIssueDiscussions(g.repoID, commentable.GetForeignIndex(), &gitlab.ListIssueDiscussionsOptions{ - ListOptions: gitlab.ListOptions{ - Page: page, - PerPage: int64(g.maxPerPage), - }, + Page: page, + PerPage: int64(g.maxPerPage), }, nil, gitlab.WithContext(ctx)) } else { comments, resp, err = g.client.Discussions.ListMergeRequestDiscussions(g.repoID, commentable.GetForeignIndex(), &gitlab.ListMergeRequestDiscussionsOptions{ - ListOptions: gitlab.ListOptions{ - Page: page, - PerPage: int64(g.maxPerPage), - }, + Page: page, + PerPage: int64(g.maxPerPage), }, nil, gitlab.WithContext(ctx)) } @@ -515,17 +505,13 @@ func (g *GitlabDownloader) GetComments(ctx context.Context, commentable base.Com var err error if context.IsMergeRequest { stateEvents, resp, err = g.client.ResourceStateEvents.ListMergeStateEvents(g.repoID, commentable.GetForeignIndex(), &gitlab.ListStateEventsOptions{ - ListOptions: gitlab.ListOptions{ - Page: page, - PerPage: int64(g.maxPerPage), - }, + Page: page, + PerPage: int64(g.maxPerPage), }, nil, gitlab.WithContext(ctx)) } else { stateEvents, resp, err = g.client.ResourceStateEvents.ListIssueStateEvents(g.repoID, commentable.GetForeignIndex(), &gitlab.ListStateEventsOptions{ - ListOptions: gitlab.ListOptions{ - Page: page, - PerPage: int64(g.maxPerPage), - }, + Page: page, + PerPage: int64(g.maxPerPage), }, nil, gitlab.WithContext(ctx)) } if err != nil { @@ -606,11 +592,9 @@ func (g *GitlabDownloader) GetPullRequests(ctx context.Context, page, perPage in view := "simple" opt := &gitlab.ListProjectMergeRequestsOptions{ - ListOptions: gitlab.ListOptions{ - PerPage: int64(perPage), - Page: int64(page), - }, - View: &view, + PerPage: int64(perPage), + Page: int64(page), + View: &view, } allPRs := make([]*base.PullRequest, 0, perPage) @@ -668,7 +652,7 @@ func (g *GitlabDownloader) GetPullRequests(ctx context.Context, page, perPage in var reactions []*gitlab.AwardEmoji awardPage := 1 for { - awards, _, err := g.client.AwardEmoji.ListMergeRequestAwardEmoji(g.repoID, pr.IID, &gitlab.ListAwardEmojiOptions{ListOptions: gitlab.ListOptions{Page: int64(awardPage), PerPage: int64(perPage)}}, gitlab.WithContext(ctx)) + awards, _, err := g.client.AwardEmoji.ListMergeRequestAwardEmoji(g.repoID, pr.IID, &gitlab.ListAwardEmojiOptions{Page: int64(awardPage), PerPage: int64(perPage)}, gitlab.WithContext(ctx)) if err != nil { return nil, false, fmt.Errorf("error while listing merge requests awards: %w", err) } diff --git a/services/migrations/update.go b/services/migrations/update.go index b7ecb1e258..7c4c89a45e 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -45,10 +45,8 @@ func updateMigrationPosterIDByGitService(ctx context.Context, tp structs.GitServ } users, err := db.Find[user_model.ExternalLoginUser](ctx, user_model.FindExternalUserOptions{ - ListOptions: db.ListOptions{ - PageSize: batchSize, - Page: page, - }, + PageSize: batchSize, + Page: page, Provider: provider, OrderBy: "login_source_id ASC, external_id ASC", }) diff --git a/services/oauth2_provider/access_token.go b/services/oauth2_provider/access_token.go index 7dbd90749c..835170318a 100644 --- a/services/oauth2_provider/access_token.go +++ b/services/oauth2_provider/access_token.go @@ -138,11 +138,9 @@ func NewAccessTokenResponse(ctx context.Context, grant *auth.OAuth2Grant, server // generate access token to access the API expirationDate := timeutil.TimeStampNow().Add(setting.OAuth2.AccessTokenExpirationTime) accessToken := &Token{ - GrantID: grant.ID, - Kind: KindAccessToken, - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(expirationDate.AsTime()), - }, + GrantID: grant.ID, + Kind: KindAccessToken, + ExpiresAt: jwt.NewNumericDate(expirationDate.AsTime()), } signedAccessToken, err := accessToken.SignToken(serverKey) if err != nil { @@ -155,12 +153,10 @@ func NewAccessTokenResponse(ctx context.Context, grant *auth.OAuth2Grant, server // generate refresh token to request an access token after it expired later refreshExpirationDate := timeutil.TimeStampNow().Add(setting.OAuth2.RefreshTokenExpirationTime * 60 * 60).AsTime() refreshToken := &Token{ - GrantID: grant.ID, - Counter: grant.Counter, - Kind: KindRefreshToken, - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(refreshExpirationDate), - }, + GrantID: grant.ID, + Counter: grant.Counter, + Kind: KindRefreshToken, + ExpiresAt: jwt.NewNumericDate(refreshExpirationDate), } signedRefreshToken, err := refreshToken.SignToken(serverKey) if err != nil { diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go index 146e9e4a02..b0118ea8f7 100644 --- a/services/packages/alpine/repository.go +++ b/services/packages/alpine/repository.go @@ -333,10 +333,8 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package ctx, repoVersion, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: IndexArchiveFilename, - CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, architecture), - }, + Filename: IndexArchiveFilename, + CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, architecture), Creator: user_model.NewGhostUser(), Data: signedIndexContent, IsLead: false, diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 1943c5f21f..c52d49354c 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -328,10 +328,8 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package ctx, repoVersion, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: IndexArchiveFilename, - CompositeKey: fmt.Sprintf("%s|%s", repository, architecture), - }, + Filename: IndexArchiveFilename, + CompositeKey: fmt.Sprintf("%s|%s", repository, architecture), Creator: user_model.NewGhostUser(), Data: indexContent, IsLead: false, diff --git a/services/packages/auth.go b/services/packages/auth.go index d0099ffb73..29052d5f7d 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -33,15 +33,11 @@ func CreateAuthorizationToken(u *user_model.User, packageScope auth_model.Access actionsUserTaskID, _ := user_model.GetActionsUserTaskID(u) claims := packageClaims{ - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(now.Add(24 * time.Hour)), - NotBefore: jwt.NewNumericDate(now), - }, - PackageMeta: PackageMeta{ - UserID: u.ID, - Scope: packageScope, - ActionsUserTaskID: actionsUserTaskID, - }, + ExpiresAt: jwt.NewNumericDate(now.Add(24 * time.Hour)), + NotBefore: jwt.NewNumericDate(now), + UserID: u.ID, + Scope: packageScope, + ActionsUserTaskID: actionsUserTaskID, } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index 7073d44e3e..2701c1683e 100644 --- a/services/packages/debian/repository.go +++ b/services/packages/debian/repository.go @@ -248,10 +248,8 @@ func buildPackagesIndices(ctx context.Context, ownerID int64, repoVersion *packa ctx, repoVersion, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: file.Name, - CompositeKey: fmt.Sprintf("%s|%s|%s", distribution, component, architecture), - }, + Filename: file.Name, + CompositeKey: fmt.Sprintf("%s|%s|%s", distribution, component, architecture), Creator: user_model.NewGhostUser(), Data: file.Data, IsLead: false, @@ -400,10 +398,8 @@ func buildReleaseFiles(ctx context.Context, ownerID int64, repoVersion *packages ctx, repoVersion, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: file.Name, - CompositeKey: distribution, - }, + Filename: file.Name, + CompositeKey: distribution, Creator: user_model.NewGhostUser(), Data: file.Data, IsLead: false, diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 5ea08bf063..654aba7fdf 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -317,10 +317,8 @@ func buildRepomd(ctx context.Context, pv *packages_model.PackageVersion, ownerID ctx, pv, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: file.Name, - CompositeKey: group, - }, + Filename: file.Name, + CompositeKey: group, Creator: user_model.NewGhostUser(), Data: file.Data, IsLead: false, @@ -700,10 +698,8 @@ func addDataAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, ctx, pv, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{ - Filename: filename, - CompositeKey: group, - }, + Filename: filename, + CompositeKey: group, Creator: user_model.NewGhostUser(), Data: content, IsLead: false, diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index f2a23133b6..de8df19407 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -21,14 +21,14 @@ import ( // TODO TestPullRequest_PushToBaseRepo func TestPullRequest_FormatSquashMergeCommitMessages(t *testing.T) { - oldest := &git.Commit{CommitMessage: git.CommitMessage{MessageRaw: "commit msg 1"}} - newest := &git.Commit{CommitMessage: git.CommitMessage{MessageRaw: "commit msg 2\n\nCommit description."}} + oldest := &git.Commit{MessageRaw: "commit msg 1"} + newest := &git.Commit{MessageRaw: "commit msg 2\n\nCommit description."} defer test.MockVariableValue(&setting.Repository.PullRequest.DefaultMergeMessageSize, 0)() assert.Equal(t, "* commit msg 1\n\n* commit msg 2\n\nCommit description.\n\n", formatSquashMergeCommitMessages([]*git.Commit{newest, oldest})) - utf8Msg := &git.Commit{CommitMessage: git.CommitMessage{MessageRaw: "🌞"}} + utf8Msg := &git.Commit{MessageRaw: "🌞"} setting.Repository.PullRequest.DefaultMergeMessageSize = 3 assert.Equal(t, "* ...\n\n", formatSquashMergeCommitMessages([]*git.Commit{utf8Msg})) setting.Repository.PullRequest.DefaultMergeMessageSize = 4 diff --git a/services/pull/review.go b/services/pull/review.go index e07e896034..52fb1af649 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -229,10 +229,8 @@ func createCodeComment(ctx context.Context, doer *user_model.User, repo *repo_mo Line: line, TreePath: treePath, Type: issues_model.CommentTypeCode, - ListOptions: db.ListOptions{ - PageSize: 1, - Page: 1, - }, + PageSize: 1, + Page: 1, }) if err == nil && len(first) > 0 { commitID = first[0].CommitSHA diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 2cf964f9ae..084f961f9f 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -265,12 +265,10 @@ func checkUnadoptedRepositories(ctx context.Context, userName string, repoNamesT return err } repos, _, err := repo_model.GetUserRepositories(ctx, repo_model.SearchRepoOptions{ - Actor: ctxUser, - Private: true, - ListOptions: db.ListOptions{ - Page: 1, - PageSize: len(repoNamesToCheck), - }, LowerNames: repoNamesToCheck, + Actor: ctxUser, + Private: true, + Page: 1, + PageSize: len(repoNamesToCheck), LowerNames: repoNamesToCheck, }) if err != nil { return err diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index 2a0a4b3d70..102756cd6a 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -318,10 +318,8 @@ func DeleteOldRepositoryArchives(ctx context.Context, olderThan time.Duration) e for { archivers, err := db.Find[repo_model.RepoArchiver](ctx, repo_model.FindRepoArchiversOption{ - ListOptions: db.ListOptions{ - PageSize: 100, - Page: 1, - }, + PageSize: 100, + Page: 1, OlderThan: olderThan, }) if err != nil { diff --git a/services/repository/branch.go b/services/repository/branch.go index 5f5fa885f9..69585e3958 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -65,12 +65,10 @@ func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git } branchOpts := git_model.FindBranchOptions{ - RepoID: repo.ID, - IsDeletedBranch: isDeletedBranch, - ListOptions: db.ListOptions{ - Page: page, - PageSize: pageSize, - }, + RepoID: repo.ID, + IsDeletedBranch: isDeletedBranch, + Page: page, + PageSize: pageSize, Keyword: keyword, ExcludeBranchNames: []string{repo.DefaultBranch}, } diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go index 6211d53fee..81f0f85b0f 100644 --- a/services/repository/contributors_graph.go +++ b/services/repository/contributors_graph.go @@ -167,11 +167,9 @@ func getExtendedCommitStats(ctx context.Context, repo *git.Repository, revision res := &ExtendedCommitStats{ Author: &api.CommitUser{ - Identity: api.Identity{ - Name: authorName, - Email: authorEmail, - }, - Date: date, + Name: authorName, + Email: authorEmail, + Date: date, }, Stats: &commitStats, } diff --git a/services/repository/delete.go b/services/repository/delete.go index 38368fa2f4..db4146227e 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -25,7 +25,6 @@ import ( actions_module "gitea.dev/modules/actions" "gitea.dev/modules/git" "gitea.dev/modules/graceful" - "gitea.dev/modules/lfs" "gitea.dev/modules/log" "gitea.dev/modules/storage" actions_service "gitea.dev/services/actions" @@ -241,7 +240,7 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams lfsPaths := make([]string, 0, len(lfsObjects)) for _, v := range lfsObjects { - count, err := db.CountByBean(ctx, &git_model.LFSMetaObject{Pointer: lfs.Pointer{Oid: v.Oid}}) + count, err := db.CountByBean(ctx, &git_model.LFSMetaObject{Oid: v.Oid}) if err != nil { return err } @@ -389,13 +388,11 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams func DeleteOwnerRepositoriesDirectly(ctx context.Context, owner *user_model.User) error { for { repos, _, err := repo_model.GetUserRepositories(ctx, repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: repo_model.RepositoryListDefaultPageSize, - Page: 1, - }, - Private: true, - OwnerID: owner.ID, - Actor: owner, + PageSize: repo_model.RepositoryListDefaultPageSize, + Page: 1, + Private: true, + OwnerID: owner.ID, + Actor: owner, }) if err != nil { return fmt.Errorf("GetUserRepositories: %w", err) diff --git a/services/repository/files/file.go b/services/repository/files/file.go index 7db74dba8b..b9b1ae4d35 100644 --- a/services/repository/files/file.go +++ b/services/repository/files/file.go @@ -91,24 +91,18 @@ func GetFileCommitResponse(ctx context.Context, repo *repo_model.Repository, git } commitHTMLURL, _ := url.Parse(repo.HTMLURL() + "/commit/" + url.PathEscape(commit.ID.String())) fileCommit := &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - SHA: commit.ID.String(), - URL: commitURL.String(), - }, + SHA: commit.ID.String(), + URL: commitURL.String(), HTMLURL: commitHTMLURL.String(), Author: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Author.Name, - Email: commit.Author.Email, - }, - Date: commit.Author.When.UTC().Format(time.RFC3339), + Name: commit.Author.Name, + Email: commit.Author.Email, + Date: commit.Author.When.UTC().Format(time.RFC3339), }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: commit.Committer.Name, - Email: commit.Committer.Email, - }, - Date: commit.Committer.When.UTC().Format(time.RFC3339), + Name: commit.Committer.Name, + Email: commit.Committer.Email, + Date: commit.Committer.When.UTC().Format(time.RFC3339), }, Message: commit.MessageUTF8(), Tree: &api.CommitMeta{ diff --git a/services/user/block.go b/services/user/block.go index 48e6ed353d..6f29ee0f57 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -134,10 +134,8 @@ func BlockUser(ctx context.Context, doer, blocker, blockee *user_model.User, not func unstarRepos(ctx context.Context, starrer, repoOwner *user_model.User) error { opts := &repo_model.StarredReposOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 25, - }, + Page: 1, + PageSize: 25, StarrerID: starrer.ID, RepoOwnerID: repoOwner.ID, } @@ -164,10 +162,8 @@ func unstarRepos(ctx context.Context, starrer, repoOwner *user_model.User) error func unwatchRepos(ctx context.Context, watcher, repoOwner *user_model.User) error { opts := &repo_model.WatchedReposOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 25, - }, + Page: 1, + PageSize: 25, WatcherID: watcher.ID, RepoOwnerID: repoOwner.ID, } @@ -212,10 +208,8 @@ func cancelRepositoryTransfers(ctx context.Context, doer, sender, recipient *use func unassignIssues(ctx context.Context, assignee, repoOwner *user_model.User) error { opts := &issues_model.AssignedIssuesOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 25, - }, + Page: 1, + PageSize: 25, AssigneeID: assignee.ID, RepoOwnerID: repoOwner.ID, } @@ -246,10 +240,8 @@ func unassignIssues(ctx context.Context, assignee, repoOwner *user_model.User) e func removeCollaborations(ctx context.Context, repoOwner, collaborator *user_model.User) error { opts := &repo_model.FindCollaborationOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 25, - }, + Page: 1, + PageSize: 25, CollaboratorID: collaborator.ID, RepoOwnerID: repoOwner.ID, } diff --git a/services/user/user.go b/services/user/user.go index d03809d882..f588e3c63a 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -171,10 +171,8 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error { // but such a function would likely get out of date for { orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{ - ListOptions: db.ListOptions{ - PageSize: repo_model.RepositoryListDefaultPageSize, - Page: 1, - }, + PageSize: repo_model.RepositoryListDefaultPageSize, + Page: 1, UserID: u.ID, IncludeVisibility: structs.VisibleTypePrivate, }) diff --git a/tests/integration/actions_approve_test.go b/tests/integration/actions_approve_test.go index 6d4e4d7f8a..cc790d7a01 100644 --- a/tests/integration/actions_approve_test.go +++ b/tests/integration/actions_approve_test.go @@ -77,21 +77,19 @@ jobs: // user4 creates a pull request from branch "bugfix/user4" doAPICreateFile(user4APICtx, "user4-fix.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "bugfix/user4", - Message: "create user4-fix.txt", - Author: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Committer: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "bugfix/user4", + Message: "create user4-fix.txt", + Author: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Committer: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix")), })(t) @@ -181,13 +179,11 @@ jobs: // PR #1: a benign change from user4's fork — first-time contributor, gate engages. doAPICreateFile(user4APICtx, "first.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "first", - Message: "first", - Author: api.Identity{Name: user4.Name, Email: user4.Email}, - Committer: api.Identity{Name: user4.Name, Email: user4.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + NewBranchName: "first", + Message: "first", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("first")), })(t) pr1, err := doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":first")(t) @@ -207,13 +203,11 @@ jobs: // PR #2: same user, fresh branch. Pre-fix, this run was created with // NeedApproval=false and dispatched immediately — the bypass path. doAPICreateFile(user4APICtx, "second.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "second", - Message: "second", - Author: api.Identity{Name: user4.Name, Email: user4.Email}, - Committer: api.Identity{Name: user4.Name, Email: user4.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + NewBranchName: "second", + Message: "second", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("second")), })(t) pr2, err := doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":second")(t) @@ -227,13 +221,11 @@ jobs: // After merging PR #1, user4 becomes a known contributor and the gate lifts for a new PR. doAPIMergePullRequest(user2APICtx, baseRepo.OwnerName, baseRepo.Name, pr1.Index)(t) doAPICreateFile(user4APICtx, "third.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "third", - Message: "third", - Author: api.Identity{Name: user4.Name, Email: user4.Email}, - Committer: api.Identity{Name: user4.Name, Email: user4.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + NewBranchName: "third", + Message: "third", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("third")), })(t) pr3, err := doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":third")(t) diff --git a/tests/integration/actions_concurrency_test.go b/tests/integration/actions_concurrency_test.go index 7adfd593cc..fa7de4fb7d 100644 --- a/tests/integration/actions_concurrency_test.go +++ b/tests/integration/actions_concurrency_test.go @@ -394,21 +394,19 @@ jobs: createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts1) // user2 creates a pull request doAPICreateFile(user2APICtx, "user2-fix.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "bugfix/aaa", - Message: "create user2-fix.txt", - Author: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Committer: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "bugfix/aaa", + Message: "create user2-fix.txt", + Author: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Committer: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user2-fix")), })(t) @@ -432,21 +430,19 @@ jobs: // user4 creates a pull request from branch "bugfix/bbb" doAPICreateFile(user4APICtx, "user4-fix.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "bugfix/bbb", - Message: "create user4-fix.txt", - Author: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Committer: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "bugfix/bbb", + Message: "create user4-fix.txt", + Author: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Committer: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix")), })(t) @@ -468,21 +464,19 @@ jobs: // user4 creates another pull request from branch "do-not-cancel/ccc" doAPICreateFile(user4APICtx, "user4-fix2.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "do-not-cancel/ccc", - Message: "create user4-fix2.txt", - Author: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Committer: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "do-not-cancel/ccc", + Message: "create user4-fix2.txt", + Author: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Committer: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix2")), })(t) @@ -1194,21 +1188,19 @@ jobs: // trigger the task by push doAPICreateFile(httpContext, "doc.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "main", - Message: "create doc.txt", - Author: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Committer: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "main", + Message: "create doc.txt", + Author: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("doc")), })(t) @@ -1452,20 +1444,18 @@ jobs: // push another file to trigger the workflow again doAPICreateFile(user2APICtx, "file1.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - Message: "create file1.txt", - Author: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Committer: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + Message: "create file1.txt", + Author: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("file1")), })(t) diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 5261dfa0d0..e57ea451cc 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -493,21 +493,19 @@ jobs: createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts) // user2 creates a pull request doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "user2/patch-1", - Message: "create user2-patch.txt", - Author: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Committer: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "user2/patch-1", + Message: "create user2-patch.txt", + Author: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user2-fix")), })(t) @@ -530,9 +528,9 @@ jobs: assert.Equal(t, apiPull.Head.Ref, gtCtx["head_ref"].GetStringValue()) assert.Equal(t, actionRunJob.JobID, gtCtx["job"].GetStringValue()) assert.Equal(t, actionRun.Ref, gtCtx["ref"].GetStringValue()) - assert.Equal(t, (git.RefName(actionRun.Ref)).ShortName(), gtCtx["ref_name"].GetStringValue()) + assert.Equal(t, git.RefName(actionRun.Ref).ShortName(), gtCtx["ref_name"].GetStringValue()) assert.False(t, gtCtx["ref_protected"].GetBoolValue()) - assert.Equal(t, string((git.RefName(actionRun.Ref)).RefType()), gtCtx["ref_type"].GetStringValue()) + assert.Equal(t, string(git.RefName(actionRun.Ref).RefType()), gtCtx["ref_type"].GetStringValue()) assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue()) assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue()) assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue()) @@ -585,21 +583,19 @@ jobs: createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts) // user2 creates a pull request doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "user2/patch-1", - Message: "create user2-patch.txt", - Author: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Committer: api.Identity{ - Name: user2.Name, - Email: user2.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "user2/patch-1", + Message: "create user2-patch.txt", + Author: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("user2-fix")), })(t) @@ -622,9 +618,9 @@ jobs: assert.Equal(t, apiPull.Head.Ref, gtCtx["head_ref"].GetStringValue()) assert.Equal(t, actionRunJob.JobID, gtCtx["job"].GetStringValue()) assert.Equal(t, actionRun.Ref, gtCtx["ref"].GetStringValue()) - assert.Equal(t, (git.RefName(actionRun.Ref)).ShortName(), gtCtx["ref_name"].GetStringValue()) + assert.Equal(t, git.RefName(actionRun.Ref).ShortName(), gtCtx["ref_name"].GetStringValue()) assert.False(t, gtCtx["ref_protected"].GetBoolValue()) - assert.Equal(t, string((git.RefName(actionRun.Ref)).RefType()), gtCtx["ref_type"].GetStringValue()) + assert.Equal(t, string(git.RefName(actionRun.Ref).RefType()), gtCtx["ref_type"].GetStringValue()) assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue()) assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue()) assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue()) @@ -713,21 +709,19 @@ func createActionsTestRepo(t *testing.T, authToken, repoName string, isPrivate b func getWorkflowCreateFileOptions(u *user_model.User, branch, msg, content string) *api.CreateFileOptions { return &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: branch, - Message: msg, - Author: api.Identity{ - Name: u.Name, - Email: u.Email, - }, - Committer: api.Identity{ - Name: u.Name, - Email: u.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + BranchName: branch, + Message: msg, + Author: api.Identity{ + Name: u.Name, + Email: u.Email, + }, + Committer: api.Identity{ + Name: u.Name, + Email: u.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte(content)), } diff --git a/tests/integration/actions_job_token_test.go b/tests/integration/actions_job_token_test.go index e85201e829..75aea08bd4 100644 --- a/tests/integration/actions_job_token_test.go +++ b/tests/integration/actions_job_token_test.go @@ -164,7 +164,7 @@ func TestActionsJobTokenPermissiveAccess(t *testing.T) { t.Run("WriteGitContent", func(t *testing.T) { req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/contents/test-filename", repo.FullName()), &structs.CreateFileOptions{ - FileOptions: structs.FileOptions{NewBranchName: "new-branch" + t.Name()}, + NewBranchName: "new-branch" + t.Name(), ContentBase64: base64.StdEncoding.EncodeToString([]byte(`dummy content`)), }).AddTokenAuth(task.Token) resp := MakeRequest(t, req, NoExpectedStatus) diff --git a/tests/integration/actions_reusable_workflow_test.go b/tests/integration/actions_reusable_workflow_test.go index 77b858ec34..50313c2fb2 100644 --- a/tests/integration/actions_reusable_workflow_test.go +++ b/tests/integration/actions_reusable_workflow_test.go @@ -667,13 +667,11 @@ jobs: // user4 pushes a change on the fork and opens a PR to base doAPICreateFile(user4APICtx, "user4-fix.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "user4/branch", - Message: "create user4-fix.txt", - Author: api.Identity{Name: user4.Name, Email: user4.Email}, - Committer: api.Identity{Name: user4.Name, Email: user4.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + NewBranchName: "user4/branch", + Message: "create user4-fix.txt", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("fix")), })(t) doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":user4/branch")(t) @@ -745,14 +743,12 @@ jobs: req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", forkRepo.OwnerName, forkRepo.Name, reusablePath), &api.UpdateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "fork-branch", - Message: "rewrite the reusable workflow", - Author: api.Identity{Name: user4.Name, Email: user4.Email}, - Committer: api.Identity{Name: user4.Name, Email: user4.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, - SHA: forkReusable.SHA, + NewBranchName: "fork-branch", + Message: "rewrite the reusable workflow", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, + SHA: forkReusable.SHA, ContentBase64: base64.StdEncoding.EncodeToString([]byte(`name: Reusable on: workflow_call: diff --git a/tests/integration/actions_runner_sort_test.go b/tests/integration/actions_runner_sort_test.go index 9c992146ef..3a6d2ea85a 100644 --- a/tests/integration/actions_runner_sort_test.go +++ b/tests/integration/actions_runner_sort_test.go @@ -111,8 +111,8 @@ func TestFindRunnersPaginationNoDuplicates(t *testing.T) { const pageSize = 2 for page := 1; ; page++ { runners, err := db.Find[actions_model.ActionRunner](ctx, actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{Page: page, PageSize: pageSize}, - OwnerID: ownerID, + Page: page, PageSize: pageSize, + OwnerID: ownerID, }) require.NoError(t, err) if len(runners) == 0 { diff --git a/tests/integration/actions_scoped_workflow_test.go b/tests/integration/actions_scoped_workflow_test.go index 51b273a2f9..e2a590a093 100644 --- a/tests/integration/actions_scoped_workflow_test.go +++ b/tests/integration/actions_scoped_workflow_test.go @@ -262,12 +262,10 @@ jobs: user2Session.MakeRequest(t, NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/%s/settings/branches/edit", consumer.OwnerName, consumer.Name), pbValues), http.StatusSeeOther) prFile := &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: consumer.DefaultBranch, NewBranchName: branch, Message: "pr change", - Author: api.Identity{Name: user2.Name, Email: user2.Email}, - Committer: api.Identity{Name: user2.Name, Email: user2.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + BranchName: consumer.DefaultBranch, NewBranchName: branch, Message: "pr change", + Author: api.Identity{Name: user2.Name, Email: user2.Email}, + Committer: api.Identity{Name: user2.Name, Email: user2.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("pr change")), } createWorkflowFile(t, user2Token, consumer.OwnerName, consumer.Name, "pr-change.txt", prFile) @@ -373,12 +371,10 @@ jobs: // Open a PR that changes a file NOT matching the workflow's `paths: [src/**]`, so it is filtered out. prFile := &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: consumer.DefaultBranch, NewBranchName: "filtered-pr", Message: "pr change", - Author: api.Identity{Name: user2.Name, Email: user2.Email}, - Committer: api.Identity{Name: user2.Name, Email: user2.Email}, - Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, - }, + BranchName: consumer.DefaultBranch, NewBranchName: "filtered-pr", Message: "pr change", + Author: api.Identity{Name: user2.Name, Email: user2.Email}, + Committer: api.Identity{Name: user2.Name, Email: user2.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, ContentBase64: base64.StdEncoding.EncodeToString([]byte("pr change")), } createWorkflowFile(t, user2Token, consumer.OwnerName, consumer.Name, "docs.txt", prFile) @@ -514,8 +510,8 @@ jobs: updateReq := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/.gitea/scoped_workflows/ci.yaml", source.OwnerName, source.Name), &api.UpdateFileOptions{ - SHA: created.Content.SHA, - FileOptions: api.FileOptions{BranchName: source.DefaultBranch, Message: "switch to push"}, + SHA: created.Content.SHA, + BranchName: source.DefaultBranch, Message: "switch to push", ContentBase64: base64.StdEncoding.EncodeToString([]byte(`name: CI on: push jobs: diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 2ab5be5da5..7b9fd5732f 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -1718,21 +1718,19 @@ jobs: // user4 creates a pull request to add file "app/main.go" doAPICreateFile(user4APICtx, "app/main.go", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "user4/add-main", - Message: "create main.go", - Author: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Committer: api.Identity{ - Name: user4.Name, - Email: user4.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, + NewBranchName: "user4/add-main", + Message: "create main.go", + Author: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Committer: api.Identity{ + Name: user4.Name, + Email: user4.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("// main.go")), })(t) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index c4946f05e3..6db47a9882 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -300,11 +300,9 @@ func TestAPIUpdateBranchReference(t *testing.T) { content := base64.StdEncoding.EncodeToString([]byte("branch update test")) var newCommit string doAPICreateFile(ctx, "docs/update.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: defaultBranch, - NewBranchName: defaultBranch, - Message: "add docs/update.txt", - }, + BranchName: defaultBranch, + NewBranchName: defaultBranch, + Message: "add docs/update.txt", ContentBase64: content, }, func(t *testing.T, resp api.FileResponse) { newCommit = resp.Commit.SHA diff --git a/tests/integration/api_packages_terraform_test.go b/tests/integration/api_packages_terraform_test.go index 4f6019f6cd..c98d4b2744 100644 --- a/tests/integration/api_packages_terraform_test.go +++ b/tests/integration/api_packages_terraform_test.go @@ -8,6 +8,7 @@ import ( "net/http" "strings" "testing" + "uuid" "gitea.dev/models/packages" "gitea.dev/models/unittest" @@ -16,7 +17,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "uuid" ) func TestPackageTerraform(t *testing.T) { diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 631a9248a3..e4b7023ba8 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -28,22 +28,20 @@ func getCreateFileOptions() api.CreateFileOptions { content := "This is new text" contentEncoded := base64.StdEncoding.EncodeToString([]byte(content)) return api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - NewBranchName: "master", - Message: "Making this new file new/file.txt", - Author: api.Identity{ - Name: "Anne Doe", - Email: "annedoe@example.com", - }, - Committer: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, - Dates: api.CommitDateOptions{ - Author: time.Unix(946684810, 0), - Committer: time.Unix(978307190, 0), - }, + BranchName: "master", + NewBranchName: "master", + Message: "Making this new file new/file.txt", + Author: api.Identity{ + Name: "Anne Doe", + Email: "annedoe@example.com", + }, + Committer: api.Identity{ + Name: "John Doe", + Email: "johndoe@example.com", + }, + Dates: api.CommitDateOptions{ + Author: time.Unix(946684810, 0), + Committer: time.Unix(978307190, 0), }, ContentBase64: contentEncoded, } @@ -93,24 +91,18 @@ func getExpectedFileResponseForCreate(info apiFileResponseInfo) *api.FileRespons }, }, Commit: &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - URL: setting.AppURL + "api/v1/repos/" + info.repoFullName + "/git/commits/" + info.commitID, - SHA: info.commitID, - }, + URL: setting.AppURL + "api/v1/repos/" + info.repoFullName + "/git/commits/" + info.commitID, + SHA: info.commitID, HTMLURL: setting.AppURL + info.repoFullName + "/commit/" + info.commitID, Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Anne Doe", - Email: "annedoe@example.com", - }, - Date: "2000-01-01T00:00:10Z", + Name: "Anne Doe", + Email: "annedoe@example.com", + Date: "2000-01-01T00:00:10Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, - Date: "2000-12-31T23:59:50Z", + Name: "John Doe", + Email: "johndoe@example.com", + Date: "2000-12-31T23:59:50Z", }, Message: "Updates README.md\n", }, diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 293977f6bf..ca68f9657d 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -20,19 +20,17 @@ import ( func getDeleteFileOptions() *api.DeleteFileOptions { return &api.DeleteFileOptions{ - SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", - FileOptions: api.FileOptions{ - BranchName: "master", - NewBranchName: "master", - Message: "Removing the file new/file.txt", - Author: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, - Committer: api.Identity{ - Name: "Jane Doe", - Email: "janedoe@example.com", - }, + SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", + BranchName: "master", + NewBranchName: "master", + Message: "Removing the file new/file.txt", + Author: api.Identity{ + Name: "John Doe", + Email: "johndoe@example.com", + }, + Committer: api.Identity{ + Name: "Jane Doe", + Email: "janedoe@example.com", }, } } diff --git a/tests/integration/api_repo_file_diffpatch_test.go b/tests/integration/api_repo_file_diffpatch_test.go index fdae6c910a..9b57b9616a 100644 --- a/tests/integration/api_repo_file_diffpatch_test.go +++ b/tests/integration/api_repo_file_diffpatch_test.go @@ -20,9 +20,7 @@ import ( func getApplyDiffPatchFileOptions() *api.ApplyDiffPatchFileOptions { return &api.ApplyDiffPatchFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - }, + BranchName: "master", Content: `diff --git a/patch-file-1.txt b/patch-file-1.txt new file mode 100644 index 0000000000..aaaaaaaaaa diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index a4b6cde689..5aaedc2d8b 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -27,19 +27,17 @@ func getUpdateFileOptions() *api.UpdateFileOptions { content := "This is updated text" contentEncoded := base64.StdEncoding.EncodeToString([]byte(content)) return &api.UpdateFileOptions{ - SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", - FileOptions: api.FileOptions{ - BranchName: "master", - NewBranchName: "master", - Message: "My update of new/file.txt", - Author: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, - Committer: api.Identity{ - Name: "Anne Doe", - Email: "annedoe@example.com", - }, + SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", + BranchName: "master", + NewBranchName: "master", + Message: "My update of new/file.txt", + Author: api.Identity{ + Name: "John Doe", + Email: "johndoe@example.com", + }, + Committer: api.Identity{ + Name: "Anne Doe", + Email: "annedoe@example.com", }, ContentBase64: contentEncoded, } @@ -77,22 +75,16 @@ func getExpectedFileResponseForUpdate(info apiFileResponseInfo) *api.FileRespons }, }, Commit: &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + info.commitID, - SHA: info.commitID, - }, + URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + info.commitID, + SHA: info.commitID, HTMLURL: setting.AppURL + "user2/repo1/commit/" + info.commitID, Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, + Name: "John Doe", + Email: "johndoe@example.com", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Anne Doe", - Email: "annedoe@example.com", - }, + Name: "Anne Doe", + Email: "annedoe@example.com", }, Message: "My update of README.md\n", }, diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index 74c3186282..66d83416b8 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -28,18 +28,16 @@ func getChangeFilesOptions() *api.ChangeFilesOptions { newContentEncoded := base64.StdEncoding.EncodeToString([]byte(newContent)) updateContentEncoded := base64.StdEncoding.EncodeToString([]byte(updateContent)) return &api.ChangeFilesOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - NewBranchName: "master", - Message: "My update of new/file.txt", - Author: api.Identity{ - Name: "Anne Doe", - Email: "annedoe@example.com", - }, - Committer: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", - }, + BranchName: "master", + NewBranchName: "master", + Message: "My update of new/file.txt", + Author: api.Identity{ + Name: "Anne Doe", + Email: "annedoe@example.com", + }, + Committer: api.Identity{ + Name: "John Doe", + Email: "johndoe@example.com", }, Files: []*api.ChangeFileOperation{ { diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index 2ae617c6cf..e06be71168 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -35,18 +35,14 @@ func TestAPIGetWikiPage(t *testing.T) { LastCommit: &api.WikiCommit{ ID: "2c54faec6c45d31c1abfaecdab471eac6633738a", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Message: "Add Home.md\n", }, @@ -80,18 +76,14 @@ func TestAPIListWikiPages(t *testing.T) { LastCommit: &api.WikiCommit{ ID: "2c54faec6c45d31c1abfaecdab471eac6633738a", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Message: "Add Home.md\n", }, @@ -103,18 +95,14 @@ func TestAPIListWikiPages(t *testing.T) { LastCommit: &api.WikiCommit{ ID: "0cf15c3f66ec8384480ed9c3cf87c9e97fbb0ec3", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gabriel Silva Simões", - Email: "simoes.sgabriel@gmail.com", - }, - Date: "2019-01-25T01:41:55Z", + Name: "Gabriel Silva Simões", + Email: "simoes.sgabriel@gmail.com", + Date: "2019-01-25T01:41:55Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gabriel Silva Simões", - Email: "simoes.sgabriel@gmail.com", - }, - Date: "2019-01-25T01:41:55Z", + Name: "Gabriel Silva Simões", + Email: "simoes.sgabriel@gmail.com", + Date: "2019-01-25T01:41:55Z", }, Message: "Add jpeg.jpg and page with image\n", }, @@ -126,18 +114,14 @@ func TestAPIListWikiPages(t *testing.T) { LastCommit: &api.WikiCommit{ ID: "c10d10b7e655b3dab1f53176db57c8219a5488d6", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gabriel Silva Simões", - Email: "simoes.sgabriel@gmail.com", - }, - Date: "2019-01-25T01:39:51Z", + Name: "Gabriel Silva Simões", + Email: "simoes.sgabriel@gmail.com", + Date: "2019-01-25T01:39:51Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gabriel Silva Simões", - Email: "simoes.sgabriel@gmail.com", - }, - Date: "2019-01-25T01:39:51Z", + Name: "Gabriel Silva Simões", + Email: "simoes.sgabriel@gmail.com", + Date: "2019-01-25T01:39:51Z", }, Message: "Add page with spaced name\n", }, @@ -149,18 +133,14 @@ func TestAPIListWikiPages(t *testing.T) { LastCommit: &api.WikiCommit{ ID: "0dca5bd9b5d7ef937710e056f575e86c0184ba85", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "6543", - Email: "6543@obermui.de", - }, - Date: "2021-07-19T16:42:46Z", + Name: "6543", + Email: "6543@obermui.de", + Date: "2021-07-19T16:42:46Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "6543", - Email: "6543@obermui.de", - }, - Date: "2021-07-19T16:42:46Z", + Name: "6543", + Email: "6543@obermui.de", + Date: "2021-07-19T16:42:46Z", }, Message: "add unescaped file\n", }, @@ -227,18 +207,14 @@ func TestAPIListPageRevisions(t *testing.T) { { ID: "2c54faec6c45d31c1abfaecdab471eac6633738a", Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Ethan Koenig", - Email: "ethantkoenig@gmail.com", - }, - Date: "2017-11-27T04:31:18Z", + Name: "Ethan Koenig", + Email: "ethantkoenig@gmail.com", + Date: "2017-11-27T04:31:18Z", }, Message: "Add Home.md\n", }, diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 24b30e69ff..3af94a076a 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -171,10 +171,8 @@ func TestEmptyRepoAddFileByAPI(t *testing.T) { token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user30/empty/contents/new-file.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - NewBranchName: "new_branch", - Message: "init", - }, + NewBranchName: "new_branch", + Message: "init", ContentBase64: base64.StdEncoding.EncodeToString([]byte("newly-added-api-file")), }).AddTokenAuth(token) diff --git a/tests/integration/gpg_ssh_git_test.go b/tests/integration/gpg_ssh_git_test.go index 130cfb6534..ee9ba78b13 100644 --- a/tests/integration/gpg_ssh_git_test.go +++ b/tests/integration/gpg_ssh_git_test.go @@ -278,17 +278,15 @@ func testGitSigning(t *testing.T) { content := base64.StdEncoding.EncodeToString([]byte("update base")) t.Run("UpdateBase", doAPICreateFile(testCtx, "signed-base.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - Message: "update base", - Author: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - Committer: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, + BranchName: "master", + Message: "update base", + Author: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + Committer: api.Identity{ + Name: user.FullName, + Email: user.Email, }, ContentBase64: content, })) @@ -316,17 +314,15 @@ func testGitSigning(t *testing.T) { content := base64.StdEncoding.EncodeToString([]byte("update base")) t.Run("UpdateBase", doAPICreateFile(testCtx, "signed-base.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - Message: "update base", - Author: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - Committer: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, + BranchName: "master", + Message: "update base", + Author: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + Committer: api.Identity{ + Name: user.FullName, + Email: user.Email, }, ContentBase64: content, })) @@ -356,17 +352,15 @@ func testGitSigning(t *testing.T) { // the base commit the update merges in is unsigned, so the commitssigned rule must refuse content := base64.StdEncoding.EncodeToString([]byte("update base")) t.Run("UpdateBase", doAPICreateFile(testCtx, "unsigned-base.txt", &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "master", - Message: "update base", - Author: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - Committer: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, + BranchName: "master", + Message: "update base", + Author: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + Committer: api.Identity{ + Name: user.FullName, + Email: user.Email, }, ContentBase64: content, })) @@ -386,18 +380,16 @@ func testGitSigning(t *testing.T) { func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { return doAPICreateFile(ctx, path, &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: from, - NewBranchName: to, - Message: fmt.Sprintf("from:%s to:%s path:%s", from, to, path), - Author: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - Committer: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, + BranchName: from, + NewBranchName: to, + Message: fmt.Sprintf("from:%s to:%s path:%s", from, to, path), + Author: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + Committer: api.Identity{ + Name: user.FullName, + Email: user.Email, }, ContentBase64: base64.StdEncoding.EncodeToString([]byte("This is new text for " + path)), }, callback...) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 535ef1994b..ba89cf50fb 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -869,7 +869,7 @@ func issueOAuthAccessTokenForScope(t *testing.T, user *user_model.User, scope st authorizeURL := fmt.Sprintf("/login/oauth/authorize?client_id=%s&redirect_uri=https://example.com&response_type=code&state=thestate", app.ClientID) authorizeReq := NewRequest(t, "GET", authorizeURL) authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) - authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + authcode, _, _ := strings.Cut(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&") accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ "grant_type": "authorization_code", @@ -923,7 +923,7 @@ func testOAuthGrantScopesReadRepositoryFailOrganization(t *testing.T) { authorizeReq := NewRequest(t, "GET", authorizeURL) authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) - authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + authcode, _, _ := strings.Cut(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&") accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ "grant_type": "authorization_code", "client_id": app.ClientID, @@ -1060,7 +1060,7 @@ func testOAuthGrantScopesClaimPublicOnlyGroups(t *testing.T) { authorizeReq := NewRequest(t, "GET", authorizeURL) authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) - authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + authcode, _, _ := strings.Cut(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&") accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ "grant_type": "authorization_code", @@ -1158,7 +1158,7 @@ func testOAuthGrantScopesClaimAllGroups(t *testing.T) { authorizeReq := NewRequest(t, "GET", authorizeURL) authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) - authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + authcode, _, _ := strings.Cut(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&") accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ "grant_type": "authorization_code", diff --git a/tests/integration/org_profile_test.go b/tests/integration/org_profile_test.go index 60d80f0763..60e4429f2a 100644 --- a/tests/integration/org_profile_test.go +++ b/tests/integration/org_profile_test.go @@ -22,14 +22,12 @@ import ( func getCreateProfileReadmeFileOptions(content string) api.CreateFileOptions { contentEncoded := base64.StdEncoding.EncodeToString([]byte(content)) return api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "main", - NewBranchName: "main", - Message: "create the profile README.md", - Dates: api.CommitDateOptions{ - Author: time.Unix(946684810, 0), - Committer: time.Unix(978307190, 0), - }, + BranchName: "main", + NewBranchName: "main", + Message: "create the profile README.md", + Dates: api.CommitDateOptions{ + Author: time.Unix(946684810, 0), + Committer: time.Unix(978307190, 0), }, ContentBase64: contentEncoded, } diff --git a/tests/integration/packages_service_test.go b/tests/integration/packages_service_test.go index 172b5ab5e1..20982584e1 100644 --- a/tests/integration/packages_service_test.go +++ b/tests/integration/packages_service_test.go @@ -27,20 +27,18 @@ func TestRemovePackage(t *testing.T) { createPackage := func(name string) (*packages_model.Package, *packages_model.PackageVersion, *packages_model.PackageFile) { data, _ := packages_module.CreateHashedBufferFromReader(bytes.NewReader([]byte{1})) pv, pf, err := packages_service.CreatePackageOrAddFileToExisting(t.Context(), &packages_service.PackageCreationInfo{ - PackageInfo: packages_service.PackageInfo{ - Owner: user, - PackageType: packages_model.TypeGeneric, - Name: name, - Version: "1.0.0", - }, + Owner: user, + PackageType: packages_model.TypeGeneric, + Name: name, + Version: "1.0.0", Creator: user, PackageProperties: map[string]string{"pkg_prop": "val"}, VersionProperties: map[string]string{"ver_prop": "val"}, }, &packages_service.PackageFileCreationInfo{ - PackageFileInfo: packages_service.PackageFileInfo{Filename: "file.bin"}, - Creator: user, - Data: data, - Properties: map[string]string{"file_prop": "val"}, + Filename: "file.bin", + Creator: user, + Data: data, + Properties: map[string]string{"file_prop": "val"}, }) require.NoError(t, err) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 7bc08a2b6d..3b21f3cfa1 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -309,11 +309,9 @@ func TestCreatePullRequestFromNestedOrgForks(t *testing.T) { forkIntoOrg(midForkOrg, leafForkOrg) req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", leafForkOrg, repoName, "patch-from-org3.txt"), &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: "main", - NewBranchName: patchBranch, - Message: "create patch from org3", - }, + BranchName: "main", + NewBranchName: patchBranch, + Message: "create patch from org3", ContentBase64: base64.StdEncoding.EncodeToString([]byte("patch content")), }).AddTokenAuth(token) MakeRequest(t, req, http.StatusCreated) diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 0def14034f..b2224b9e91 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -124,24 +124,18 @@ func getExpectedFileResponseForRepoFilesCreate(commitID string, lastCommit *git. }, }, Commit: &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID, - SHA: commitID, - }, + URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID, + SHA: commitID, HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, - Date: time.Now().UTC().Format(time.RFC3339), + Name: "User Two", + Email: "2+user2@noreply.example.org", + Date: time.Now().UTC().Format(time.RFC3339), }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, - Date: time.Now().UTC().Format(time.RFC3339), + Name: "User Two", + Email: "2+user2@noreply.example.org", + Date: time.Now().UTC().Format(time.RFC3339), }, Parents: []*api.CommitMeta{ { @@ -195,24 +189,18 @@ func getExpectedFileResponseForRepoFilesUpdate(commitID, filename, lastCommitSHA }, }, Commit: &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID, - SHA: commitID, - }, + URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID, + SHA: commitID, HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, - Date: time.Now().UTC().Format(time.RFC3339), + Name: "User Two", + Email: "2+user2@noreply.example.org", + Date: time.Now().UTC().Format(time.RFC3339), }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, - Date: time.Now().UTC().Format(time.RFC3339), + Name: "User Two", + Email: "2+user2@noreply.example.org", + Date: time.Now().UTC().Format(time.RFC3339), }, Parents: []*api.CommitMeta{ { @@ -306,22 +294,16 @@ func getExpectedFileResponseForRepoFilesUpdateRename(commitID, lastCommitSHA str return &api.FilesResponse{ Files: responses, Commit: &api.FileCommitResponse{ - CommitMeta: api.CommitMeta{ - URL: setting.AppURL + "api/v1/repos/user2/lfs/git/commits/" + commitID, - SHA: commitID, - }, + URL: setting.AppURL + "api/v1/repos/user2/lfs/git/commits/" + commitID, + SHA: commitID, HTMLURL: setting.AppURL + "user2/lfs/commit/" + commitID, Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, + Name: "User Two", + Email: "2+user2@noreply.example.org", }, Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "User Two", - Email: "2+user2@noreply.example.org", - }, + Name: "User Two", + Email: "2+user2@noreply.example.org", }, Parents: []*api.CommitMeta{ {