Use job_id for the api endpoint

Author: lunny

models/actions/run_job.go

@@ -60,6 +60,17 @@ func (job *ActionRunJob) LoadRun(ctx context.Context) error {
 	return nil
 }
 
+func (job *ActionRunJob) LoadRepo(ctx context.Context) error {
+	if job.Repo == nil {
+		repo, err := repo_model.GetRepositoryByID(ctx, job.RepoID)
+		if err != nil {
+			return err
+		}
+		job.Repo = repo
+	}
+	return nil
+}
+
 // LoadAttributes load Run if not loaded
 func (job *ActionRunJob) LoadAttributes(ctx context.Context) error {
 	if job == nil {

routers/api/v1/api.go

@@ -1168,8 +1168,8 @@ func Routes() *web.Router {
 					m.Post("/{workflow_id}/dispatches", reqRepoWriter(unit.TypeActions), bind(api.CreateActionWorkflowDispatch{}), repo.ActionsDispatchWorkflow)
 				}, context.ReferencesGitRepo(), reqToken(), reqRepoReader(unit.TypeActions))
 
-				m.Group("/actions/runs", func() {
-					m.Get("/{run}/jobs/{job}/logs", repo.DownloadActionsRunJobLogs)
+				m.Group("/actions/jobs", func() {
+					m.Get("/{job_id}/logs", repo.DownloadActionsRunJobLogs)
 				}, reqToken(), reqRepoReader(unit.TypeActions))
 
 				m.Group("/hooks/git", func() {

routers/api/v1/repo/actions_run.go

@@ -20,7 +20,7 @@ func getRunID(ctx *context.APIContext) int64 {
 }
 
 func DownloadActionsRunJobLogs(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/actions/runs/{run}/jobs/{job}/logs repository downloadActionsRunJobLogs
+	// swagger:operation GET /repos/{owner}/{repo}/actions/jobs/{job_id}/logs repository downloadActionsRunJobLogs
 	// ---
 	// summary: Downloads the logs for a workflow run redirects to blob url
 	// produces:
@@ -36,12 +36,7 @@ func DownloadActionsRunJobLogs(ctx *context.APIContext) {
 	//   description: name of the repository
 	//   type: string
 	//   required: true
-	// - name: run
-	//   in: path
-	//   description: id of the run, this could be latest
-	//   type: integer
-	//   required: true
-	// - name: job
+	// - name: job_id
 	//   in: path
 	//   description: id of the job
 	//   type: integer
@@ -54,7 +49,20 @@ func DownloadActionsRunJobLogs(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"
 
-	runID := getRunID(ctx)
-	jobIndex := ctx.PathParamInt64("job")
-	common.DownloadActionsRunJobLogs(ctx.Base, ctx.Repo.Repository, runID, jobIndex)
+	jobID := ctx.PathParamInt64("job_id")
+	if jobID == 0 {
+		ctx.APIError(400, "invalid job id")
+		return
+	}
+	curJob, err := actions_model.GetRunJobByID(ctx, jobID)
+	if err != nil {
+		ctx.APIErrorInternal(err)
+		return
+	}
+	if err := curJob.LoadRepo(ctx); err != nil {
+		ctx.APIErrorInternal(err)
+		return
+	}
+
+	common.DownloadActionsRunJobLogs(ctx.Base, ctx.Repo.Repository, curJob)
 }

routers/common/actions.go

@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/gitea/services/context"
 )
 
-func DownloadActionsRunJobLogs(ctx *context.Base, ctxRepo *repo_model.Repository, runID, jobIndex int64) {
+func DownloadActionsRunJobLogsWithIndex(ctx *context.Base, ctxRepo *repo_model.Repository, runID, jobIndex int64) {
 	if runID == 0 {
 		ctx.HTTPError(http.StatusBadRequest, "invalid run id")
 		return
@@ -33,10 +33,6 @@ func DownloadActionsRunJobLogs(ctx *context.Base, ctxRepo *repo_model.Repository
 		ctx.HTTPError(http.StatusInternalServerError, err.Error())
 		return
 	}
-	if runJobs[0].Repo.ID != ctxRepo.ID {
-		ctx.HTTPError(http.StatusNotFound)
-		return
-	}
 
 	var curJob *actions_model.ActionRunJob
 	if jobIndex >= 0 && jobIndex < int64(len(runJobs)) {
@@ -47,6 +43,15 @@ func DownloadActionsRunJobLogs(ctx *context.Base, ctxRepo *repo_model.Repository
 		return
 	}
 
+	DownloadActionsRunJobLogs(ctx, ctxRepo, curJob)
+}
+
+func DownloadActionsRunJobLogs(ctx *context.Base, ctxRepo *repo_model.Repository, curJob *actions_model.ActionRunJob) {
+	if curJob.Repo.ID != ctxRepo.ID {
+		ctx.HTTPError(http.StatusNotFound)
+		return
+	}
+
 	if curJob.TaskID == 0 {
 		ctx.HTTPError(http.StatusNotFound, "job is not started")
 		return

routers/web/repo/actions/view.go

@@ -477,7 +477,7 @@ func Logs(ctx *context_module.Context) {
 		return
 	}
 
-	common.DownloadActionsRunJobLogs(ctx.Base, ctx.Repo.Repository, run.ID, jobIndex)
+	common.DownloadActionsRunJobLogsWithIndex(ctx.Base, ctx.Repo.Repository, run.ID, jobIndex)
 }
 
 func Cancel(ctx *context_module.Context) {

templates/swagger/v1_json.tmpl

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	actions_model "code.gitea.io/gitea/models/actions"
 	auth_model "code.gitea.io/gitea/models/auth"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
@@ -36,7 +37,7 @@ func TestDownloadTaskLogs(t *testing.T) {
 		{
 			treePath: ".gitea/workflows/download-task-logs-zstd.yml",
 			fileContent: `name: download-task-logs-zstd
-on: 
+on:
   push:
     paths:
       - '.gitea/workflows/download-task-logs-zstd.yml'
@@ -68,7 +69,7 @@ jobs:
 		{
 			treePath: ".gitea/workflows/download-task-logs-no-zstd.yml",
 			fileContent: `name: download-task-logs-no-zstd
-on: 
+on:
   push:
     paths:
       - '.gitea/workflows/download-task-logs-no-zstd.yml'
@@ -151,8 +152,14 @@ jobs:
 				}
 
 				runID, _ := strconv.ParseInt(task.Context.GetFields()["run_id"].GetStringValue(), 10, 64)
+
+				jobs, err := actions_model.GetRunJobsByRunID(t.Context(), runID)
+				assert.NoError(t, err)
+				assert.Len(t, jobs, 1)
+				jobID := jobs[0].ID
+
 				// download task logs from API and check content
-				req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/runs/%d/jobs/0/logs", user2.Name, repo.Name, runID)).
+				req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/jobs/%d/logs", user2.Name, repo.Name, jobID)).
 					AddTokenAuth(token)
 				resp = MakeRequest(t, req, http.StatusOK)
 				logTextLines = strings.Split(strings.TrimSpace(resp.Body.String()), "\n")