mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-01-05 06:38:46 +00:00
Merge pull request '[gitea] week 2024-53 cherry pick (gitea/main -> forgejo)' (#6391) from earl-warren/wcp/2024-53 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6391 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
commit
8d6f0d49c6
11 changed files with 806 additions and 11 deletions
|
@ -96,3 +96,14 @@
|
||||||
num_issues: 0
|
num_issues: 0
|
||||||
num_closed_issues: 0
|
num_closed_issues: 0
|
||||||
archived_unix: 0
|
archived_unix: 0
|
||||||
|
|
||||||
|
-
|
||||||
|
id: 10
|
||||||
|
repo_id: 3
|
||||||
|
org_id: 0
|
||||||
|
name: repo3label1
|
||||||
|
color: '#112233'
|
||||||
|
exclusive: false
|
||||||
|
num_issues: 0
|
||||||
|
num_closed_issues: 0
|
||||||
|
archived_unix: 0
|
||||||
|
|
|
@ -353,6 +353,17 @@ func GetLabelIDsInRepoByNames(ctx context.Context, repoID int64, labelNames []st
|
||||||
Find(&labelIDs)
|
Find(&labelIDs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetLabelIDsInOrgByNames returns a list of labelIDs by names in a given org.
|
||||||
|
func GetLabelIDsInOrgByNames(ctx context.Context, orgID int64, labelNames []string) ([]int64, error) {
|
||||||
|
labelIDs := make([]int64, 0, len(labelNames))
|
||||||
|
return labelIDs, db.GetEngine(ctx).Table("label").
|
||||||
|
Where("org_id = ?", orgID).
|
||||||
|
In("name", labelNames).
|
||||||
|
Asc("name").
|
||||||
|
Cols("id").
|
||||||
|
Find(&labelIDs)
|
||||||
|
}
|
||||||
|
|
||||||
// BuildLabelNamesIssueIDsCondition returns a builder where get issue ids match label names
|
// BuildLabelNamesIssueIDsCondition returns a builder where get issue ids match label names
|
||||||
func BuildLabelNamesIssueIDsCondition(labelNames []string) *builder.Builder {
|
func BuildLabelNamesIssueIDsCondition(labelNames []string) *builder.Builder {
|
||||||
return builder.Select("issue_label.issue_id").
|
return builder.Select("issue_label.issue_id").
|
||||||
|
|
|
@ -32,7 +32,7 @@ var (
|
||||||
// issueNumericPattern matches string that references to a numeric issue, e.g. #1287
|
// issueNumericPattern matches string that references to a numeric issue, e.g. #1287
|
||||||
issueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[|\'|\")([#!][0-9]+)(?:\s|$|\)|\]|\'|\"|[:;,.?!]\s|[:;,.?!]$)`)
|
issueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[|\'|\")([#!][0-9]+)(?:\s|$|\)|\]|\'|\"|[:;,.?!]\s|[:;,.?!]$)`)
|
||||||
// issueAlphanumericPattern matches string that references to an alphanumeric issue, e.g. ABC-1234
|
// issueAlphanumericPattern matches string that references to an alphanumeric issue, e.g. ABC-1234
|
||||||
issueAlphanumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[|\"|\')([A-Z]{1,10}-[1-9][0-9]*)(?:\s|$|\)|\]|:|\.(\s|$)|\"|\')`)
|
issueAlphanumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[|\"|\')([A-Z]{1,10}-[1-9][0-9]*)(?:\s|$|\)|\]|:|\.(\s|$)|\"|\'|,)`)
|
||||||
// crossReferenceIssueNumericPattern matches string that references a numeric issue in a different repository
|
// crossReferenceIssueNumericPattern matches string that references a numeric issue in a different repository
|
||||||
// e.g. org/repo#12345
|
// e.g. org/repo#12345
|
||||||
crossReferenceIssueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([0-9a-zA-Z-_\.]+/[0-9a-zA-Z-_\.]+[#!][0-9]+)(?:\s|$|\)|\]|[:;,.?!]\s|[:;,.?!]$)`)
|
crossReferenceIssueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([0-9a-zA-Z-_\.]+/[0-9a-zA-Z-_\.]+[#!][0-9]+)(?:\s|$|\)|\]|[:;,.?!]\s|[:;,.?!]$)`)
|
||||||
|
|
|
@ -466,6 +466,7 @@ func TestRegExp_issueAlphanumericPattern(t *testing.T) {
|
||||||
"ABC-123:",
|
"ABC-123:",
|
||||||
"\"ABC-123\"",
|
"\"ABC-123\"",
|
||||||
"'ABC-123'",
|
"'ABC-123'",
|
||||||
|
"ABC-123, unknown PR",
|
||||||
}
|
}
|
||||||
falseTestCases := []string{
|
falseTestCases := []string{
|
||||||
"RC-08",
|
"RC-08",
|
||||||
|
|
|
@ -350,6 +350,9 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
|
||||||
labelIDs = append(labelIDs, int64(rv.Float()))
|
labelIDs = append(labelIDs, int64(rv.Float()))
|
||||||
case reflect.String:
|
case reflect.String:
|
||||||
labelNames = append(labelNames, rv.String())
|
labelNames = append(labelNames, rv.String())
|
||||||
|
default:
|
||||||
|
ctx.Error(http.StatusBadRequest, "InvalidLabel", "a label must be an integer or a string")
|
||||||
|
return nil, nil, fmt.Errorf("invalid label")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(labelIDs) > 0 && len(labelNames) > 0 {
|
if len(labelIDs) > 0 && len(labelNames) > 0 {
|
||||||
|
@ -357,11 +360,20 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
|
||||||
return nil, nil, fmt.Errorf("invalid labels")
|
return nil, nil, fmt.Errorf("invalid labels")
|
||||||
}
|
}
|
||||||
if len(labelNames) > 0 {
|
if len(labelNames) > 0 {
|
||||||
labelIDs, err = issues_model.GetLabelIDsInRepoByNames(ctx, ctx.Repo.Repository.ID, labelNames)
|
repoLabelIDs, err := issues_model.GetLabelIDsInRepoByNames(ctx, ctx.Repo.Repository.ID, labelNames)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetLabelIDsInRepoByNames", err)
|
ctx.Error(http.StatusInternalServerError, "GetLabelIDsInRepoByNames", err)
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
labelIDs = append(labelIDs, repoLabelIDs...)
|
||||||
|
if ctx.Repo.Owner.IsOrganization() {
|
||||||
|
orgLabelIDs, err := issues_model.GetLabelIDsInOrgByNames(ctx, ctx.Repo.Owner.ID, labelNames)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetLabelIDsInOrgByNames", err)
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
labelIDs = append(labelIDs, orgLabelIDs...)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
labels, err := issues_model.GetLabelsByIDs(ctx, labelIDs, "id", "repo_id", "org_id", "name", "exclusive")
|
labels, err := issues_model.GetLabelsByIDs(ctx, labelIDs, "id", "repo_id", "org_id", "name", "exclusive")
|
||||||
|
|
|
@ -85,6 +85,10 @@ func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *is
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if issue.MilestoneID == 0 {
|
||||||
|
issue.Milestone = nil
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ func TestChangeMilestoneAssign(t *testing.T) {
|
||||||
|
|
||||||
oldMilestoneID := issue.MilestoneID
|
oldMilestoneID := issue.MilestoneID
|
||||||
issue.MilestoneID = 2
|
issue.MilestoneID = 2
|
||||||
|
require.NoError(t, issue.LoadMilestone(db.DefaultContext))
|
||||||
require.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
|
require.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
|
||||||
unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{
|
||||||
IssueID: issue.ID,
|
IssueID: issue.ID,
|
||||||
|
@ -32,4 +33,11 @@ func TestChangeMilestoneAssign(t *testing.T) {
|
||||||
OldMilestoneID: oldMilestoneID,
|
OldMilestoneID: oldMilestoneID,
|
||||||
})
|
})
|
||||||
unittest.CheckConsistencyFor(t, &issues_model.Milestone{}, &issues_model.Issue{})
|
unittest.CheckConsistencyFor(t, &issues_model.Milestone{}, &issues_model.Issue{})
|
||||||
|
assert.NotNil(t, issue.Milestone)
|
||||||
|
|
||||||
|
oldMilestoneID = issue.MilestoneID
|
||||||
|
issue.MilestoneID = 0
|
||||||
|
require.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
|
||||||
|
assert.EqualValues(t, 0, issue.MilestoneID)
|
||||||
|
assert.Nil(t, issue.Milestone)
|
||||||
}
|
}
|
||||||
|
|
417
tests/integration/actions_job_test.go
Normal file
417
tests/integration/actions_job_test.go
Normal file
|
@ -0,0 +1,417 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
actions_model "code.gitea.io/gitea/models/actions"
|
||||||
|
auth_model "code.gitea.io/gitea/models/auth"
|
||||||
|
"code.gitea.io/gitea/models/unittest"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
|
||||||
|
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestJobWithNeeds(t *testing.T) {
|
||||||
|
if !setting.Database.Type.IsSQLite3() {
|
||||||
|
t.Skip()
|
||||||
|
}
|
||||||
|
testCases := []struct {
|
||||||
|
treePath string
|
||||||
|
fileContent string
|
||||||
|
outcomes map[string]*mockTaskOutcome
|
||||||
|
expectedStatuses map[string]string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/job-with-needs.yml",
|
||||||
|
fileContent: `name: job-with-needs
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/job-with-needs.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo job1
|
||||||
|
job2:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [job1]
|
||||||
|
steps:
|
||||||
|
- run: echo job2
|
||||||
|
`,
|
||||||
|
outcomes: map[string]*mockTaskOutcome{
|
||||||
|
"job1": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
},
|
||||||
|
"job2": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expectedStatuses: map[string]string{
|
||||||
|
"job1": actions_model.StatusSuccess.String(),
|
||||||
|
"job2": actions_model.StatusSuccess.String(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/job-with-needs-fail.yml",
|
||||||
|
fileContent: `name: job-with-needs-fail
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/job-with-needs-fail.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo job1
|
||||||
|
job2:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [job1]
|
||||||
|
steps:
|
||||||
|
- run: echo job2
|
||||||
|
`,
|
||||||
|
outcomes: map[string]*mockTaskOutcome{
|
||||||
|
"job1": {
|
||||||
|
result: runnerv1.Result_RESULT_FAILURE,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expectedStatuses: map[string]string{
|
||||||
|
"job1": actions_model.StatusFailure.String(),
|
||||||
|
"job2": actions_model.StatusSkipped.String(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/job-with-needs-fail-if.yml",
|
||||||
|
fileContent: `name: job-with-needs-fail-if
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/job-with-needs-fail-if.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo job1
|
||||||
|
job2:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ always() }}
|
||||||
|
needs: [job1]
|
||||||
|
steps:
|
||||||
|
- run: echo job2
|
||||||
|
`,
|
||||||
|
outcomes: map[string]*mockTaskOutcome{
|
||||||
|
"job1": {
|
||||||
|
result: runnerv1.Result_RESULT_FAILURE,
|
||||||
|
},
|
||||||
|
"job2": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expectedStatuses: map[string]string{
|
||||||
|
"job1": actions_model.StatusFailure.String(),
|
||||||
|
"job2": actions_model.StatusSuccess.String(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
session := loginUser(t, user2.Name)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||||
|
|
||||||
|
apiRepo := createActionsTestRepo(t, token, "actions-jobs-with-needs", false)
|
||||||
|
runner := newMockRunner()
|
||||||
|
runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"})
|
||||||
|
|
||||||
|
for _, tc := range testCases {
|
||||||
|
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||||
|
// create the workflow file
|
||||||
|
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||||
|
fileResp := createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts)
|
||||||
|
|
||||||
|
// fetch and execute task
|
||||||
|
for i := 0; i < len(tc.outcomes); i++ {
|
||||||
|
task := runner.fetchTask(t)
|
||||||
|
jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id)
|
||||||
|
outcome := tc.outcomes[jobName]
|
||||||
|
assert.NotNil(t, outcome)
|
||||||
|
runner.execTask(t, task, outcome)
|
||||||
|
}
|
||||||
|
|
||||||
|
// check result
|
||||||
|
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/tasks", user2.Name, apiRepo.Name)).
|
||||||
|
AddTokenAuth(token)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
var actionTaskRespAfter api.ActionTaskResponse
|
||||||
|
DecodeJSON(t, resp, &actionTaskRespAfter)
|
||||||
|
for _, apiTask := range actionTaskRespAfter.Entries {
|
||||||
|
if apiTask.HeadSHA != fileResp.Commit.SHA {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
status := apiTask.Status
|
||||||
|
assert.Equal(t, status, tc.expectedStatuses[apiTask.Name])
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||||
|
doAPIDeleteRepository(httpContext)(t)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJobNeedsMatrix(t *testing.T) {
|
||||||
|
if !setting.Database.Type.IsSQLite3() {
|
||||||
|
t.Skip()
|
||||||
|
}
|
||||||
|
testCases := []struct {
|
||||||
|
treePath string
|
||||||
|
fileContent string
|
||||||
|
outcomes map[string]*mockTaskOutcome
|
||||||
|
expectedTaskNeeds map[string]*runnerv1.TaskNeed // jobID => TaskNeed
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/jobs-outputs-with-matrix.yml",
|
||||||
|
fileContent: `name: jobs-outputs-with-matrix
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/jobs-outputs-with-matrix.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
output_1: ${{ steps.gen_output.outputs.output_1 }}
|
||||||
|
output_2: ${{ steps.gen_output.outputs.output_2 }}
|
||||||
|
output_3: ${{ steps.gen_output.outputs.output_3 }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
version: [1, 2, 3]
|
||||||
|
steps:
|
||||||
|
- name: Generate output
|
||||||
|
id: gen_output
|
||||||
|
run: |
|
||||||
|
version="${{ matrix.version }}"
|
||||||
|
echo "output_${version}=${version}" >> "$GITHUB_OUTPUT"
|
||||||
|
job2:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [job1]
|
||||||
|
steps:
|
||||||
|
- run: echo '${{ toJSON(needs.job1.outputs) }}'
|
||||||
|
`,
|
||||||
|
outcomes: map[string]*mockTaskOutcome{
|
||||||
|
"job1 (1)": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "1",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"job1 (2)": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "",
|
||||||
|
"output_2": "2",
|
||||||
|
"output_3": "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"job1 (3)": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "3",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expectedTaskNeeds: map[string]*runnerv1.TaskNeed{
|
||||||
|
"job1": {
|
||||||
|
Result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
Outputs: map[string]string{
|
||||||
|
"output_1": "1",
|
||||||
|
"output_2": "2",
|
||||||
|
"output_3": "3",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/jobs-outputs-with-matrix-failure.yml",
|
||||||
|
fileContent: `name: jobs-outputs-with-matrix-failure
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/jobs-outputs-with-matrix-failure.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
output_1: ${{ steps.gen_output.outputs.output_1 }}
|
||||||
|
output_2: ${{ steps.gen_output.outputs.output_2 }}
|
||||||
|
output_3: ${{ steps.gen_output.outputs.output_3 }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
version: [1, 2, 3]
|
||||||
|
steps:
|
||||||
|
- name: Generate output
|
||||||
|
id: gen_output
|
||||||
|
run: |
|
||||||
|
version="${{ matrix.version }}"
|
||||||
|
echo "output_${version}=${version}" >> "$GITHUB_OUTPUT"
|
||||||
|
job2:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ always() }}
|
||||||
|
needs: [job1]
|
||||||
|
steps:
|
||||||
|
- run: echo '${{ toJSON(needs.job1.outputs) }}'
|
||||||
|
`,
|
||||||
|
outcomes: map[string]*mockTaskOutcome{
|
||||||
|
"job1 (1)": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "1",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"job1 (2)": {
|
||||||
|
result: runnerv1.Result_RESULT_FAILURE,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"job1 (3)": {
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
outputs: map[string]string{
|
||||||
|
"output_1": "",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "3",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expectedTaskNeeds: map[string]*runnerv1.TaskNeed{
|
||||||
|
"job1": {
|
||||||
|
Result: runnerv1.Result_RESULT_FAILURE,
|
||||||
|
Outputs: map[string]string{
|
||||||
|
"output_1": "1",
|
||||||
|
"output_2": "",
|
||||||
|
"output_3": "3",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
session := loginUser(t, user2.Name)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||||
|
|
||||||
|
apiRepo := createActionsTestRepo(t, token, "actions-jobs-outputs-with-matrix", false)
|
||||||
|
runner := newMockRunner()
|
||||||
|
runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"})
|
||||||
|
|
||||||
|
for _, tc := range testCases {
|
||||||
|
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||||
|
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||||
|
createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts)
|
||||||
|
|
||||||
|
for i := 0; i < len(tc.outcomes); i++ {
|
||||||
|
task := runner.fetchTask(t)
|
||||||
|
jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id)
|
||||||
|
outcome := tc.outcomes[jobName]
|
||||||
|
assert.NotNil(t, outcome)
|
||||||
|
runner.execTask(t, task, outcome)
|
||||||
|
}
|
||||||
|
|
||||||
|
task := runner.fetchTask(t)
|
||||||
|
actualTaskNeeds := task.Needs
|
||||||
|
assert.Len(t, actualTaskNeeds, len(tc.expectedTaskNeeds))
|
||||||
|
for jobID, tn := range tc.expectedTaskNeeds {
|
||||||
|
actualNeed := actualTaskNeeds[jobID]
|
||||||
|
assert.Equal(t, tn.Result, actualNeed.Result)
|
||||||
|
assert.Len(t, actualNeed.Outputs, len(tn.Outputs))
|
||||||
|
for outputKey, outputValue := range tn.Outputs {
|
||||||
|
assert.Equal(t, outputValue, actualNeed.Outputs[outputKey])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||||
|
doAPIDeleteRepository(httpContext)(t)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func createActionsTestRepo(t *testing.T, authToken, repoName string, isPrivate bool) *api.Repository {
|
||||||
|
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{
|
||||||
|
Name: repoName,
|
||||||
|
Private: isPrivate,
|
||||||
|
Readme: "Default",
|
||||||
|
AutoInit: true,
|
||||||
|
DefaultBranch: "main",
|
||||||
|
}).AddTokenAuth(authToken)
|
||||||
|
resp := MakeRequest(t, req, http.StatusCreated)
|
||||||
|
var apiRepo api.Repository
|
||||||
|
DecodeJSON(t, resp, &apiRepo)
|
||||||
|
return &apiRepo
|
||||||
|
}
|
||||||
|
|
||||||
|
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(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ContentBase64: base64.StdEncoding.EncodeToString([]byte(content)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func createWorkflowFile(t *testing.T, authToken, ownerName, repoName, treePath string, opts *api.CreateFileOptions) *api.FileResponse {
|
||||||
|
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", ownerName, repoName, treePath), opts).
|
||||||
|
AddTokenAuth(authToken)
|
||||||
|
resp := MakeRequest(t, req, http.StatusCreated)
|
||||||
|
var fileResponse api.FileResponse
|
||||||
|
DecodeJSON(t, resp, &fileResponse)
|
||||||
|
return &fileResponse
|
||||||
|
}
|
||||||
|
|
||||||
|
// getTaskJobNameByTaskID get the job name of the task by task ID
|
||||||
|
// there is currently not an API for querying a task by ID so we have to list all the tasks
|
||||||
|
func getTaskJobNameByTaskID(t *testing.T, authToken, ownerName, repoName string, taskID int64) string {
|
||||||
|
// FIXME: we may need to query several pages
|
||||||
|
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/tasks", ownerName, repoName)).
|
||||||
|
AddTokenAuth(authToken)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
var taskRespBefore api.ActionTaskResponse
|
||||||
|
DecodeJSON(t, resp, &taskRespBefore)
|
||||||
|
for _, apiTask := range taskRespBefore.Entries {
|
||||||
|
if apiTask.ID == taskID {
|
||||||
|
return apiTask.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
163
tests/integration/actions_log_test.go
Normal file
163
tests/integration/actions_log_test.go
Normal file
|
@ -0,0 +1,163 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
auth_model "code.gitea.io/gitea/models/auth"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
"code.gitea.io/gitea/models/unittest"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/storage"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
|
||||||
|
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDownloadTaskLogs(t *testing.T) {
|
||||||
|
if !setting.Database.Type.IsSQLite3() {
|
||||||
|
t.Skip()
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
testCases := []struct {
|
||||||
|
treePath string
|
||||||
|
fileContent string
|
||||||
|
outcome *mockTaskOutcome
|
||||||
|
zstdEnabled bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/download-task-logs-zstd.yml",
|
||||||
|
fileContent: `name: download-task-logs-zstd
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/download-task-logs-zstd.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo job1 with zstd enabled
|
||||||
|
`,
|
||||||
|
outcome: &mockTaskOutcome{
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
logRows: []*runnerv1.LogRow{
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(1 * time.Second)),
|
||||||
|
Content: " \U0001F433 docker create image",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(2 * time.Second)),
|
||||||
|
Content: "job1 zstd enabled",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(3 * time.Second)),
|
||||||
|
Content: "\U0001F3C1 Job succeeded",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
zstdEnabled: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
treePath: ".gitea/workflows/download-task-logs-no-zstd.yml",
|
||||||
|
fileContent: `name: download-task-logs-no-zstd
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '.gitea/workflows/download-task-logs-no-zstd.yml'
|
||||||
|
jobs:
|
||||||
|
job1:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- run: echo job1 with zstd disabled
|
||||||
|
`,
|
||||||
|
outcome: &mockTaskOutcome{
|
||||||
|
result: runnerv1.Result_RESULT_SUCCESS,
|
||||||
|
logRows: []*runnerv1.LogRow{
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(4 * time.Second)),
|
||||||
|
Content: " \U0001F433 docker create image",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(5 * time.Second)),
|
||||||
|
Content: "job1 zstd disabled",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Time: timestamppb.New(now.Add(6 * time.Second)),
|
||||||
|
Content: "\U0001F3C1 Job succeeded",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
zstdEnabled: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||||
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
session := loginUser(t, user2.Name)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||||
|
|
||||||
|
apiRepo := createActionsTestRepo(t, token, "actions-download-task-logs", false)
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID})
|
||||||
|
runner := newMockRunner()
|
||||||
|
runner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-runner", []string{"ubuntu-latest"})
|
||||||
|
|
||||||
|
for _, tc := range testCases {
|
||||||
|
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||||
|
var resetFunc func()
|
||||||
|
if tc.zstdEnabled {
|
||||||
|
resetFunc = test.MockVariableValue(&setting.Actions.LogCompression, "zstd")
|
||||||
|
assert.True(t, setting.Actions.LogCompression.IsZstd())
|
||||||
|
} else {
|
||||||
|
resetFunc = test.MockVariableValue(&setting.Actions.LogCompression, "none")
|
||||||
|
assert.False(t, setting.Actions.LogCompression.IsZstd())
|
||||||
|
}
|
||||||
|
|
||||||
|
// create the workflow file
|
||||||
|
opts := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||||
|
createWorkflowFile(t, token, user2.Name, repo.Name, tc.treePath, opts)
|
||||||
|
|
||||||
|
// fetch and execute task
|
||||||
|
task := runner.fetchTask(t)
|
||||||
|
runner.execTask(t, task, tc.outcome)
|
||||||
|
|
||||||
|
// check whether the log file exists
|
||||||
|
logFileName := fmt.Sprintf("%s/%02x/%d.log", repo.FullName(), task.Id%256, task.Id)
|
||||||
|
if setting.Actions.LogCompression.IsZstd() {
|
||||||
|
logFileName += ".zst"
|
||||||
|
}
|
||||||
|
_, err := storage.Actions.Stat(logFileName)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// download task logs and check content
|
||||||
|
runIndex := task.Context.GetFields()["run_number"].GetStringValue()
|
||||||
|
req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/logs", user2.Name, repo.Name, runIndex)).
|
||||||
|
AddTokenAuth(token)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
logTextLines := strings.Split(strings.TrimSpace(resp.Body.String()), "\n")
|
||||||
|
assert.Len(t, logTextLines, len(tc.outcome.logRows))
|
||||||
|
for idx, lr := range tc.outcome.logRows {
|
||||||
|
assert.Equal(
|
||||||
|
t,
|
||||||
|
fmt.Sprintf("%s %s", lr.Time.AsTime().Format("2006-01-02T15:04:05.0000000Z07:00"), lr.Content),
|
||||||
|
logTextLines[idx],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
resetFunc()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository)
|
||||||
|
doAPIDeleteRepository(httpContext)(t)
|
||||||
|
})
|
||||||
|
}
|
162
tests/integration/actions_runner_test.go
Normal file
162
tests/integration/actions_runner_test.go
Normal file
|
@ -0,0 +1,162 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
auth_model "code.gitea.io/gitea/models/auth"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
|
||||||
|
pingv1 "code.gitea.io/actions-proto-go/ping/v1"
|
||||||
|
"code.gitea.io/actions-proto-go/ping/v1/pingv1connect"
|
||||||
|
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
|
||||||
|
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
|
||||||
|
"connectrpc.com/connect"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
)
|
||||||
|
|
||||||
|
type mockRunner struct {
|
||||||
|
client *mockRunnerClient
|
||||||
|
}
|
||||||
|
|
||||||
|
type mockRunnerClient struct {
|
||||||
|
pingServiceClient pingv1connect.PingServiceClient
|
||||||
|
runnerServiceClient runnerv1connect.RunnerServiceClient
|
||||||
|
}
|
||||||
|
|
||||||
|
func newMockRunner() *mockRunner {
|
||||||
|
client := newMockRunnerClient("", "")
|
||||||
|
return &mockRunner{client: client}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newMockRunnerClient(uuid, token string) *mockRunnerClient {
|
||||||
|
baseURL := fmt.Sprintf("%sapi/actions", setting.AppURL)
|
||||||
|
|
||||||
|
opt := connect.WithInterceptors(connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
|
||||||
|
return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
|
||||||
|
if uuid != "" {
|
||||||
|
req.Header().Set("x-runner-uuid", uuid)
|
||||||
|
}
|
||||||
|
if token != "" {
|
||||||
|
req.Header().Set("x-runner-token", token)
|
||||||
|
}
|
||||||
|
return next(ctx, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
|
||||||
|
client := &mockRunnerClient{
|
||||||
|
pingServiceClient: pingv1connect.NewPingServiceClient(http.DefaultClient, baseURL, opt),
|
||||||
|
runnerServiceClient: runnerv1connect.NewRunnerServiceClient(http.DefaultClient, baseURL, opt),
|
||||||
|
}
|
||||||
|
|
||||||
|
return client
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *mockRunner) doPing(t *testing.T) {
|
||||||
|
resp, err := r.client.pingServiceClient.Ping(context.Background(), connect.NewRequest(&pingv1.PingRequest{
|
||||||
|
Data: "mock-runner",
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, "Hello, mock-runner!", resp.Msg.Data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *mockRunner) doRegister(t *testing.T, name, token string, labels []string) {
|
||||||
|
r.doPing(t)
|
||||||
|
resp, err := r.client.runnerServiceClient.Register(context.Background(), connect.NewRequest(&runnerv1.RegisterRequest{
|
||||||
|
Name: name,
|
||||||
|
Token: token,
|
||||||
|
Version: "mock-runner-version",
|
||||||
|
Labels: labels,
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
r.client = newMockRunnerClient(resp.Msg.Runner.Uuid, resp.Msg.Runner.Token)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *mockRunner) registerAsRepoRunner(t *testing.T, ownerName, repoName, runnerName string, labels []string) {
|
||||||
|
if !setting.Database.Type.IsSQLite3() {
|
||||||
|
// registering a mock runner when using a database other than SQLite leaves leftovers
|
||||||
|
t.FailNow()
|
||||||
|
}
|
||||||
|
session := loginUser(t, ownerName)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||||
|
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/runners/registration-token", ownerName, repoName)).AddTokenAuth(token)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
var registrationToken struct {
|
||||||
|
Token string `json:"token"`
|
||||||
|
}
|
||||||
|
DecodeJSON(t, resp, ®istrationToken)
|
||||||
|
r.doRegister(t, runnerName, registrationToken.Token, labels)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *mockRunner) fetchTask(t *testing.T, timeout ...time.Duration) *runnerv1.Task {
|
||||||
|
fetchTimeout := 10 * time.Second
|
||||||
|
if len(timeout) > 0 {
|
||||||
|
fetchTimeout = timeout[0]
|
||||||
|
}
|
||||||
|
ddl := time.Now().Add(fetchTimeout)
|
||||||
|
var task *runnerv1.Task
|
||||||
|
for time.Now().Before(ddl) {
|
||||||
|
resp, err := r.client.runnerServiceClient.FetchTask(context.Background(), connect.NewRequest(&runnerv1.FetchTaskRequest{
|
||||||
|
TasksVersion: 0,
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
if resp.Msg.Task != nil {
|
||||||
|
task = resp.Msg.Task
|
||||||
|
break
|
||||||
|
}
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}
|
||||||
|
assert.NotNil(t, task, "failed to fetch a task")
|
||||||
|
return task
|
||||||
|
}
|
||||||
|
|
||||||
|
type mockTaskOutcome struct {
|
||||||
|
result runnerv1.Result
|
||||||
|
outputs map[string]string
|
||||||
|
logRows []*runnerv1.LogRow
|
||||||
|
execTime time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTaskOutcome) {
|
||||||
|
for idx, lr := range outcome.logRows {
|
||||||
|
resp, err := r.client.runnerServiceClient.UpdateLog(context.Background(), connect.NewRequest(&runnerv1.UpdateLogRequest{
|
||||||
|
TaskId: task.Id,
|
||||||
|
Index: int64(idx),
|
||||||
|
Rows: []*runnerv1.LogRow{lr},
|
||||||
|
NoMore: idx == len(outcome.logRows)-1,
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.EqualValues(t, idx+1, resp.Msg.AckIndex)
|
||||||
|
}
|
||||||
|
sentOutputKeys := make([]string, 0, len(outcome.outputs))
|
||||||
|
for outputKey, outputValue := range outcome.outputs {
|
||||||
|
resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
||||||
|
State: &runnerv1.TaskState{
|
||||||
|
Id: task.Id,
|
||||||
|
Result: runnerv1.Result_RESULT_UNSPECIFIED,
|
||||||
|
},
|
||||||
|
Outputs: map[string]string{outputKey: outputValue},
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
sentOutputKeys = append(sentOutputKeys, outputKey)
|
||||||
|
assert.ElementsMatch(t, sentOutputKeys, resp.Msg.SentOutputs)
|
||||||
|
}
|
||||||
|
time.Sleep(outcome.execTime)
|
||||||
|
resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
||||||
|
State: &runnerv1.TaskState{
|
||||||
|
Id: task.Id,
|
||||||
|
Result: outcome.result,
|
||||||
|
StoppedAt: timestamppb.Now(),
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, outcome.result, resp.Msg.State.Result)
|
||||||
|
}
|
|
@ -120,27 +120,33 @@ func TestAPIAddIssueLabels(t *testing.T) {
|
||||||
func TestAPIAddIssueLabelsWithLabelNames(t *testing.T) {
|
func TestAPIAddIssueLabelsWithLabelNames(t *testing.T) {
|
||||||
require.NoError(t, unittest.LoadFixtures())
|
require.NoError(t, unittest.LoadFixtures())
|
||||||
|
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
|
||||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 6, RepoID: repo.ID})
|
||||||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
||||||
|
repoLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 10, RepoID: repo.ID})
|
||||||
|
orgLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4, OrgID: owner.ID})
|
||||||
|
|
||||||
session := loginUser(t, owner.Name)
|
user1Session := loginUser(t, "user1")
|
||||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
|
token := getTokenForLoggedInUser(t, user1Session, auth_model.AccessTokenScopeWriteIssue)
|
||||||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
|
||||||
repo.OwnerName, repo.Name, issue.Index)
|
// add the org label and the repo label to the issue
|
||||||
|
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels", owner.Name, repo.Name, issue.Index)
|
||||||
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
||||||
Labels: []any{"label1", "label2"},
|
Labels: []any{repoLabel.Name, orgLabel.Name},
|
||||||
}).AddTokenAuth(token)
|
}).AddTokenAuth(token)
|
||||||
resp := MakeRequest(t, req, http.StatusOK)
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
var apiLabels []*api.Label
|
var apiLabels []*api.Label
|
||||||
DecodeJSON(t, resp, &apiLabels)
|
DecodeJSON(t, resp, &apiLabels)
|
||||||
assert.Len(t, apiLabels, unittest.GetCount(t, &issues_model.IssueLabel{IssueID: issue.ID}))
|
assert.Len(t, apiLabels, unittest.GetCount(t, &issues_model.IssueLabel{IssueID: issue.ID}))
|
||||||
|
|
||||||
var apiLabelNames []string
|
var apiLabelNames []string
|
||||||
for _, label := range apiLabels {
|
for _, label := range apiLabels {
|
||||||
apiLabelNames = append(apiLabelNames, label.Name)
|
apiLabelNames = append(apiLabelNames, label.Name)
|
||||||
}
|
}
|
||||||
assert.ElementsMatch(t, apiLabelNames, []string{"label1", "label2"})
|
assert.ElementsMatch(t, apiLabelNames, []string{repoLabel.Name, orgLabel.Name})
|
||||||
|
|
||||||
|
// delete labels
|
||||||
|
req = NewRequest(t, "DELETE", urlStr).AddTokenAuth(token)
|
||||||
|
MakeRequest(t, req, http.StatusNoContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
||||||
|
|
Loading…
Reference in a new issue