move release to only if err == nil

coder · Emyrk · May 16, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
commit ef15df1170b5520b8f8d9d89e05622dedeb6c34a
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -101,14 +101,14 @@ func (api *API) handleDynamicParameters(rw http.ResponseWriter, r *http.Request,
 
 	// Add the file first. Calling `Release` if it fails is a no-op, so this is safe.
 	templateFS, 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
@@ -120,14 +120,14 @@ func (api *API) handleDynamicParameters(rw http.ResponseWriter, r *http.Request,
 
 	if tf.CachedModuleFiles.Valid {
 		moduleFilesFS, err := api.FileCache.Acquire(fileCtx, tf.CachedModuleFiles.UUID)
-		defer api.FileCache.Release(tf.CachedModuleFiles.UUID)
 		if err != nil {
 			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
 				Message: "Internal error fetching Terraform modules.",
 				Detail:  err.Error(),
 			})
 			return
 		}
+		defer api.FileCache.Release(tf.CachedModuleFiles.UUID)
 
 		templateFS = files.NewOverlayFS(templateFS, []files.Overlay{{Path: ".terraform/modules", FS: moduleFilesFS}})
 	}