Jan 17, 2023 · Jan 17, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Get("/", api.workspaceBuild)
 r.Patch("/cancel", api.patchCancelWorkspaceBuild)
 r.Get("/logs", api.workspaceBuildLogs)
 r.Get("/parameters", api.workspaceBuildParameters)
 r.Get("/resources", api.workspaceBuildResources)
 r.Get("/state", api.workspaceBuildState)
 })
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
 defer q.mutex.RUnlock()

 params := make([]database.WorkspaceBuildParameter, 0)
 for _, param := rangeparams {
 for _, param := rangeq.workspaceBuildParameters {
 if param.WorkspaceBuildID != workspaceBuildID {
 continue
 }
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
 state = createBuild.ProvisionerState
 }

 var parameters []codersdk.WorkspaceBuildParameter
 if createBuild.RichParameterValues != nil {
 parameters = createBuild.RichParameterValues
 }

 if createBuild.Orphan {
 if createBuild.Transition != codersdk.WorkspaceTransitionDelete {
 httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 state = priorHistory.ProvisionerState
 }

 if parameters == nil {
 buildParameters, err := api.Database.GetWorkspaceBuildParameters(ctx, priorHistory.ID)
 if err != nil {
 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "Internal error fetching prior workspace build parameters.",
 Detail:  err.Error(),
 })
 return
 }
 parameters = make([]codersdk.WorkspaceBuildParameter, 0, len(buildParameters))
 for _, param := range buildParameters {
 parameters = append(parameters, codersdk.WorkspaceBuildParameter{
 Name:  param.Name,
 Value: param.Value,
 })
 }
 }

 var workspaceBuild database.WorkspaceBuild
 var provisionerJob database.ProvisionerJob
 // This must happen in a transaction to ensure history can be inserted, and
 return xerrors.Errorf("insert workspace build: %w", err)
 }

 names := make([]string, 0, len(parameters))
 values := make([]string, 0, len(parameters))
 for _, param := range parameters {
 names = append(names, param.Name)
 values = append(values, param.Value)
 }
 err = db.InsertWorkspaceBuildParameters(ctx, database.InsertWorkspaceBuildParametersParams{
 WorkspaceBuildID: workspaceBuildID,
 Name:             names,
 Value:            values,
 })
 if err != nil {
 return xerrors.Errorf("insert workspace build parameter: %w", err)
 }

 return nil
 }, nil)
 if err != nil {
 api.provisionerJobResources(rw, r, job)
 }

 // @Summary Get build parameters for workspace build
 // @ID get-build-parameters-for-workspace-build
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Builds
 // @Param workspacebuild path string true "Workspace build ID"
 // @Success 200 {array} codersdk.WorkspaceBuildParameter
 // @Router /workspacebuilds/{workspacebuild}/parameters [get]
 func (api *API) workspaceBuildParameters(rw http.ResponseWriter, r *http.Request) {
 ctx := r.Context()
 workspaceBuild := httpmw.WorkspaceBuildParam(r)
 workspace, err := api.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
 if err != nil {
 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "No workspace exists for this job.",
 })
 return
 }

 if !api.Authorize(r, rbac.ActionRead, workspace) {
 httpapi.ResourceNotFound(rw)
 return
 }

 parameters, err := api.Database.GetWorkspaceBuildParameters(ctx, workspaceBuild.ID)
 if err != nil {
 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "Internal error fetching workspace build parameters.",
 Detail:  err.Error(),
 })
 return
 }
 apiParameters := convertWorkspaceBuildParameters(parameters)
 httpapi.Write(ctx, rw, http.StatusOK, apiParameters)
 }

 // @Summary Get workspace build logs
 // @ID get-workspace-build-logs
 // @Security CoderSessionToken
 // return error status since we should never get here
 return codersdk.WorkspaceStatusFailed
 }

 func convertWorkspaceBuildParameters(parameters []database.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
 var apiParameters = make([]codersdk.WorkspaceBuildParameter, 0, len(parameters))

 for _, p := range parameters {
 apiParameter := codersdk.WorkspaceBuildParameter{
 Name:  p.Name,
 Value: p.Value,
 }
 apiParameters = append(apiParameters, apiParameter)
 }
 return apiParameters
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -582,6 +582,7 @@ func New(options Options) API {
		r.Get("/", api.workspaceBuild)
		r.Patch("/cancel", api.patchCancelWorkspaceBuild)
		r.Get("/logs", api.workspaceBuildLogs)
		r.Get("/parameters", api.workspaceBuildParameters)
		r.Get("/resources", api.workspaceBuildResources)
		r.Get("/state", api.workspaceBuildState)
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1372,7 +1372,7 @@ func (q *fakeQuerier) GetWorkspaceBuildParameters(_ context.Context, workspaceBu
		defer q.mutex.RUnlock()

		params := make([]database.WorkspaceBuildParameter, 0)
		for _, param := rangeparams {
		for _, param := rangeq.workspaceBuildParameters {
		if param.WorkspaceBuildID != workspaceBuildID {
		continue
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -377,6 +377,11 @@ func (api API) postWorkspaceBuilds(rw http.ResponseWriter, r http.Request) {
		state = createBuild.ProvisionerState
		}

		var parameters []codersdk.WorkspaceBuildParameter
		if createBuild.RichParameterValues != nil {
		parameters = createBuild.RichParameterValues
		}

		if createBuild.Orphan {
		if createBuild.Transition != codersdk.WorkspaceTransitionDelete {
		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Expand DownExpand Up		@@ -449,6 +454,24 @@ func (api API) postWorkspaceBuilds(rw http.ResponseWriter, r http.Request) {
		state = priorHistory.ProvisionerState
		}

		if parameters == nil {
		buildParameters, err := api.Database.GetWorkspaceBuildParameters(ctx, priorHistory.ID)
		if err != nil {
		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "Internal error fetching prior workspace build parameters.",
		Detail: err.Error(),
		})
		return
		}
		parameters = make([]codersdk.WorkspaceBuildParameter, 0, len(buildParameters))
		for _, param := range buildParameters {
		parameters = append(parameters, codersdk.WorkspaceBuildParameter{
		Name: param.Name,
		Value: param.Value,
		})
		}
		}

		var workspaceBuild database.WorkspaceBuild
		var provisionerJob database.ProvisionerJob
		// This must happen in a transaction to ensure history can be inserted, and
Expand DownExpand Up		@@ -532,6 +555,21 @@ func (api API) postWorkspaceBuilds(rw http.ResponseWriter, r http.Request) {
		return xerrors.Errorf("insert workspace build: %w", err)
		}

		names := make([]string, 0, len(parameters))
		values := make([]string, 0, len(parameters))
		for _, param := range parameters {
		names = append(names, param.Name)
		values = append(values, param.Value)
		}
		err = db.InsertWorkspaceBuildParameters(ctx, database.InsertWorkspaceBuildParametersParams{
		WorkspaceBuildID: workspaceBuildID,
		Name: names,
		Value: values,
		})
		if err != nil {
		return xerrors.Errorf("insert workspace build parameter: %w", err)
		}

		return nil
		}, nil)
		if err != nil {
Expand DownExpand Up		@@ -716,6 +754,42 @@ func (api API) workspaceBuildResources(rw http.ResponseWriter, r http.Request)
		api.provisionerJobResources(rw, r, job)
		}

		// @Summary Get build parameters for workspace build
		// @ID get-build-parameters-for-workspace-build
		// @Security CoderSessionToken
		// @Produce json
		// @Tags Builds
		// @Param workspacebuild path string true "Workspace build ID"
		// @Success 200 {array} codersdk.WorkspaceBuildParameter
		// @Router /workspacebuilds/{workspacebuild}/parameters [get]
		func (api API) workspaceBuildParameters(rw http.ResponseWriter, r http.Request) {
		ctx := r.Context()
		workspaceBuild := httpmw.WorkspaceBuildParam(r)
		workspace, err := api.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
		if err != nil {
		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "No workspace exists for this job.",
		})
		return
		}

		if !api.Authorize(r, rbac.ActionRead, workspace) {
		httpapi.ResourceNotFound(rw)
		return
		}

		parameters, err := api.Database.GetWorkspaceBuildParameters(ctx, workspaceBuild.ID)
		if err != nil {
		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "Internal error fetching workspace build parameters.",
		Detail: err.Error(),
		})
		return
		}
		apiParameters := convertWorkspaceBuildParameters(parameters)
		httpapi.Write(ctx, rw, http.StatusOK, apiParameters)
		}

		// @Summary Get workspace build logs
		// @ID get-workspace-build-logs
		// @Security CoderSessionToken
Expand DownExpand Up		@@ -1084,3 +1158,16 @@ func convertWorkspaceStatus(jobStatus codersdk.ProvisionerJobStatus, transition
		// return error status since we should never get here
		return codersdk.WorkspaceStatusFailed
		}

		func convertWorkspaceBuildParameters(parameters []database.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
		var apiParameters = make([]codersdk.WorkspaceBuildParameter, 0, len(parameters))

		for _, p := range parameters {
		apiParameter := codersdk.WorkspaceBuildParameter{
		Name: p.Name,
		Value: p.Value,
		}
		apiParameters = append(apiParameters, apiParameter)
		}
		return apiParameters
		}