From 4b69758f2c519c9abcabbf534bb37457ae0d4143 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 8 Jul 2020 09:33:33 -0400 Subject: [PATCH] scope: create a new generic Resolver interface Signed-off-by: Alfredo Deza --- imgbom/scope/file_resolver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imgbom/scope/file_resolver.go b/imgbom/scope/file_resolver.go index 7d8484de6..90c38dd01 100644 --- a/imgbom/scope/file_resolver.go +++ b/imgbom/scope/file_resolver.go @@ -8,9 +8,9 @@ import ( "github.com/anchore/stereoscope/pkg/image" ) -type FileContentResolver interface { - ContentResolver - FileResolver +type Resolver interface { + ContentResolver // knows how to get content from file.References + FileResolver // knows how to get file.References from string paths and globs } type ContentResolver interface { @@ -22,7 +22,7 @@ type FileResolver interface { FilesByGlob(patterns ...string) ([]file.Reference, error) } -func getFileResolver(img *image.Image, option Option) (FileResolver, error) { +func getImageResolver(img *image.Image, option Option) (Resolver, error) { switch option { case SquashedScope: return resolvers.NewImageSquashResolver(img)