Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion pro/api/projects/runners.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"net/http"

"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/pro_interfaces"
)

Expand All @@ -16,7 +17,33 @@ type ProjectRunnerControllerImpl struct {
}

func (c *ProjectRunnerControllerImpl) GetRunners(w http.ResponseWriter, r *http.Request) {
helpers.WriteJSON(w, http.StatusOK, []any{})
project := helpers.GetFromContext(r, "project").(db.Project)
store := helpers.Store(r)

projectRunners, err := store.GetRunners(project.ID, false, db.RunnerFilterIgnoreTags, nil)
if err != nil {
panic(err)
}

globalRunners, err := store.GetAllRunners(false, true, db.RunnerFilterHasAnyTag, nil)
if err != nil {
panic(err)
}

helpers.WriteJSON(w, http.StatusOK, mergeProjectRunnersList(projectRunners, globalRunners))
}

// mergeProjectRunnersList returns project runners plus active global runners that have tags.
func mergeProjectRunnersList(projectRunners, globalRunners []db.Runner) []db.Runner {
result := make([]db.Runner, 0, len(projectRunners)+len(globalRunners))
result = append(result, projectRunners...)
for _, runner := range globalRunners {
if !runner.Active || len(runner.Tags) == 0 {
continue
}
result = append(result, runner)
}
return result
}

func (c *ProjectRunnerControllerImpl) AddRunner(w http.ResponseWriter, r *http.Request) {
Expand Down
28 changes: 28 additions & 0 deletions pro/api/projects/runners_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package projects

import (
"testing"

"github.com/semaphoreui/semaphore/db"
"github.com/stretchr/testify/assert"
)

func Test_mergeProjectRunnersList(t *testing.T) {
projectID := 1

projectRunners := []db.Runner{
{ID: 1, ProjectID: &projectID, Name: "project-runner", Active: true},
}

globalRunners := []db.Runner{
{ID: 2, Name: "active-tagged", Active: true, Tags: []string{"prod"}},
{ID: 3, Name: "inactive-tagged", Active: false, Tags: []string{"prod"}},
{ID: 4, Name: "active-untagged", Active: true, Tags: nil},
}

result := mergeProjectRunnersList(projectRunners, globalRunners)

assert.Len(t, result, 2)
assert.Equal(t, 1, result[0].ID)
assert.Equal(t, 2, result[1].ID)
}
8 changes: 7 additions & 1 deletion pro/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ module github.com/semaphoreui/semaphore/pro

go 1.24.6

require github.com/semaphoreui/semaphore v0.0.0-20250712180151-72836311c5b9
require (
github.com/semaphoreui/semaphore v0.0.0-20250712180151-72836311c5b9
github.com/stretchr/testify v1.11.1
)

require (
dario.cat/mergo v1.0.1 // indirect
Expand All @@ -13,6 +16,7 @@ require (
github.com/cloudflare/circl v1.6.3 // indirect
github.com/creack/pty v1.1.24 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
Expand All @@ -35,6 +39,7 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
Expand All @@ -47,6 +52,7 @@ require (
golang.org/x/sys v0.41.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.66.10 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
Expand Down
Loading