-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat(runners): add register endpoint * feat(runners): add remote runner * refactor(runners): move functionality TaskRunner -> AnsibleJobRunner * fix(runners): init job * chore(runners): remote unused field * feat(runners): use external logger from AnsibleJobRunner * refactor(runners): remove status field * refactor(runners): remove mutation from job * feat(runners): pass username and verison to task * test(runners): fix tests * fix(runners): params for Run * feat(runners): implement runner selection * feat(runners): fill required fields * fix(runners): session block * feat(runners): kill process * refactor(runners): rename fields to public * feat(runners): remote runner functionallity * refactor(runners): remove unused class * fix(runners): send json * feat(runners): runner registration * feat(runners): logging * feat(runners): server <-> running communication works * feat(runners): pass creds to runenr
- Loading branch information
Showing
25 changed files
with
1,361 additions
and
858 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package runners | ||
|
|
||
| import ( | ||
| "github.com/ansible-semaphore/semaphore/api/helpers" | ||
| "github.com/ansible-semaphore/semaphore/db" | ||
| "github.com/ansible-semaphore/semaphore/services/runners" | ||
| "github.com/ansible-semaphore/semaphore/util" | ||
| "github.com/gorilla/context" | ||
| "net/http" | ||
| ) | ||
|
|
||
| func RunnerMiddleware(next http.Handler) http.Handler { | ||
| return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
|
|
||
| runnerID, err := helpers.GetIntParam("runner_id", w, r) | ||
|
|
||
| if err != nil { | ||
| helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{ | ||
| "error": "runner_id required", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| store := helpers.Store(r) | ||
|
|
||
| runner, err := store.GetGlobalRunner(runnerID) | ||
|
|
||
| if err != nil { | ||
| helpers.WriteJSON(w, http.StatusNotFound, map[string]string{ | ||
| "error": "Runner not found", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| context.Set(r, "runner", runner) | ||
| next.ServeHTTP(w, r) | ||
| }) | ||
| } | ||
|
|
||
| func GetRunner(w http.ResponseWriter, r *http.Request) { | ||
| runner := context.Get(r, "runner").(db.Runner) | ||
|
|
||
| data := runners.RunnerState{ | ||
| AccessKeys: make(map[int]db.AccessKey), | ||
| } | ||
|
|
||
| tasks := helpers.TaskPool(r).GetRunningTasks() | ||
|
|
||
| for _, tsk := range tasks { | ||
| if tsk.RunnerID != runner.ID { | ||
| continue | ||
| } | ||
|
|
||
| if tsk.Task.Status == db.TaskRunningStatus { | ||
|
|
||
| data.NewJobs = append(data.NewJobs, runners.JobData{ | ||
| Username: tsk.Username, | ||
| IncomingVersion: tsk.IncomingVersion, | ||
| Task: tsk.Task, | ||
| Template: tsk.Template, | ||
| Inventory: tsk.Inventory, | ||
| Repository: tsk.Repository, | ||
| Environment: tsk.Environment, | ||
| }) | ||
|
|
||
| if tsk.Inventory.SSHKeyID != nil { | ||
| data.AccessKeys[*tsk.Inventory.SSHKeyID] = tsk.Inventory.SSHKey | ||
| } | ||
|
|
||
| if tsk.Inventory.BecomeKeyID != nil { | ||
| data.AccessKeys[*tsk.Inventory.BecomeKeyID] = tsk.Inventory.BecomeKey | ||
| } | ||
|
|
||
| data.AccessKeys[tsk.Repository.SSHKeyID] = tsk.Repository.SSHKey | ||
|
|
||
| } else { | ||
| data.CurrentJobs = append(data.CurrentJobs, runners.JobState{ | ||
| ID: tsk.Task.ID, | ||
| Status: tsk.Task.Status, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| helpers.WriteJSON(w, http.StatusOK, data) | ||
| } | ||
|
|
||
| func UpdateRunner(w http.ResponseWriter, r *http.Request) { | ||
| var body runners.RunnerProgress | ||
|
|
||
| if !helpers.Bind(w, r, &body) { | ||
| helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{ | ||
| "error": "Invalid format", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| taskPool := helpers.TaskPool(r) | ||
|
|
||
| if body.Jobs == nil { | ||
| w.WriteHeader(http.StatusNoContent) | ||
| return | ||
| } | ||
|
|
||
| for _, job := range body.Jobs { | ||
| tsk := taskPool.GetTask(job.ID) | ||
|
|
||
| if tsk == nil { | ||
| // TODO: log | ||
| continue | ||
| } | ||
|
|
||
| for _, logRecord := range job.LogRecords { | ||
| tsk.Log2(logRecord.Message, logRecord.Time) | ||
| } | ||
| } | ||
|
|
||
| w.WriteHeader(http.StatusNoContent) | ||
| } | ||
|
|
||
| func RegisterRunner(w http.ResponseWriter, r *http.Request) { | ||
| var register runners.RunnerRegistration | ||
|
|
||
| if !helpers.Bind(w, r, ®ister) { | ||
| helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{ | ||
| "error": "Invalid format", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| if util.Config.RunnerRegistrationToken == "" || register.RegistrationToken != util.Config.RunnerRegistrationToken { | ||
| helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{ | ||
| "error": "Invalid registration token", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| runner, err := helpers.Store(r).CreateRunner(db.Runner{ | ||
| State: db.RunnerActive, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| helpers.WriteJSON(w, http.StatusInternalServerError, map[string]string{ | ||
| "error": "Unexpected error", | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| res := runners.RunnerConfig{ | ||
| RunnerID: runner.ID, | ||
| Token: runner.Token, | ||
| } | ||
|
|
||
| helpers.WriteJSON(w, http.StatusOK, res) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.