Skip to content

Commit e021e52

Browse files
committed
Dry run
1 parent 845dd92 commit e021e52

File tree

5 files changed

+203
-184
lines changed

5 files changed

+203
-184
lines changed

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ func (server *Server) AcquireJob(ctx context.Context, _ *proto.Empty) (*proto.Ac
220220
if err != nil {
221221
return nil, failJob(fmt.Sprintf("get template version: %s", err))
222222
}
223+
templateVariables, err := server.Database.GetTemplateVersionVariables(ctx, templateVersion.ID)
224+
if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
225+
return nil, failJob(fmt.Sprintf("get template version variables: %s", err))
226+
}
223227

224228
// Compute parameters for the dry-run to consume.
225229
parameters, err := parameter.Compute(ctx, server.Database, parameter.ComputeScope{
@@ -242,6 +246,7 @@ func (server *Server) AcquireJob(ctx context.Context, _ *proto.Empty) (*proto.Ac
242246
TemplateDryRun: &proto.AcquiredJob_TemplateDryRun{
243247
ParameterValues: protoParameters,
244248
RichParameterValues: convertRichParameterValues(input.RichParameterValues),
249+
VariableValues: asVariableValues(templateVariables),
245250
Metadata: &sdkproto.Provision_Metadata{
246251
CoderUrl: server.AccessURL.String(),
247252
WorkspaceName: input.WorkspaceName,
@@ -1275,7 +1280,6 @@ type TemplateVersionDryRunJob struct {
12751280
WorkspaceName string `json:"workspace_name"`
12761281
ParameterValues []database.ParameterValue `json:"parameter_values"`
12771282
RichParameterValues []database.WorkspaceBuildParameter `json:"rich_parameter_values"`
1278-
UserVariableValues []codersdk.VariableValue `json:"user_variable_values"`
12791283
}
12801284

12811285
// ProvisionerJobLogsNotifyMessage is the payload published on

coderd/templateversions.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ func (api *API) postTemplateVersionDryRun(rw http.ResponseWriter, r *http.Reques
417417
WorkspaceName: req.WorkspaceName,
418418
ParameterValues: parameterValues,
419419
RichParameterValues: richParameterValues,
420-
UserVariableValues: req.UserVariableValues,
421420
})
422421
if err != nil {
423422
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

0 commit comments

Comments
 (0)