cachedigest: rename array types to list

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

solver/llbsolver/ops/file.go

@@ -158,7 +158,7 @@ func (f *fileOp) CacheMap(ctx context.Context, g session.Group, index int) (*sol
 		}
 		slices.SortFunc(paths, bytes.Compare)
 		slices.Reverse(paths) // historical reasons
-		dgst, err := cachedigest.FromBytes(bytes.Join(paths, []byte{0}), cachedigest.TypeStringArray)
+		dgst, err := cachedigest.FromBytes(bytes.Join(paths, []byte{0}), cachedigest.TypeStringList)
 		if err != nil {
 			return nil, false, err
 		}

solver/llbsolver/ops/opsutils/contenthash.go

@@ -67,6 +67,6 @@ func NewContentHashFunc(selectors []Selector) solver.ResultBasedCacheFunc {
 			return "", err
 		}
 
-		return cachedigest.FromBytes(bytes.Join(dgsts, []byte{0}), cachedigest.TypeDigestArray)
+		return cachedigest.FromBytes(bytes.Join(dgsts, []byte{0}), cachedigest.TypeDigestList)
 	}
 }

util/cachedigest/db_test.go

@@ -59,7 +59,7 @@ func TestNewHashAndGet(t *testing.T) {
 	db, cleanup := tempDB(t)
 	defer cleanup()
 
-	h := db.NewHash(TypeStringArray)
+	h := db.NewHash(TypeStringList)
 	inputs := [][]byte{
 		[]byte("foo"),
 		[]byte("bar"),
@@ -85,7 +85,7 @@ func TestNewHashAndGet(t *testing.T) {
 
 	gotType, frames, err := db.Get(context.Background(), sum.String())
 	require.NoError(t, err)
-	require.Equal(t, TypeStringArray, gotType)
+	require.Equal(t, TypeStringList, gotType)
 
 	var dataFrames [][]byte
 	var skipLens []uint32
@@ -154,8 +154,8 @@ func TestAll(t *testing.T) {
 		typ  Type
 	}{
 		{[]byte("foo"), TypeString},
-		{[]byte("bar"), TypeStringArray},
-		{[]byte("baz"), TypeDigestArray},
+		{[]byte("bar"), TypeStringList},
+		{[]byte("baz"), TypeDigestList},
 	}
 
 	var digests []string

util/cachedigest/digest.go

@@ -14,12 +14,12 @@ import (
 type Type string
 
 const (
-	TypeJSON        Type = "json"
-	TypeString      Type = "string"
-	TypeStringArray Type = "string-array"
-	TypeDigestArray Type = "digest-array"
-	TypeFileList    Type = "file-list"
-	TypeFile        Type = "file"
+	TypeJSON       Type = "json"
+	TypeString     Type = "string"
+	TypeStringList Type = "string-list"
+	TypeDigestList Type = "digest-list"
+	TypeFileList   Type = "file-list"
+	TypeFile       Type = "file"
 )
 
 func (t Type) String() string {
@@ -120,7 +120,7 @@ func (r *Record) LoadSubRecords(loader func(d digest.Digest) (Type, []Frame, err
 				checksums = append(checksums, string(match[0]))
 			}
 		}
-	case TypeDigestArray:
+	case TypeDigestList:
 		for _, dgst := range bytes.Split(dt, []byte{0}) {
 			checksums = append(checksums, string(dgst))
 		}