diff --git a/modules/structs/hook.go b/modules/structs/hook.go index ed35c24cc6..aaa9fbc9d3 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -476,7 +476,7 @@ type WorkflowJobPayload struct { WorkflowJob *ActionWorkflowJob `json:"workflow_job"` PullRequest *PullRequest `json:"pull_request,omitempty"` Organization *Organization `json:"organization,omitempty"` - Repository *Repository `json:"repository"` + Repo *Repository `json:"repository"` Sender *User `json:"sender"` } diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 7d2cf2c3f7..f70e235f20 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -321,7 +321,7 @@ func (msteamsConvertor) WorkflowJob(p *api.WorkflowJobPayload) (MSTeamsPayload, title, color := getWorkflowJobPayloadInfo(p, noneLinkFormatter, false) return createMSTeamsPayload( - p.Repository, + p.Repo, p.Sender, title, "", diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index 9692cbc59c..7d779cd527 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -1023,7 +1023,7 @@ func (*webhookNotifier) WorkflowJobStatusUpdate(ctx context.Context, repo *repo_ CompletedAt: job.Stopped.AsTime().UTC(), }, 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), }); err != nil { log.Error("PrepareWebhooks: %v", err) diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 637c5afd4d..6719a2f84c 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -668,14 +668,14 @@ jobs: assert.EqualValues(t, "queued", payloads[0].WorkflowJob.Status) assert.EqualValues(t, []string{"ubuntu-latest"}, payloads[0].WorkflowJob.Labels) assert.EqualValues(t, commitID, payloads[0].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[0].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[0].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[0].Repo.Name) + assert.EqualValues(t, "user2/repo1", payloads[0].Repo.FullName) assert.EqualValues(t, "waiting", payloads[1].Action) assert.EqualValues(t, "waiting", payloads[1].WorkflowJob.Status) assert.EqualValues(t, commitID, payloads[1].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[1].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[1].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[1].Repo.Name) + assert.EqualValues(t, "user2/repo1", payloads[1].Repo.FullName) // 4. Execute a single Job task := runner.fetchTask(t) @@ -692,16 +692,16 @@ jobs: assert.EqualValues(t, "in_progress", payloads[2].WorkflowJob.Status) assert.EqualValues(t, "mock-runner", payloads[2].WorkflowJob.RunnerName) assert.EqualValues(t, commitID, payloads[2].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[2].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[2].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[2].Repo.Name) + assert.EqualValues(t, "user2/repo1", payloads[2].Repo.FullName) assert.EqualValues(t, "completed", payloads[3].Action) assert.EqualValues(t, "completed", payloads[3].WorkflowJob.Status) assert.EqualValues(t, "mock-runner", payloads[3].WorkflowJob.RunnerName) assert.EqualValues(t, "success", payloads[3].WorkflowJob.Conclusion) assert.EqualValues(t, commitID, payloads[3].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[3].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[3].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[3].Repo.Name) + 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, payloads[3].WorkflowJob.RunURL) 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, []string{"ubuntu-latest"}, payloads[4].WorkflowJob.Labels) assert.EqualValues(t, commitID, payloads[4].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[4].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[4].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[4].Repo.Name) + assert.EqualValues(t, "user2/repo1", payloads[4].Repo.FullName) // 6. Execute a single Job task = runner.fetchTask(t) @@ -730,16 +730,16 @@ jobs: assert.EqualValues(t, "mock-runner", payloads[5].WorkflowJob.RunnerName) assert.EqualValues(t, commitID, payloads[5].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[5].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[5].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[5].Repo.Name) + assert.EqualValues(t, "user2/repo1", payloads[5].Repo.FullName) assert.EqualValues(t, "completed", payloads[6].Action) assert.EqualValues(t, "completed", payloads[6].WorkflowJob.Status) assert.EqualValues(t, "failure", payloads[6].WorkflowJob.Conclusion) assert.EqualValues(t, "mock-runner", payloads[6].WorkflowJob.RunnerName) assert.EqualValues(t, commitID, payloads[6].WorkflowJob.HeadSha) - assert.EqualValues(t, "repo1", payloads[6].Repository.Name) - assert.EqualValues(t, "user2/repo1", payloads[6].Repository.FullName) + assert.EqualValues(t, "repo1", payloads[6].Repo.Name) + 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, payloads[6].WorkflowJob.RunURL) assert.Contains(t, payloads[6].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 1))