Skip to content

feat(coderd): support ephemeral parameters #8367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 10, 2023
Merged

feat(coderd): support ephemeral parameters #8367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ef50c35
WIP
mtojek Jul 7, 2023
de38911
WIP2
mtojek Jul 7, 2023
3239d07
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 7, 2023
469fcc2
fix
mtojek Jul 7, 2023
712519f
fix
mtojek Jul 7, 2023
ec04dc5
cleanup
mtojek Jul 7, 2023
f1f3a0a
Refs to ephemeral
mtojek Jul 7, 2023
533dde3
fix: frontend
mtojek Jul 7, 2023
97df39f
fmt
mtojek Jul 7, 2023
4ff2705
make gen
mtojek Jul 7, 2023
f826d99
resolver: if not ephemeral
mtojek Jul 7, 2023
cc20564
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
35321fc
ParameterResolver tests
mtojek Jul 10, 2023
feceec3
WIP
mtojek Jul 10, 2023
e8cd16d
Tests: resources
mtojek Jul 10, 2023
ffb7b94
fmt
mtojek Jul 10, 2023
85044d3
Long ephemeral test
mtojek Jul 10, 2023
3636b70
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
343c87e
remove debug
mtojek Jul 10, 2023
38eacbf
fix: go.mod
mtojek Jul 10, 2023
8e73da8
go mod tidy
mtojek Jul 10, 2023
dffefb6
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
69e46ee
rename to ephemeralParameter
mtojek Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove debug
  • Loading branch information
@mtojek
mtojek committed Jul 10, 2023
commit 343c87e13505ccdff10cb4bb7a380df27e3a2d59
4 changes: 0 additions & 4 deletions coderd/wsbuilder/wsbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"database/sql"
"encoding/json"
"fmt"
"log"
"net/http"

"github.com/google/uuid"
Expand Down Expand Up @@ -504,13 +503,10 @@ func (b *Builder) getParameters() (names, values []string, err error) {
if err != nil {
return nil, nil, BuildError{http.StatusInternalServerError, "failed to convert template version parameter", err}
}
log.Println("templateVersionParameter", tvp.Name)
log.Println("findNewBuildParameterValue", b.findNewBuildParameterValue(templateVersionParameter.Name))
value, err := resolver.ValidateResolve(
tvp,
b.findNewBuildParameterValue(templateVersionParameter.Name),
)
log.Println("value", value)
if err != nil {
// At this point, we've queried all the data we need from the database,
// so the only errors are problems with the request (missing data, failed
Expand Down
3 changes: 0 additions & 3 deletions codersdk/richparameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package codersdk

import (
"log"

"golang.org/x/xerrors"

"github.com/coder/terraform-provider-coder/provider"
Expand Down Expand Up @@ -152,7 +150,6 @@ func (r *ParameterResolver) ValidateResolve(p TemplateVersionParameter, v *Works
resolvedValue := v
// Second, previous value if not ephemeral
if resolvedValue == nil && !p.Ephemeral {
log.Println("not ephemeral", p.Name)
resolvedValue = prevV
}
// Last, default value
Expand Down