Skip to content

fix: reduce size of terraform modules archive #17749

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

fix: reduce size of terraform modules archive #17749

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c77cdf
fix: persist terraform modules during template import (#17665)
aslilac May 8, 2025
144b1ed
fix: reduce size of terraform modules archive
aslilac May 9, 2025
38b00e7
fix hash on windows
aslilac May 9, 2025
6b5915c
Merge branch 'main' into lilac/reduce-modules-archive-size
aslilac May 12, 2025
40eb3e5
🧹🧹🧹
aslilac May 12, 2025
00cc35f
better size check
aslilac May 12, 2025
e034d9b
hop on the v1.5 train
aslilac May 12, 2025
1682be8
better names and such
aslilac May 12, 2025
93381be
remove old test
aslilac May 12, 2025
0946a8a
`make gen`
aslilac May 12, 2025
337525a
[shakes fist at windows]
aslilac May 12, 2025
c386885
windows:|
aslilac May 12, 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
windows:|
  • Loading branch information
@aslilac
aslilac committed May 12, 2025
commit c386885fbd1d1658e503105e5c87f30cc06183d6
6 changes: 5 additions & 1 deletion coderd/files/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ func (c *Cache) Acquire(ctx context.Context, fileID uuid.UUID) (fs.FS, error) {
// mutex has been released, or we would continue to hold the lock until the
// entire file has been fetched, which may be slow, and would prevent other
// files from being fetched in parallel.
return c.prepare(ctx, fileID).Load()
it, err := c.prepare(ctx, fileID).Load()
if err != nil {
c.Release(fileID)
}
return it, err
}

func (c *Cache) prepare(ctx context.Context, fileID uuid.UUID) *lazy.ValueWithError[fs.FS] {
Expand Down
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 @@ -69,14 +69,14 @@ func (api *API) templateVersionDynamicParameters(rw http.ResponseWriter, r *http
}

fs, err := api.FileCache.Acquire(fileCtx, fileID)
defer api.FileCache.Release(fileID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
Message: "Internal error fetching template version Terraform.",
Detail: err.Error(),
})
return
}
defer api.FileCache.Release(fileID)

// Having the Terraform plan available for the evaluation engine is helpful
// for populating values from data blocks, but isn't strictly required. If
Expand Down
2 changes: 1 addition & 1 deletion provisioner/terraform/modules_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestGetModulesArchive(t *testing.T) {
if runtime.GOOS != "windows" {
require.Equal(t, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hash)
} else {
require.Equal(t, "09a30ffc30138f9a411b280ef4581dcf22ffab8f0ca9de982329226400ec8520", hash)
require.Equal(t, "c219943913051e4637527cd03ae2b7303f6945005a262cdd420f9c2af490d572", hash)
}
})

Expand Down
Loading