more cleanup

Author: vtomasr5

cmd/jb/cache.go

@@ -389,119 +389,6 @@ func printCacheInfo(info CacheInfo) {
 	}
 }
 
-// cleanCache removes expired entries from the cache
-func cleanCache(cacheDir string, maxAgeInDays, maxSizeMB int) error {
-	// Check if cache directory exists
-	_, err := os.Stat(cacheDir)
-	if os.IsNotExist(err) {
-		// Nothing to clean
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-
-	// Get current cache information
-	info, err := getCacheInfo(cacheDir)
-	if err != nil {
-		return err
-	}
-
-	// If cache is already below limits, do nothing
-	maxSizeBytes := int64(maxSizeMB) * 1024 * 1024
-	if info.Size <= maxSizeBytes && time.Since(info.OldestEntry).Hours()/24 <= float64(maxAgeInDays) {
-		return nil
-	}
-
-	// Find entries to clean
-	entries, err := filepath.Glob(filepath.Join(cacheDir, "*"))
-	if err != nil {
-		return err
-	}
-
-	// Sort entries by age, oldest first
-	type Entry struct {
-		Path    string
-		ModTime time.Time
-	}
-
-	var sortedEntries []Entry
-	for _, path := range entries {
-		info, err := os.Stat(path)
-		if err != nil {
-			continue
-		}
-		if info.IsDir() {
-			sortedEntries = append(sortedEntries, Entry{
-				Path:    path,
-				ModTime: info.ModTime(),
-			})
-		}
-	}
-
-	// Remove entries that exceed age limit
-	cutoffTime := time.Now().AddDate(0, 0, -maxAgeInDays)
-	for _, entry := range sortedEntries {
-		if entry.ModTime.Before(cutoffTime) {
-			err := os.RemoveAll(entry.Path)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Warning: Failed to remove %s: %v\n", entry.Path, err)
-			}
-		}
-	}
-
-	// Recheck cache size after age-based cleanup
-	info, err = getCacheInfo(cacheDir)
-	if err != nil {
-		return err
-	}
-
-	// If still over size limit, remove oldest entries until under limit
-	if info.Size > maxSizeBytes {
-		// Re-scan entries after previous cleanup
-		entries, err = filepath.Glob(filepath.Join(cacheDir, "*"))
-		if err != nil {
-			return err
-		}
-
-		// Rebuild sorted entries
-		sortedEntries = []Entry{}
-		for _, path := range entries {
-			info, err := os.Stat(path)
-			if err != nil {
-				continue
-			}
-			if info.IsDir() {
-				sortedEntries = append(sortedEntries, Entry{
-					Path:    path,
-					ModTime: info.ModTime(),
-				})
-			}
-		}
-
-		// Remove oldest entries until under size limit
-		for _, entry := range sortedEntries {
-			err := os.RemoveAll(entry.Path)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Warning: Failed to remove %s: %v\n", entry.Path, err)
-				continue
-			}
-
-			// Recheck cache size after removal
-			info, err = getCacheInfo(cacheDir)
-			if err != nil {
-				return err
-			}
-
-			if info.Size <= maxSizeBytes {
-				break
-			}
-		}
-	}
-
-	return nil
-}
-
 // flushCache completely empties the cache but preserves the index.json file
 func flushCache(cacheDir string) error {
 	// Check if cache directory exists

cmd/jb/init_test.go

@@ -18,15 +18,14 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestInitCommand(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "jb-init")
+	tempDir, err := os.MkdirTemp("", "jb-init")
 	if err != nil {
 		t.Fatal(err)
 	}

cmd/jb/install.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -36,13 +35,13 @@ func installCommand(dir, jsonnetHome string, uris []string, single bool, legacyN
 		dir = "."
 	}
 
-	jbfilebytes, err := ioutil.ReadFile(filepath.Join(dir, jsonnetfile.File))
+	jbfilebytes, err := os.ReadFile(filepath.Join(dir, jsonnetfile.File))
 	kingpin.FatalIfError(err, "failed to load jsonnetfile")
 
 	jsonnetFile, err := jsonnetfile.Unmarshal(jbfilebytes)
 	kingpin.FatalIfError(err, "")
 
-	jblockfilebytes, err := ioutil.ReadFile(filepath.Join(dir, jsonnetfile.LockFile))
+	jblockfilebytes, err := os.ReadFile(filepath.Join(dir, jsonnetfile.LockFile))
 	if !os.IsNotExist(err) {
 		kingpin.FatalIfError(err, "failed to load lockfile")
 	}
@@ -114,7 +113,7 @@ func writeJSONFile(name string, d interface{}) error {
 	}
 	b = append(b, []byte("\n")...)
 
-	return ioutil.WriteFile(name, b, 0644)
+	return os.WriteFile(name, b, 0644)
 }
 
 func writeChangedJsonnetFile(originalBytes []byte, modified *v1.JsonnetFile, path string) error {

cmd/jb/update_test.go

@@ -18,7 +18,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -46,10 +45,10 @@ func (rs RepoState) LockPath(dir string) string {
 
 // Write writes this state to dir
 func (rs RepoState) Write(dir string) error {
-	if err := ioutil.WriteFile(rs.FilePath(dir), []byte(rs.File), 0644); err != nil {
+	if err := os.WriteFile(rs.FilePath(dir), []byte(rs.File), 0644); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(rs.LockPath(dir), []byte(rs.Lock), 0644); err != nil {
+	if err := os.WriteFile(rs.LockPath(dir), []byte(rs.Lock), 0644); err != nil {
 		return err
 	}
 	if err := os.MkdirAll(filepath.Join(dir, "vendor/"), os.ModePerm); err != nil {
@@ -60,11 +59,11 @@ func (rs RepoState) Write(dir string) error {
 
 // Assert checks that dir matches this state
 func (rs RepoState) Assert(t *testing.T, dir string) {
-	file, err := ioutil.ReadFile(rs.FilePath(dir))
+	file, err := os.ReadFile(rs.FilePath(dir))
 	require.NoError(t, err)
 	assert.JSONEq(t, rs.File, string(file))
 
-	lock, err := ioutil.ReadFile(rs.LockPath(dir))
+	lock, err := os.ReadFile(rs.LockPath(dir))
 	require.NoError(t, err)
 	assert.JSONEq(t, rs.Lock, string(lock))
 }
@@ -78,7 +77,7 @@ type UpdateCase struct {
 }
 
 func (u UpdateCase) Run(t *testing.T) {
-	dir, err := ioutil.TempDir("", u.name)
+	dir, err := os.MkdirTemp("", u.name)
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)