particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

worker: Return basepath depending on route

Browse source
This commit is contained in:
sanne 2021-06-15 12:52:54 +02:00 • committed by Sanne Raymaekers
parent 0ea31c39d5
commit 8fa822c02e
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/worker/server.go
View file

@ -28,7 +28,6 @@ type Server struct {
logger *log.Logger
artifactsDir string
identityFilter []string
basePath string
// Currently running jobs. Workers are not handed job ids, but
// independent tokens which serve as an indirection. This enables
@ -349,10 +348,15 @@ func (h *apiHandlers) RequestJob(ctx echo.Context) error {
return err
}
basePath := api.BasePath
if strings.HasPrefix(ctx.Path(), api.CloudBasePath) {
basePath = api.CloudBasePath
}
return ctx.JSON(http.StatusCreated, requestJobResponse{
Id: jobId,
Location: fmt.Sprintf("%s/jobs/%v", h.server.basePath, token),
ArtifactLocation: fmt.Sprintf("%s/jobs/%v/artifacts/", h.server.basePath, token),
Location: fmt.Sprintf("%s/jobs/%v", basePath, token),
ArtifactLocation: fmt.Sprintf("%s/jobs/%v/artifacts/", basePath, token),
Type: jobType,
Args: jobArgs,
DynamicArgs: dynamicJobArgs,