migrate resolvers to syft/internal

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

syft/source/internal/resolver/container_image_all_layers.go → syft/internal/fileresolver/container_image_all_layers.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"fmt"

syft/source/internal/resolver/container_image_all_layers_test.go → syft/internal/fileresolver/container_image_all_layers_test.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"fmt"

syft/source/internal/resolver/container_image_squash.go → syft/internal/fileresolver/container_image_squash.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"fmt"

syft/source/internal/resolver/container_image_squash_test.go → syft/internal/fileresolver/container_image_squash_test.go

@@ -1,12 +1,11 @@
-package resolver
+package fileresolver
 
 import (
 	"io"
 	"sort"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -514,26 +513,6 @@ func Test_imageSquashResolver_resolvesLinks(t *testing.T) {
 
 }
 
-func compareLocations(t *testing.T, expected, actual []file.Location) {
-	t.Helper()
-	ignoreUnexported := cmpopts.IgnoreFields(file.LocationData{}, "ref")
-	ignoreMetadata := cmpopts.IgnoreFields(file.LocationMetadata{}, "Annotations")
-	ignoreFS := cmpopts.IgnoreFields(file.Coordinates{}, "FileSystemID")
-
-	sort.Sort(file.Locations(expected))
-	sort.Sort(file.Locations(actual))
-
-	if d := cmp.Diff(expected, actual,
-		ignoreUnexported,
-		ignoreFS,
-		ignoreMetadata,
-	); d != "" {
-
-		t.Errorf("unexpected locations (-want +got):\n%s", d)
-	}
-
-}
-
 func TestSquashResolver_AllLocations(t *testing.T) {
 	img := imagetest.GetFixtureImage(t, "docker-archive", "image-files-deleted")
 

syft/internal/resolver/deferred.go → syft/internal/fileresolver/deferred.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"io"

syft/internal/resolver/deferred_test.go → syft/internal/fileresolver/deferred_test.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"testing"

syft/source/internal/resolver/directory.go → syft/internal/fileresolver/directory.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"errors"

syft/source/internal/resolver/directory_indexer.go → syft/internal/fileresolver/directory_indexer.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"errors"

syft/source/internal/resolver/directory_indexer_test.go → syft/internal/fileresolver/directory_indexer_test.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"io/fs"

syft/source/internal/resolver/directory_test.go → syft/internal/fileresolver/directory_test.go

@@ -1,7 +1,7 @@
 //go:build !windows
 // +build !windows
 
-package resolver
+package fileresolver
 
 import (
 	"io"
@@ -49,9 +49,9 @@ func TestDirectoryResolver_FilesByPath_relativeRoot(t *testing.T) {
 			name: "should find a file from a relative path (root above cwd)",
 			// TODO: refactor me! this test depends on the structure of the source dir not changing, which isn't great
 			relativeRoot: "../",
-			input:        "resolver.go",
+			input:        "fileresolver/directory.go",
 			expected: []string{
-				"resolver.go",
+				"fileresolver/directory.go",
 			},
 		},
 	}
@@ -99,9 +99,9 @@ func TestDirectoryResolver_FilesByPath_absoluteRoot(t *testing.T) {
 			name: "should find a file from a relative path (root above cwd)",
 			// TODO: refactor me! this test depends on the structure of the source dir not changing, which isn't great
 			relativeRoot: "../",
-			input:        "resolver.go",
+			input:        "fileresolver/directory.go",
 			expected: []string{
-				"resolver.go",
+				"fileresolver/directory.go",
 			},
 		},
 	}
@@ -664,20 +664,6 @@ func Test_SymlinkLoopWithGlobsShouldResolve(t *testing.T) {
 	testWithTimeout(t, 5*time.Second, test)
 }
 
-func testWithTimeout(t *testing.T, timeout time.Duration, test func(*testing.T)) {
-	done := make(chan bool)
-	go func() {
-		test(t)
-		done <- true
-	}()
-
-	select {
-	case <-time.After(timeout):
-		t.Fatal("test timed out")
-	case <-done:
-	}
-}
-
 func TestDirectoryResolver_FilesByPath_baseRoot(t *testing.T) {
 	cases := []struct {
 		name     string

syft/source/internal/resolver/directory_windows_test.go → syft/internal/fileresolver/directory_windows_test.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import "testing"
 

syft/internal/resolver/empty.go → syft/internal/fileresolver/empty.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"io"

syft/internal/resolver/excluding_file.go → syft/internal/fileresolver/excluding_file.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"fmt"

syft/internal/resolver/excluding_file_test.go → syft/internal/fileresolver/excluding_file_test.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"io"

syft/source/internal/resolver/file_metadata_by_location.go → syft/internal/fileresolver/file_metadata_by_location.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"github.com/anchore/stereoscope/pkg/image"

syft/internal/resolver/unindexed_directory.go → syft/internal/fileresolver/unindexed_directory.go

@@ -1,4 +1,4 @@
-package resolver
+package fileresolver
 
 import (
 	"fmt"

syft/internal/resolver/unindexed_directory_test.go → syft/internal/fileresolver/unindexed_directory_test.go

@@ -1,7 +1,7 @@
 //go:build !windows
 // +build !windows
 
-package resolver
+package fileresolver
 
 import (
 	"io"
@@ -60,9 +60,9 @@ func Test_UnindexedDirectoryResolver_FilesByPath_relativeRoot(t *testing.T) {
 			name: "should find a file from a relative path (root above cwd)",
 			// TODO: refactor me! this test depends on the structure of the source dir not changing, which isn't great
 			relativeRoot: "../",
-			input:        "resolver.go",
+			input:        "fileresolver/deferred.go",
 			expected: []string{
-				"resolver.go",
+				"fileresolver/deferred.go",
 			},
 		},
 	}
@@ -109,9 +109,9 @@ func Test_UnindexedDirectoryResolver_FilesByPath_absoluteRoot(t *testing.T) {
 			name: "should find a file from a relative path (root above cwd)",
 			// TODO: refactor me! this test depends on the structure of the source dir not changing, which isn't great
 			relativeRoot: "../",
-			input:        "resolver.go",
+			input:        "fileresolver/directory.go",
 			expected: []string{
-				"resolver.go",
+				"fileresolver/directory.go",
 			},
 		},
 	}

syft/pkg/cataloger/golang/licenses.go

@@ -23,7 +23,7 @@ import (
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/event"
 	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/internal/resolver"
+	"github.com/anchore/syft/syft/internal/fileresolver"
 	"github.com/anchore/syft/syft/pkg"
 )
 
@@ -61,15 +61,15 @@ func modCacheResolver(modCacheDir string) file.WritableResolver {
 
 	if modCacheDir == "" {
 		log.Trace("unable to determine mod cache directory, skipping mod cache resolver")
-		r = resolver.Empty{}
+		r = fileresolver.Empty{}
 	} else {
 		stat, err := os.Stat(modCacheDir)
 
 		if os.IsNotExist(err) || stat == nil || !stat.IsDir() {
 			log.Tracef("unable to open mod cache directory: %s, skipping mod cache resolver", modCacheDir)
-			r = resolver.Empty{}
+			r = fileresolver.Empty{}
 		} else {
-			r = resolver.NewFromUnindexedDirectory(modCacheDir)
+			r = fileresolver.NewFromUnindexedDirectory(modCacheDir)
 		}
 	}
 

syft/pkg/cataloger/golang/licenses_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/internal/resolver"
+	"github.com/anchore/syft/syft/internal/fileresolver"
 	"github.com/anchore/syft/syft/license"
 	"github.com/anchore/syft/syft/pkg"
 )
@@ -64,7 +64,7 @@ func Test_LocalLicenseSearch(t *testing.T) {
 					localModCacheDir:            path.Join(wd, "test-fixtures", "licenses", "pkg", "mod"),
 				},
 			)
-			licenses, err := l.getLicenses(resolver.Empty{}, test.name, test.version)
+			licenses, err := l.getLicenses(fileresolver.Empty{}, test.name, test.version)
 			require.NoError(t, err)
 
 			require.Len(t, licenses, 1)
@@ -154,7 +154,7 @@ func Test_RemoteProxyLicenseSearch(t *testing.T) {
 				localModCacheDir:     modDir,
 			})
 
-			licenses, err := l.getLicenses(resolver.Empty{}, test.name, test.version)
+			licenses, err := l.getLicenses(fileresolver.Empty{}, test.name, test.version)
 			require.NoError(t, err)
 
 			require.Len(t, licenses, 1)

syft/pkg/cataloger/golang/parse_go_binary_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/internal/resolver"
+	"github.com/anchore/syft/syft/internal/fileresolver"
 	"github.com/anchore/syft/syft/pkg"
 )
 
