chore: isolate changes

Author: ldez

internal/cache/cache.go

@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/golangci/golangci-lint/internal/renameio"
-	"github.com/golangci/golangci-lint/internal/robustio"
 )
 
 // An ActionID is a cache action key, the hash of a complete description of a
@@ -78,10 +77,6 @@ func (c *Cache) fileName(id [HashSize]byte, key string) string {
 
 var errMissing = errors.New("cache entry not found")
 
-func IsErrMissing(err error) bool {
-	return errors.Is(err, errMissing)
-}
-
 const (
 	// action entry file is "v1 <hex id> <hex out> <decimal size space-padded to 20 bytes> <unixnano space-padded to 20 bytes>\n"
 	hexSize   = HashSize * 2
@@ -222,16 +217,10 @@ func (c *Cache) GetBytes(id ActionID) ([]byte, Entry, error) {
 	if err != nil {
 		return nil, entry, err
 	}
-	outputFile, err := c.OutputFile(entry.OutputID)
+	data, err := c.readFileCGIL(c.OutputFile(entry.OutputID))
 	if err != nil {
 		return nil, entry, err
 	}
-
-	data, err := robustio.ReadFile(outputFile)
-	if err != nil {
-		return nil, entry, err
-	}
-
 	if sha256.Sum256(data) != entry.OutputID {
 		return nil, entry, errMissing
 	}

internal/cache/cache_gcil.go

@@ -1 +1,19 @@
 package cache
+
+import (
+	"errors"
+
+	"github.com/golangci/golangci-lint/internal/robustio"
+)
+
+func IsErrMissing(err error) bool {
+	return errors.Is(err, errMissing)
+}
+
+func (c *Cache) readFileCGIL(outputFile string, err error) ([]byte, error) {
+	if err != nil {
+		return nil, err
+	}
+
+	return robustio.ReadFile(outputFile)
+}

internal/cache/default.go

@@ -13,8 +13,6 @@ import (
 	"sync"
 )
 
-const envGolangciLintCache = "GOLANGCI_LINT_CACHE"
-
 // Default returns the default cache to use.
 func Default() (*Cache, error) {
 	defaultOnce.Do(initDefaultCache)

internal/cache/default_gcil.go

@@ -1 +1,3 @@
 package cache
+
+const envGolangciLintCache = "GOLANGCI_LINT_CACHE"

internal/cache/hash.go

@@ -36,10 +36,6 @@ type Hash struct {
 // which are still addressed by unsalted SHA256.
 var hashSalt []byte
 
-func SetSalt(b []byte) {
-	hashSalt = b
-}
-
 // Subkey returns an action ID corresponding to mixing a parent
 // action ID with a string description of the subkey.
 func Subkey(parent ActionID, desc string) (ActionID, error) {

internal/cache/hash_gcil.go

@@ -1 +1,5 @@
 package cache
+
+func SetSalt(b []byte) {
+	hashSalt = b
+}