mirror of
https://github.com/coder/coder.git
synced 2025-07-13 21:36:50 +00:00
fix: change coder start to be a no-op if workspace is started
Fixes #11380
This commit is contained in:
@ -5,6 +5,7 @@ import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/sqlc-dev/pqtype"
|
||||
@ -47,6 +48,11 @@ type WorkspaceBuildBuilder struct {
|
||||
resources []*sdkproto.Resource
|
||||
params []database.WorkspaceBuildParameter
|
||||
agentToken string
|
||||
dispo workspaceBuildDisposition
|
||||
}
|
||||
|
||||
type workspaceBuildDisposition struct {
|
||||
starting bool
|
||||
}
|
||||
|
||||
// WorkspaceBuild generates a workspace build for the provided workspace.
|
||||
@ -100,6 +106,12 @@ func (b WorkspaceBuildBuilder) WithAgent(mutations ...func([]*sdkproto.Agent) []
|
||||
return b
|
||||
}
|
||||
|
||||
func (b WorkspaceBuildBuilder) Starting() WorkspaceBuildBuilder {
|
||||
//nolint: revive // returns modified struct
|
||||
b.dispo.starting = true
|
||||
return b
|
||||
}
|
||||
|
||||
// Do generates all the resources associated with a workspace build.
|
||||
// Template and TemplateVersion will be optionally populated if no
|
||||
// TemplateID is set on the provided workspace.
|
||||
@ -166,20 +178,43 @@ func (b WorkspaceBuildBuilder) Do() WorkspaceResponse {
|
||||
})
|
||||
require.NoError(b.t, err, "insert job")
|
||||
|
||||
err = b.db.UpdateProvisionerJobWithCompleteByID(ownerCtx, database.UpdateProvisionerJobWithCompleteByIDParams{
|
||||
ID: job.ID,
|
||||
UpdatedAt: dbtime.Now(),
|
||||
Error: sql.NullString{},
|
||||
ErrorCode: sql.NullString{},
|
||||
CompletedAt: sql.NullTime{
|
||||
Time: dbtime.Now(),
|
||||
Valid: true,
|
||||
},
|
||||
})
|
||||
require.NoError(b.t, err, "complete job")
|
||||
if b.dispo.starting {
|
||||
// might need to do this multiple times if we got a template version
|
||||
// import job as well
|
||||
for {
|
||||
j, err := b.db.AcquireProvisionerJob(ownerCtx, database.AcquireProvisionerJobParams{
|
||||
StartedAt: sql.NullTime{
|
||||
Time: dbtime.Now(),
|
||||
Valid: true,
|
||||
},
|
||||
WorkerID: uuid.NullUUID{
|
||||
UUID: uuid.New(),
|
||||
Valid: true,
|
||||
},
|
||||
Types: []database.ProvisionerType{database.ProvisionerTypeEcho},
|
||||
Tags: nil,
|
||||
})
|
||||
require.NoError(b.t, err, "acquire starting job")
|
||||
if j.ID == job.ID {
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
err = b.db.UpdateProvisionerJobWithCompleteByID(ownerCtx, database.UpdateProvisionerJobWithCompleteByIDParams{
|
||||
ID: job.ID,
|
||||
UpdatedAt: dbtime.Now(),
|
||||
Error: sql.NullString{},
|
||||
ErrorCode: sql.NullString{},
|
||||
CompletedAt: sql.NullTime{
|
||||
Time: dbtime.Now(),
|
||||
Valid: true,
|
||||
},
|
||||
})
|
||||
require.NoError(b.t, err, "complete job")
|
||||
ProvisionerJobResources(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
|
||||
}
|
||||
|
||||
resp.Build = dbgen.WorkspaceBuild(b.t, b.db, b.seed)
|
||||
ProvisionerJobResources(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
|
||||
|
||||
for i := range b.params {
|
||||
b.params[i].WorkspaceBuildID = resp.Build.ID
|
||||
@ -340,6 +375,40 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
|
||||
return resp
|
||||
}
|
||||
|
||||
type JobCompleteBuilder struct {
|
||||
t testing.TB
|
||||
db database.Store
|
||||
jobID uuid.UUID
|
||||
}
|
||||
|
||||
type JobCompleteResponse struct {
|
||||
CompletedAt time.Time
|
||||
}
|
||||
|
||||
func JobComplete(t testing.TB, db database.Store, jobID uuid.UUID) JobCompleteBuilder {
|
||||
return JobCompleteBuilder{
|
||||
t: t,
|
||||
db: db,
|
||||
jobID: jobID,
|
||||
}
|
||||
}
|
||||
|
||||
func (b JobCompleteBuilder) Do() JobCompleteResponse {
|
||||
r := JobCompleteResponse{CompletedAt: dbtime.Now()}
|
||||
err := b.db.UpdateProvisionerJobWithCompleteByID(ownerCtx, database.UpdateProvisionerJobWithCompleteByIDParams{
|
||||
ID: b.jobID,
|
||||
UpdatedAt: r.CompletedAt,
|
||||
Error: sql.NullString{},
|
||||
ErrorCode: sql.NullString{},
|
||||
CompletedAt: sql.NullTime{
|
||||
Time: r.CompletedAt,
|
||||
Valid: true,
|
||||
},
|
||||
})
|
||||
require.NoError(b.t, err, "complete job")
|
||||
return r
|
||||
}
|
||||
|
||||
func must[V any](v V, err error) V {
|
||||
if err != nil {
|
||||
panic(err)
|
||||
|
Reference in New Issue
Block a user