Skip to content

chore: use static params when dynamic param metadata is missing #17836

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 25 commits into from
May 16, 2025
Merged

chore: use static params when dynamic param metadata is missing #17836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
34de4f0
chore: static params as dynmaic
Emyrk May 14, 2025
005a084
chore: refactor preview code to be swappable
Emyrk May 14, 2025
55d2af4
Merge remote-tracking branch 'origin/main' into stevenmasley/use_stat…
Emyrk May 14, 2025
2f5f251
wip
Emyrk May 14, 2025
d9c5ce5
Working prototype
Emyrk May 14, 2025
6299f43
work on unit testing
Emyrk May 15, 2025
f80d838
chore: add unit test for static values
Emyrk May 15, 2025
a5ee374
revert changes to cache
Emyrk May 15, 2025
3cb39ea
test: add unit test for closing files
Emyrk May 15, 2025
d5a68dd
linting
Emyrk May 15, 2025
bbd0803
chore: move group test to enterprise
Emyrk May 15, 2025
f5fe4b7
linting
Emyrk May 15, 2025
dfd0e24
linting
Emyrk May 15, 2025
1375619
revert deleted coderd/parameters_internal_test.go
Emyrk May 15, 2025
4dd4149
chore: refactor websocket code into own function
Emyrk May 15, 2025
f3cff03
fixup
Emyrk May 15, 2025
13215d6
fix leaked files
Emyrk May 15, 2025
72f2234
fix up the error message for static params for now
Emyrk May 15, 2025
4ea0165
linting
Emyrk May 15, 2025
ef15df1
move release to only if err == nil
Emyrk May 15, 2025
df65b92
use options pattern for provisioner version override
Emyrk May 15, 2025
2bb3749
Merge remote-tracking branch 'origin/main' into stevenmasley/use_stat…
Emyrk May 16, 2025
5957960
fixup error message assert
Emyrk May 16, 2025
62db9dd
1.5 -> 1.6
Emyrk May 16, 2025
5a9b4ac
Merge remote-tracking branch 'origin/main' into stevenmasley/use_stat…
Emyrk May 16, 2025
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
fix leaked files
  • Loading branch information
@Emyrk
Emyrk committed May 15, 2025
commit 13215d621fb2bfcd60cecc273daa8afbd3d640a7
2 changes: 1 addition & 1 deletion coderd/parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

if tf.CachedModuleFiles.Valid {
moduleFilesFS, err := api.FileCache.Acquire(fileCtx, tf.CachedModuleFiles.UUID)
defer api.FileCache.Release(fileID)
defer api.FileCache.Release(tf.CachedModuleFiles.UUID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
Message: "Internal error fetching Terraform modules.",
Expand Down Expand Up @@ -241,7 +241,7 @@
params = append(params, param)
}

api.handleParameterWebsocket(rw, r, func(ctx context.Context, values map[string]string) (*preview.Output, hcl.Diagnostics) {

Check failure on line 244 in coderd/parameters.go

View workflow job for this annotation

GitHub Actions / lint 

unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive)
for i := range params {
param := &params[i]
paramValue, ok := values[param.Name]
Expand Down
2 changes: 1 addition & 1 deletion codersdk/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ func (c *Client) Dial(ctx context.Context, path string, opts *websocket.DialOpti
}

conn, resp, err := websocket.Dial(ctx, u.String(), opts)
if resp.Body != nil {
if resp != nil && resp.Body != nil {
resp.Body.Close()
}
if err != nil {
Expand Down
Loading