@@ -508,7 +508,7 @@ func TestBuildGoPkgInfo(t *testing.T) {
 			)
 
 			c := goBinaryCataloger{}
-			pkgs := c.buildGoPkgInfo(resolver.Empty{}, location, test.mod, test.arch)
+			pkgs := c.buildGoPkgInfo(fileresolver.Empty{}, location, test.mod, test.arch)
 			assert.Equal(t, test.expected, pkgs)
 		})
 	}

syft/source/source.go

@@ -23,8 +23,7 @@ import (
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/file"
-	resolver2 "github.com/anchore/syft/syft/internal/resolver"
-	"github.com/anchore/syft/syft/source/internal/resolver"
+	"github.com/anchore/syft/syft/internal/fileresolver"
 )
 
 // Source is an object that captures the data source to be cataloged, configuration, and a specific resolver used
@@ -33,7 +32,7 @@ type Source struct {
 	id                artifact.ID  `hash:"ignore"`
 	Image             *image.Image `hash:"ignore"` // the image object to be cataloged (image only)
 	Metadata          Metadata
-	directoryResolver *resolver.Directory `hash:"ignore"`
+	directoryResolver *fileresolver.Directory `hash:"ignore"`
 	path              string
 	base              string
 	mutex             *sync.Mutex
@@ -465,7 +464,7 @@ func (s *Source) FileResolver(scope Scope) (file.Resolver, error) {
 			if err != nil {
 				return nil, err
 			}
-			res, err := resolver.NewFromDirectory(s.path, s.base, exclusionFunctions...)
+			res, err := fileresolver.NewFromDirectory(s.path, s.base, exclusionFunctions...)
 			if err != nil {
 				return nil, fmt.Errorf("unable to create directory resolver: %w", err)
 			}
@@ -477,9 +476,9 @@ func (s *Source) FileResolver(scope Scope) (file.Resolver, error) {
 		var err error
 		switch scope {
 		case SquashedScope:
-			res, err = resolver.NewFromContainerImageSquash(s.Image)
+			res, err = fileresolver.NewFromContainerImageSquash(s.Image)
 		case AllLayersScope:
-			res, err = resolver.NewFromContainerImageAllLayers(s.Image)
+			res, err = fileresolver.NewFromContainerImageAllLayers(s.Image)
 		default:
 			return nil, fmt.Errorf("bad image scope provided: %+v", scope)
 		}
@@ -488,7 +487,7 @@ func (s *Source) FileResolver(scope Scope) (file.Resolver, error) {
 		}
 		// image tree contains all paths, so we filter out the excluded entries afterwards
 		if len(s.Exclusions) > 0 {
-			res = resolver2.NewExcluding(res, getImageExclusionFunction(s.Exclusions))
+			res = fileresolver.NewExcluding(res, getImageExclusionFunction(s.Exclusions))
 		}
 		return res, nil
 	}
@@ -532,7 +531,7 @@ func getImageExclusionFunction(exclusions []string) func(string) bool {
 	}
 }
 
-func getDirectoryExclusionFunctions(root string, exclusions []string) ([]resolver.PathIndexVisitor, error) {
+func getDirectoryExclusionFunctions(root string, exclusions []string) ([]fileresolver.PathIndexVisitor, error) {
 	if len(exclusions) == 0 {
 		return nil, nil
 	}
@@ -565,7 +564,7 @@ func getDirectoryExclusionFunctions(root string, exclusions []string) ([]resolve
 		return nil, fmt.Errorf("invalid exclusion pattern(s): '%s' (must start with one of: './', '*/', or '**/')", strings.Join(errors, "', '"))
 	}
 
-	return []resolver.PathIndexVisitor{
+	return []fileresolver.PathIndexVisitor{
 		func(path string, info os.FileInfo, _ error) error {
 			for _, exclusion := range exclusions {
 				// this is required to handle Windows filepaths
@@ -578,7 +577,7 @@ func getDirectoryExclusionFunctions(root string, exclusions []string) ([]resolve
 					if info != nil && info.IsDir() {
 						return filepath.SkipDir
 					}
-					return resolver.ErrSkipPath
+					return fileresolver.ErrSkipPath
 				}
 			}
 			return nil