From 532ee23c71ca8c627f0abbfe284bdd8c2c1f73e3 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 6 Sep 2022 17:47:42 +0000 Subject: [PATCH 1/2] fix: Skip empty values so Terraform can use the default value --- coderd/workspaces.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coderd/workspaces.go b/coderd/workspaces.go index b1e7e4e999137..7d74dc2597b79 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -389,6 +389,12 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req return xerrors.Errorf("insert workspace: %w", err) } for _, parameterValue := range createWorkspace.ParameterValues { + // If the value is empty, we don't want to save it on database so + // Terraform can use the default value + if parameterValue.SourceValue == "" { + continue + } + _, err = db.InsertParameterValue(r.Context(), database.InsertParameterValueParams{ ID: uuid.New(), Name: parameterValue.Name, From 776a6e75c2e1c07dfb4c694abbbee49ad8480391 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 6 Sep 2022 17:49:38 +0000 Subject: [PATCH 2/2] Add default value as placeholder as well --- site/src/components/ParameterInput/ParameterInput.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/site/src/components/ParameterInput/ParameterInput.tsx b/site/src/components/ParameterInput/ParameterInput.tsx index a1c3dffffe218..cfcb0dc1a36a0 100644 --- a/site/src/components/ParameterInput/ParameterInput.tsx +++ b/site/src/components/ParameterInput/ParameterInput.tsx @@ -58,6 +58,7 @@ const ParameterField: React.FC> = ( id={schema.name} size="small" defaultValue={schema.default_source_value} + placeholder={schema.default_source_value} disabled={disabled} onChange={(event) => { onChange(event.target.value)