Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: run a terraform plan before creating workspaces with the given template parameters #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deansheather merged 11 commits into from
Jun 1, 2022
Merged

feat: run a terraform plan before creating workspaces with the given template parameters #1732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3e9ecc3
feat: add new provisioner job type template_version_plan
deansheather May 25, 2022
cf033aa
feat: finish implementing workspace planning
deansheather May 27, 2022
bafe1c1
merge main
deansheather May 27, 2022
cfe34af
big tests
deansheather May 27, 2022
0d03a39
fix: workspaces: relax error assertion
johnstcn May 27, 2022
4078fd1
fix
deansheather May 27, 2022
8d04749
fixup! fix
deansheather May 27, 2022
4b06c72
gen
deansheather May 27, 2022
2fee23a
fixup! gen
deansheather May 27, 2022
6b95e54
remove heavy object nesting in tests
deansheather May 27, 2022
0b6d083
Rename template version plan to template version dry run
deansheather May 31, 2022
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
Prev Previous commit
Next Next commit
merge main
  • Loading branch information
@deansheather
deansheather committed May 27, 2022
commit bafe1c15703da4ba33e7bc49935c03a66709a3a5
22 changes: 11 additions & 11 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,18 +201,18 @@ func New(options *Options) *API {
httpmw.ExtractTemplateVersionParam(options.Database),
)

r.Get("/", a.templateVersion)
r.Patch("/cancel", a.patchCancelTemplateVersion)
r.Get("/schema", a.templateVersionSchema)
r.Get("/parameters", a.templateVersionParameters)
r.Get("/resources", a.templateVersionResources)
r.Get("/logs", a.templateVersionLogs)
r.Get("/", api.templateVersion)
r.Patch("/cancel", api.patchCancelTemplateVersion)
r.Get("/schema", api.templateVersionSchema)
r.Get("/parameters", api.templateVersionParameters)
r.Get("/resources", api.templateVersionResources)
r.Get("/logs", api.templateVersionLogs)
r.Route("/plan", func(r chi.Router) {
r.Post("/", a.createTemplateVersionPlan)
r.Get("/{jobID}", a.templateVersionPlan)
r.Get("/{jobID}/resources", a.templateVersionPlanResources)
r.Get("/{jobID}/logs", a.templateVersionPlanLogs)
r.Patch("/{jobID}/cancel", a.templateVersionPlanCancel)
r.Post("/", api.createTemplateVersionPlan)
r.Get("/{jobID}", api.templateVersionPlan)
r.Get("/{jobID}/resources", api.templateVersionPlanResources)
r.Get("/{jobID}/logs", api.templateVersionPlanLogs)
r.Patch("/{jobID}/cancel", api.templateVersionPlanCancel)
})
})
r.Route("/users", func(r chi.Router) {
Expand Down
12 changes: 6 additions & 6 deletions coderd/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (api *API) templateVersionParameters(rw http.ResponseWriter, r *http.Reques
httpapi.Write(rw, http.StatusOK, values)
}

func (api *api) createTemplateVersionPlan(rw http.ResponseWriter, r *http.Request) {
func (api *API) createTemplateVersionPlan(rw http.ResponseWriter, r *http.Request) {
apiKey := httpmw.APIKey(r)
templateVersion := httpmw.TemplateVersionParam(r)

Expand Down Expand Up @@ -237,7 +237,7 @@ func (api *api) createTemplateVersionPlan(rw http.ResponseWriter, r *http.Reques
httpapi.Write(rw, http.StatusCreated, convertProvisionerJob(provisionerJob))
}

func (api *api) templateVersionPlan(rw http.ResponseWriter, r *http.Request) {
func (api *API) templateVersionPlan(rw http.ResponseWriter, r *http.Request) {
job, ok := getTemplateVersionPlanJob(api.Database, rw, r)
if !ok {
return
Expand All @@ -246,7 +246,7 @@ func (api *api) templateVersionPlan(rw http.ResponseWriter, r *http.Request) {
httpapi.Write(rw, http.StatusOK, convertProvisionerJob(job))
}

func (api *api) templateVersionPlanResources(rw http.ResponseWriter, r *http.Request) {
func (api *API) templateVersionPlanResources(rw http.ResponseWriter, r *http.Request) {
job, ok := getTemplateVersionPlanJob(api.Database, rw, r)
if !ok {
return
Expand All @@ -255,7 +255,7 @@ func (api *api) templateVersionPlanResources(rw http.ResponseWriter, r *http.Req
api.provisionerJobResources(rw, r, job)
}

func (api *api) templateVersionPlanLogs(rw http.ResponseWriter, r *http.Request) {
func (api *API) templateVersionPlanLogs(rw http.ResponseWriter, r *http.Request) {
job, ok := getTemplateVersionPlanJob(api.Database, rw, r)
if !ok {
return
Expand All @@ -264,7 +264,7 @@ func (api *api) templateVersionPlanLogs(rw http.ResponseWriter, r *http.Request)
api.provisionerJobLogs(rw, r, job)
}

func (api *api) templateVersionPlanCancel(rw http.ResponseWriter, r *http.Request) {
func (api *API) templateVersionPlanCancel(rw http.ResponseWriter, r *http.Request) {
job, ok := getTemplateVersionPlanJob(api.Database, rw, r)
if !ok {
return
Expand Down Expand Up @@ -355,7 +355,7 @@ func getTemplateVersionPlanJob(db database.Store, rw http.ResponseWriter, r *htt
return job, true
}

func (api *api) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Request) {
func (api *API) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Request) {
template := httpmw.TemplateParam(r)
if !api.Authorize(rw, r, rbac.ActionRead, template) {
return
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.