From 6babde4ae539e22772d6b5798219310076a4cc2a Mon Sep 17 00:00:00 2001
From: "Denis Bilenko (aider)" <denis.bilenko@databricks.com>
Date: Mon, 3 Mar 2025 20:37:05 +0100
Subject: [PATCH] refactor: Update deprecated Go constructs to modern Go 1.24
 practices

---
 libs/patchwheel/patchwheel.go      | 5 ++++-
 libs/patchwheel/patchwheel_test.go | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libs/patchwheel/patchwheel.go b/libs/patchwheel/patchwheel.go
index f379e90e2..aafb107f5 100644
--- a/libs/patchwheel/patchwheel.go
+++ b/libs/patchwheel/patchwheel.go
@@ -239,8 +239,11 @@ func PatchWheel(ctx context.Context, path, outputDir string) (string, error) {
 				return "", err
 			}
 			_, err = io.Copy(writer, rc)
-			rc.Close()
 			if err != nil {
+				rc.Close()
+				return "", err
+			}
+			if err := rc.Close(); err != nil {
 				return "", err
 			}
 		}
diff --git a/libs/patchwheel/patchwheel_test.go b/libs/patchwheel/patchwheel_test.go
index f02a03ef1..d5321dfe6 100644
--- a/libs/patchwheel/patchwheel_test.go
+++ b/libs/patchwheel/patchwheel_test.go
@@ -3,7 +3,8 @@ package patchwheel
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
+	"os"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -58,7 +59,7 @@ func writeProjectFiles(baseDir string, files map[string]string) error {
 		if err := os.MkdirAll(filepath.Dir(fullPath), 0o755); err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(fullPath, []byte(content), 0o644); err != nil {
+		if err := os.WriteFile(fullPath, []byte(content), 0o644); err != nil {
 			return err
 		}
 	}