synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Skip empty values so Terraform can use the default value (#3902)

Browse Source
This commit is contained in:
Bruno Quaresma
2022-09-06 15:15:19 -03:00
committed by GitHub
parent 94eb503aac
commit 3c94ca9cbe
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coderd/workspaces.go
View File

@ -389,6 +389,12 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
return xerrors.Errorf("insert workspace: %w", err) return xerrors.Errorf("insert workspace: %w", err)
} }
for _, parameterValue := range createWorkspace.ParameterValues { 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{ _, err = db.InsertParameterValue(r.Context(), database.InsertParameterValueParams{
ID: uuid.New(), ID: uuid.New(),
Name: parameterValue.Name, Name: parameterValue.Name,

1
site/src/components/ParameterInput/ParameterInput.tsx
View File

@ -58,6 +58,7 @@ const ParameterField: React.FC<React.PropsWithChildren<ParameterInputProps>> = (
id={schema.name} id={schema.name}
size="small" size="small"
defaultValue={schema.default_source_value} defaultValue={schema.default_source_value}
placeholder={schema.default_source_value}
disabled={disabled} disabled={disabled}
onChange={(event) => { onChange={(event) => {
onChange(event.target.value) onChange(event.target.value)