windows:|

aslilac · aslilac · commit c386885fbd1d · 2025-05-12T19:35:00.000Z
diff --git a/coderd/files/cache.go b/coderd/files/cache.go
@@ -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] {
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -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
diff --git a/provisioner/terraform/modules_internal_test.go b/provisioner/terraform/modules_internal_test.go
@@ -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)
 		}
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,14 @@ func (api API) templateVersionDynamicParameters(rw http.ResponseWriter, r http`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`fs, err := api.FileCache.Acquire(fileCtx, fileID)`
`72`		`- defer api.FileCache.Release(fileID)`
`73`	`72`	`if err != nil {`
`74`	`73`	`httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{`
`75`	`74`	`Message: "Internal error fetching template version Terraform.",`
`76`	`75`	`Detail: err.Error(),`
`77`	`76`	`})`
`78`	`77`	`return`
`79`	`78`	`}`
	`79`	`+ defer api.FileCache.Release(fileID)`
`80`	`80`
`81`	`81`	`// Having the Terraform plan available for the evaluation engine is helpful`
`82`	`82`	`// for populating values from data blocks, but isn't strictly required. If`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func TestGetModulesArchive(t *testing.T) {`
`55`	`55`	`if runtime.GOOS != "windows" {`
`56`	`56`	`require.Equal(t, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hash)`
`57`	`57`	`} else {`
`58`		`- require.Equal(t, "09a30ffc30138f9a411b280ef4581dcf22ffab8f0ca9de982329226400ec8520", hash)`
	`58`	`+ require.Equal(t, "c219943913051e4637527cd03ae2b7303f6945005a262cdd420f9c2af490d572", hash)`
`59`	`59`	`}`
`60`	`60`	`})`
`61`	`61`