From da2180e0291efda15a907551c75c7485df0992b0 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Tue, 25 Feb 2025 12:36:11 +0100 Subject: [PATCH] fix naming of htmlurl --- modules/structs/repo_actions.go | 2 +- services/webhook/notifier.go | 2 +- tests/integration/repo_webhook_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/structs/repo_actions.go b/modules/structs/repo_actions.go index 46e3d35e30754..22409b4aff7fd 100644 --- a/modules/structs/repo_actions.go +++ b/modules/structs/repo_actions.go @@ -113,7 +113,7 @@ type ActionWorkflowStep struct { type ActionWorkflowJob struct { ID int64 `json:"id"` URL string `json:"url"` - HtmlURL string `json:"html_url"` + HTMLURL string `json:"html_url"` RunID int64 `json:"run_id"` RunURL string `json:"run_url"` Name string `json:"name"` diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index d1dc1d281cfc4..9692cbc59c1f8 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -1004,7 +1004,7 @@ func (*webhookNotifier) WorkflowJobStatusUpdate(ctx context.Context, repo *repo_ ID: job.ID, // missing api endpoint for this location URL: fmt.Sprintf("%s/actions/runs/%d/jobs/%d", repo.APIURL(), job.RunID, job.ID), - HtmlURL: fmt.Sprintf("%s/jobs/%d", job.Run.HTMLURL(), jobIndex), + HTMLURL: fmt.Sprintf("%s/jobs/%d", job.Run.HTMLURL(), jobIndex), RunID: job.RunID, // Missing api endpoint for this location, artifacts are available under a nested url RunURL: fmt.Sprintf("%s/actions/runs/%d", repo.APIURL(), job.RunID), diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 9bec44c5a6bad..637c5afd4dc7a 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -704,7 +704,7 @@ jobs: assert.EqualValues(t, "user2/repo1", payloads[3].Repository.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)) + assert.Contains(t, payloads[3].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 0)) assert.Len(t, payloads[3].WorkflowJob.Steps, 1) assert.EqualValues(t, "queued", payloads[4].Action) @@ -742,7 +742,7 @@ jobs: assert.EqualValues(t, "user2/repo1", payloads[6].Repository.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)) + assert.Contains(t, payloads[6].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 1)) assert.Len(t, payloads[6].WorkflowJob.Steps, 2) }) }