Handle review comments via cursor AI

Author: ranjith-ka

pkg/skaffold/deploy/helm/helm.go

@@ -67,7 +67,6 @@ import (
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/walk"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/warnings"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/yaml"
-	"regexp"
 )
 
 var (

pkg/skaffold/helm/util.go

@@ -135,21 +135,25 @@ func PullAndExtractChartFile(chartRef, version, fileInChart string) (string, fun
 	if err != nil {
 		return "", nil, err
 	}
+	success := false
 	cleanup := func() { os.RemoveAll(tmpDir) }
+	defer func() {
+		if !success {
+			cleanup()
+		}
+	}()
 
 	// Pull the chart
 	pullArgs := []string{"pull", chartRef, "--version", version, "--destination", tmpDir}
 	cmd := exec.Command("helm", pullArgs...)
 	if out, err := cmd.CombinedOutput(); err != nil {
-		cleanup()
 		return "", nil, fmt.Errorf("failed to pull chart: %v\n%s", err, string(out))
 	}
 
 	// Find the .tgz file
 	var tgzPath string
 	dirEntries, err := os.ReadDir(tmpDir)
 	if err != nil {
-		cleanup()
 		return "", nil, err
 	}
 	for _, entry := range dirEntries {
@@ -159,20 +163,17 @@ func PullAndExtractChartFile(chartRef, version, fileInChart string) (string, fun
 		}
 	}
 	if tgzPath == "" {
-		cleanup()
 		return "", nil, fmt.Errorf("no chart archive found after helm pull")
 	}
 
 	// Extract the requested file
 	tgzFile, err := os.Open(tgzPath)
 	if err != nil {
-		cleanup()
 		return "", nil, err
 	}
 	defer tgzFile.Close()
 	gzReader, err := gzip.NewReader(tgzFile)
 	if err != nil {
-		cleanup()
 		return "", nil, err
 	}
 	tarReader := tar.NewReader(gzReader)
@@ -184,29 +185,25 @@ func PullAndExtractChartFile(chartRef, version, fileInChart string) (string, fun
 			break
 		}
 		if err != nil {
-			cleanup()
 			return "", nil, err
 		}
 		// Chart files are inside a top-level dir, e.g. united/values-prod.yaml
 		if filepath.Base(hdr.Name) == fileInChart {
 			extractedPath = filepath.Join(tmpDir, fileInChart)
 			outFile, err := os.Create(extractedPath)
 			if err != nil {
-				cleanup()
 				return "", nil, err
 			}
+			defer outFile.Close()
 			if _, err := io.Copy(outFile, tarReader); err != nil {
-				outFile.Close()
-				cleanup()
 				return "", nil, err
 			}
-			outFile.Close()
 			break
 		}
 	}
 	if extractedPath == "" {
-		cleanup()
 		return "", nil, fmt.Errorf("file %s not found in chart", fileInChart)
 	}
+	success = true
 	return extractedPath, cleanup, nil
 }