Skip to content

Commit 20263c6

Browse files
committed
revert calls
1 parent a1f2c0d commit 20263c6

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

coderd/files/overlay_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ func TestOverlayFS(t *testing.T) {
2121
afero.WriteFile(b, ".terraform/modules/modules.json", []byte("{}"), 0o644)
2222
afero.WriteFile(b, ".terraform/modules/example_module/main.tf", []byte("terraform {}"), 0o644)
2323

24-
it, err := files.NewOverlayFS(afero.NewIOFS(a), []files.Overlay{{
24+
it := files.NewOverlayFS(afero.NewIOFS(a), []files.Overlay{{
2525
Path: ".terraform/modules",
2626
FS: afero.NewIOFS(b),
2727
}})
28-
require.NoError(t, err)
2928

3029
content, err := fs.ReadFile(it, "main.tf")
3130
require.NoError(t, err)

coderd/parameters.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,7 @@ func (api *API) templateVersionDynamicParameters(rw http.ResponseWriter, r *http
9797
return
9898
}
9999
defer api.FileCache.Release(tf.CachedModuleFiles.UUID)
100-
templateFS, err = files.NewOverlayFS(templateFS, []files.Overlay{{Path: ".terraform/modules", FS: moduleFilesFS}})
101-
if err != nil {
102-
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
103-
Message: "Internal error creating overlay filesystem.",
104-
Detail: err.Error(),
105-
})
106-
return
107-
}
100+
templateFS = files.NewOverlayFS(templateFS, []files.Overlay{{Path: ".terraform/modules", FS: moduleFilesFS}})
108101
}
109102
} else if !xerrors.Is(err, sql.ErrNoRows) {
110103
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

0 commit comments

Comments
 (0)