tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 21:05:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Repository -> Repo for consistency

Browse Source
This commit is contained in:
Christopher Homberger 2025-03-04 23:19:27 +01:00
parent 402182c72e
commit ec8c8bce97
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/structs/hook.go
View File

@ -476,7 +476,7 @@ type WorkflowJobPayload struct {
WorkflowJob *ActionWorkflowJob `json:"workflow_job"` WorkflowJob *ActionWorkflowJob `json:"workflow_job"`
PullRequest *PullRequest `json:"pull_request,omitempty"` PullRequest *PullRequest `json:"pull_request,omitempty"`
Organization *Organization `json:"organization,omitempty"` Organization *Organization `json:"organization,omitempty"`
Repository *Repository `json:"repository"` Repo *Repository `json:"repository"`
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }

2
services/webhook/msteams.go
View File

@ -321,7 +321,7 @@ func (msteamsConvertor) WorkflowJob(p *api.WorkflowJobPayload) (MSTeamsPayload,
title, color := getWorkflowJobPayloadInfo(p, noneLinkFormatter, false) title, color := getWorkflowJobPayloadInfo(p, noneLinkFormatter, false)
return createMSTeamsPayload( return createMSTeamsPayload(
p.Repository, p.Repo,
p.Sender, p.Sender,
title, title,
"", "",

2
services/webhook/notifier.go
View File

@ -1023,7 +1023,7 @@ func (*webhookNotifier) WorkflowJobStatusUpdate(ctx context.Context, repo *repo_
CompletedAt: job.Stopped.AsTime().UTC(), CompletedAt: job.Stopped.AsTime().UTC(),
}, },
Organization: org, Organization: org,
Repository: convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm.AccessModeOwner}), Repo: convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm.AccessModeOwner}),
Sender: convert.ToUser(ctx, sender, nil), Sender: convert.ToUser(ctx, sender, nil),
}); err != nil { }); err != nil {
log.Error("PrepareWebhooks: %v", err) log.Error("PrepareWebhooks: %v", err)

28
tests/integration/repo_webhook_test.go
View File

@ -668,14 +668,14 @@ jobs:
assert.EqualValues(t, "queued", payloads[0].WorkflowJob.Status) assert.EqualValues(t, "queued", payloads[0].WorkflowJob.Status)
assert.EqualValues(t, []string{"ubuntu-latest"}, payloads[0].WorkflowJob.Labels) assert.EqualValues(t, []string{"ubuntu-latest"}, payloads[0].WorkflowJob.Labels)
assert.EqualValues(t, commitID, payloads[0].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[0].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[0].Repository.Name) assert.EqualValues(t, "repo1", payloads[0].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[0].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[0].Repo.FullName)
assert.EqualValues(t, "waiting", payloads[1].Action) assert.EqualValues(t, "waiting", payloads[1].Action)
assert.EqualValues(t, "waiting", payloads[1].WorkflowJob.Status) assert.EqualValues(t, "waiting", payloads[1].WorkflowJob.Status)
assert.EqualValues(t, commitID, payloads[1].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[1].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[1].Repository.Name) assert.EqualValues(t, "repo1", payloads[1].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[1].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[1].Repo.FullName)
// 4. Execute a single Job // 4. Execute a single Job
task := runner.fetchTask(t) task := runner.fetchTask(t)
@ -692,16 +692,16 @@ jobs:
assert.EqualValues(t, "in_progress", payloads[2].WorkflowJob.Status) assert.EqualValues(t, "in_progress", payloads[2].WorkflowJob.Status)
assert.EqualValues(t, "mock-runner", payloads[2].WorkflowJob.RunnerName) assert.EqualValues(t, "mock-runner", payloads[2].WorkflowJob.RunnerName)
assert.EqualValues(t, commitID, payloads[2].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[2].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[2].Repository.Name) assert.EqualValues(t, "repo1", payloads[2].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[2].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[2].Repo.FullName)
assert.EqualValues(t, "completed", payloads[3].Action) assert.EqualValues(t, "completed", payloads[3].Action)
assert.EqualValues(t, "completed", payloads[3].WorkflowJob.Status) assert.EqualValues(t, "completed", payloads[3].WorkflowJob.Status)
assert.EqualValues(t, "mock-runner", payloads[3].WorkflowJob.RunnerName) assert.EqualValues(t, "mock-runner", payloads[3].WorkflowJob.RunnerName)
assert.EqualValues(t, "success", payloads[3].WorkflowJob.Conclusion) assert.EqualValues(t, "success", payloads[3].WorkflowJob.Conclusion)
assert.EqualValues(t, commitID, payloads[3].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[3].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[3].Repository.Name) assert.EqualValues(t, "repo1", payloads[3].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[3].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[3].Repo.FullName)
assert.Contains(t, payloads[3].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[3].WorkflowJob.RunID, payloads[3].WorkflowJob.ID)) assert.Contains(t, payloads[3].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[3].WorkflowJob.RunID, payloads[3].WorkflowJob.ID))
assert.Contains(t, payloads[3].WorkflowJob.URL, payloads[3].WorkflowJob.RunURL) assert.Contains(t, payloads[3].WorkflowJob.URL, payloads[3].WorkflowJob.RunURL)
assert.Contains(t, payloads[3].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 0)) assert.Contains(t, payloads[3].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 0))
@ -711,8 +711,8 @@ jobs:
assert.EqualValues(t, "queued", payloads[4].WorkflowJob.Status) assert.EqualValues(t, "queued", payloads[4].WorkflowJob.Status)
assert.EqualValues(t, []string{"ubuntu-latest"}, payloads[4].WorkflowJob.Labels) assert.EqualValues(t, []string{"ubuntu-latest"}, payloads[4].WorkflowJob.Labels)
assert.EqualValues(t, commitID, payloads[4].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[4].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[4].Repository.Name) assert.EqualValues(t, "repo1", payloads[4].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[4].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[4].Repo.FullName)
// 6. Execute a single Job // 6. Execute a single Job
task = runner.fetchTask(t) task = runner.fetchTask(t)
@ -730,16 +730,16 @@ jobs:
assert.EqualValues(t, "mock-runner", payloads[5].WorkflowJob.RunnerName) assert.EqualValues(t, "mock-runner", payloads[5].WorkflowJob.RunnerName)
assert.EqualValues(t, commitID, payloads[5].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[5].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[5].Repository.Name) assert.EqualValues(t, "repo1", payloads[5].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[5].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[5].Repo.FullName)
assert.EqualValues(t, "completed", payloads[6].Action) assert.EqualValues(t, "completed", payloads[6].Action)
assert.EqualValues(t, "completed", payloads[6].WorkflowJob.Status) assert.EqualValues(t, "completed", payloads[6].WorkflowJob.Status)
assert.EqualValues(t, "failure", payloads[6].WorkflowJob.Conclusion) assert.EqualValues(t, "failure", payloads[6].WorkflowJob.Conclusion)
assert.EqualValues(t, "mock-runner", payloads[6].WorkflowJob.RunnerName) assert.EqualValues(t, "mock-runner", payloads[6].WorkflowJob.RunnerName)
assert.EqualValues(t, commitID, payloads[6].WorkflowJob.HeadSha) assert.EqualValues(t, commitID, payloads[6].WorkflowJob.HeadSha)
assert.EqualValues(t, "repo1", payloads[6].Repository.Name) assert.EqualValues(t, "repo1", payloads[6].Repo.Name)
assert.EqualValues(t, "user2/repo1", payloads[6].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[6].Repo.FullName)
assert.Contains(t, payloads[6].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[6].WorkflowJob.RunID, payloads[6].WorkflowJob.ID)) assert.Contains(t, payloads[6].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[6].WorkflowJob.RunID, payloads[6].WorkflowJob.ID))
assert.Contains(t, payloads[6].WorkflowJob.URL, payloads[6].WorkflowJob.RunURL) assert.Contains(t, payloads[6].WorkflowJob.URL, payloads[6].WorkflowJob.RunURL)
assert.Contains(t, payloads[6].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 1)) assert.Contains(t, payloads[6].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 1))