Skip to content

Commit 845dd92

Browse files
mtojekmtojek
committed
no dry run
1 parent 78d7252 commit 845dd92

File tree

11 files changed

+78
-6
lines changed

11 files changed

+78
-6
lines changed

‎coderd/apidoc/docs.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ func auditActionFromTransition(transition database.WorkspaceTransition) database
12601260

12611261
type TemplateVersionImportJob struct {
12621262
TemplateVersionID uuid.UUID `json:"template_version_id"`
1263-
UserVariableValues []codersdk.VariableValue `json:"variable_values"`
1263+
UserVariableValues []codersdk.VariableValue `json:"user_variable_values"`
12641264
}
12651265

12661266
// WorkspaceProvisionJob is the payload for the "workspace_provision" job type.
@@ -1275,6 +1275,7 @@ type TemplateVersionDryRunJob struct {
12751275
WorkspaceName string `json:"workspace_name"`
12761276
ParameterValues []database.ParameterValue `json:"parameter_values"`
12771277
RichParameterValues []database.WorkspaceBuildParameter `json:"rich_parameter_values"`
1278+
UserVariableValues []codersdk.VariableValue `json:"user_variable_values"`
12781279
}
12791280

12801281
// ProvisionerJobLogsNotifyMessage is the payload published on

‎coderd/templateversions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ func (api *API) postTemplateVersionDryRun(rw http.ResponseWriter, r *http.Reques
417417
WorkspaceName: req.WorkspaceName,
418418
ParameterValues: parameterValues,
419419
RichParameterValues: richParameterValues,
420-
// FIXME Variable values?
420+
UserVariableValues: req.UserVariableValues,
421421
})
422422
if err != nil {
423423
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

‎codersdk/templateversions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ type CreateTemplateVersionDryRunRequest struct {
166166
WorkspaceName string `json:"workspace_name"`
167167
ParameterValues []CreateParameterRequest `json:"parameter_values"`
168168
RichParameterValues []WorkspaceBuildParameter `json:"rich_parameter_values"`
169+
UserVariableValues []VariableValue `json:"user_variable_values,omitempty"`
169170
}
170171

171172
// CreateTemplateVersionDryRun begins a dry-run provisioner job against the

‎docs/api/schemas.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,12 @@ CreateParameterRequest is a structure used to create a new parameter value for a
10001000
"value": "string"
10011001
}
10021002
],
1003+
"user_variable_values": [
1004+
{
1005+
"name": "string",
1006+
"value": "string"
1007+
}
1008+
],
10031009
"workspace_name": "string"
10041010
}
10051011
```
@@ -1010,6 +1016,7 @@ CreateParameterRequest is a structure used to create a new parameter value for a
10101016
| ----------------------- | ----------------------------------------------------------------------------- | -------- | ------------ | ---------------------------------------------------------------------------------- |
10111017
| `parameter_values` | array of [codersdk.CreateParameterRequest](#codersdkcreateparameterrequest) | false | | Parameter values is a structure used to create a new parameter value for a scope.] |
10121018
| `rich_parameter_values` | array of [codersdk.WorkspaceBuildParameter](#codersdkworkspacebuildparameter) | false | | |
1019+
| `user_variable_values` | array of [codersdk.VariableValue](#codersdkvariablevalue) | false | | |
10131020
| `workspace_name` | string | false | | |
10141021

10151022
## codersdk.CreateTestAuditLogRequest
@@ -4977,6 +4984,22 @@ Parameter represents a set value for the scope.
49774984
| `increasing` |
49784985
| `decreasing` |
49794986

4987+
## codersdk.VariableValue
4988+
4989+
```json
4990+
{
4991+
"name": "string",
4992+
"value": "string"
4993+
}
4994+
```
4995+
4996+
### Properties
4997+
4998+
| Name | Type | Required | Restrictions | Description |
4999+
| ------- | ------ | -------- | ------------ | ----------- |
5000+
| `name` | string | false | | |
5001+
| `value` | string | false | | |
5002+
49805003
## codersdk.Workspace
49815004

49825005
```json

‎docs/api/templates.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,12 @@ curl -X POST http://coder-server:8080/api/v2/organizations/{organization}/templa
560560
"value": "string"
561561
}
562562
],
563+
"user_variable_values": [
564+
{
565+
"name": "string",
566+
"value": "string"
567+
}
568+
],
563569
"workspace_name": "string"
564570
}
565571
```
@@ -1299,6 +1305,12 @@ curl -X POST http://coder-server:8080/api/v2/templateversions/{templateversion}/
12991305
"value": "string"
13001306
}
13011307
],
1308+
"user_variable_values": [
1309+
{
1310+
"name": "string",
1311+
"value": "string"
1312+
}
1313+
],
13021314
"workspace_name": "string"
13031315
}
13041316
```

‎provisionerd/proto/provisionerd.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎provisionerd/proto/provisionerd.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ message AcquiredJob {
2727
message TemplateDryRun {
2828
repeated provisioner.ParameterValue parameter_values = 1;
2929
repeated provisioner.RichParameterValue rich_parameter_values = 2;
30-
provisioner.Provision.Metadata metadata = 3;
30+
provisioner.Provision.Metadata metadata = 4;
3131
}
3232

3333
string job_id = 1;

‎provisionerd/runner/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ func (r *Runner) runTemplateDryRun(ctx context.Context) (*proto.CompletedJob, *p
793793
// Run the template import provision task since it's already a dry run.
794794
resources, _, err := r.runTemplateImportProvisionWithRichParameters(ctx,
795795
r.job.GetTemplateDryRun().GetParameterValues(),
796-
nil, // FIXME variable values
796+
nil,
797797
r.job.GetTemplateDryRun().GetRichParameterValues(),
798798
metadata,
799799
)

0 commit comments

Comments
 (0)