Updates per PR review

Signed-off-by: Natalie Arellano <narellano@vmware.com>

acceptance/analyzer_test.go

@@ -337,7 +337,7 @@ func testAnalyzerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						output, err := cmd.CombinedOutput()
 						h.AssertNotNil(t, err)
 
-						h.AssertStringContains(t, string(output), "initializing analyzer: validating registry read access: ensure registry read access to some-run-image") // TODO: update some-run-image to have explicit permissions when https://github.com/buildpacks/lifecycle/pull/685 is merged
+						h.AssertStringContains(t, string(output), "validating registry read access: ensure registry read access to some-run-image") // TODO: update some-run-image to have explicit permissions when https://github.com/buildpacks/lifecycle/pull/685 is merged
 					})
 
 					when("stack.toml not present", func() {
@@ -933,7 +933,7 @@ func testAnalyzerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						output, err := cmd.CombinedOutput()
 
 						h.AssertNotNil(t, err)
-						expected := "initializing analyzer: validating registry read access: ensure registry read access to " + analyzeRegFixtures.InaccessibleImage
+						expected := "validating registry read access: ensure registry read access to " + analyzeRegFixtures.InaccessibleImage
 						h.AssertStringContains(t, string(output), expected)
 					})
 				})
@@ -1033,7 +1033,7 @@ func testAnalyzerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 							output, err := cmd.CombinedOutput()
 
 							h.AssertNotNil(t, err)
-							expected := "initializing analyzer: validating registry write access: ensure registry read/write access to " + analyzeRegFixtures.ReadOnlyCacheImage
+							expected := "validating registry write access: ensure registry read/write access to " + analyzeRegFixtures.ReadOnlyCacheImage
 							h.AssertStringContains(t, string(output), expected)
 						})
 					})
@@ -1106,7 +1106,7 @@ func testAnalyzerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						output, err := cmd.CombinedOutput()
 
 						h.AssertNotNil(t, err)
-						expected := "initializing analyzer: validating registry write access: ensure registry read/write access to " + analyzeRegFixtures.InaccessibleImage
+						expected := "validating registry write access: ensure registry read/write access to " + analyzeRegFixtures.InaccessibleImage
 						h.AssertStringContains(t, string(output), expected)
 					})
 				})

analyzer.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/buildpacks/lifecycle/api"
 	"github.com/buildpacks/lifecycle/buildpack"
+	"github.com/buildpacks/lifecycle/cache"
 	"github.com/buildpacks/lifecycle/image"
 	"github.com/buildpacks/lifecycle/internal/layer"
 	"github.com/buildpacks/lifecycle/platform"
@@ -15,17 +16,163 @@ type Platform interface {
 	API() *api.Version
 }
 
+type AnalyzerFactory struct {
+	platformAPI     *api.Version
+	cacheHandler    CacheHandler
+	configHandler   ConfigHandler
+	imageHandler    ImageHandler
+	registryHandler RegistryHandler
+}
+
+func NewAnalyzerFactory(platformAPI *api.Version, cacheHandler CacheHandler, configHandler ConfigHandler, imageHandler ImageHandler, registryHandler RegistryHandler) *AnalyzerFactory {
+	return &AnalyzerFactory{
+		platformAPI:     platformAPI,
+		cacheHandler:    cacheHandler,
+		configHandler:   configHandler,
+		imageHandler:    imageHandler,
+		registryHandler: registryHandler,
+	}
+}
+
 type Analyzer struct {
 	PreviousImage imgutil.Image
 	RunImage      imgutil.Image
 	Logger        Logger
-	Platform      Platform
 	SBOMRestorer  layer.SBOMRestorer
 
 	// Platform API < 0.7
 	Buildpacks            []buildpack.GroupBuildpack
 	Cache                 Cache
 	LayerMetadataRestorer layer.MetadataRestorer
+	RestoresLayerMetadata bool
+}
+
+func (f *AnalyzerFactory) NewAnalyzer(
+	additionalTags []string,
+	cacheImageRef string,
+	launchCacheDir string,
+	layersDir string,
+	legacyCacheDir string,
+	legacyGroup buildpack.Group,
+	legacyGroupPath string,
+	outputImageRef string,
+	previousImageRef string,
+	runImageRef string,
+	skipLayers bool,
+	logger Logger,
+) (*Analyzer, error) {
+	analyzer := &Analyzer{
+		LayerMetadataRestorer: &layer.NopMetadataRestorer{},
+		Logger:                logger,
+		SBOMRestorer:          &layer.NopSBOMRestorer{},
+	}
+
+	if f.platformAPI.AtLeast("0.7") {
+		if err := f.ensureRegistryAccess(additionalTags, cacheImageRef, outputImageRef, runImageRef, previousImageRef); err != nil {
+			return nil, err
+		}
+	} else {
+		if err := f.setBuildpacks(analyzer, legacyGroup, legacyGroupPath); err != nil {
+			return nil, err
+		}
+
+		if err := f.setCache(analyzer, cacheImageRef, legacyCacheDir); err != nil {
+			return nil, err
+		}
+
+		analyzer.LayerMetadataRestorer = &layer.DefaultMetadataRestorer{
+			LayersDir:  layersDir,
+			Logger:     logger,
+			SkipLayers: skipLayers,
+		}
+		analyzer.RestoresLayerMetadata = true
+	}
+	if f.platformAPI.AtLeast("0.8") && !skipLayers {
+		analyzer.SBOMRestorer = &layer.DefaultSBOMRestorer{
+			LayersDir: layersDir,
+			Logger:    logger,
+		}
+	}
+	if err := f.setPrevious(analyzer, previousImageRef, launchCacheDir); err != nil {
+		return nil, err
+	}
+	if err := f.setRun(analyzer, runImageRef); err != nil {
+		return nil, err
+	}
+	return analyzer, nil
+}
+
+func (f *AnalyzerFactory) ensureRegistryAccess(
+	additionalTags []string,
+	cacheImageRef string,
+	outputImageRef string,
+	runImageRef string,
+	previousImageRef string,
+) error {
+	var readImages, writeImages []string
+	writeImages = append(writeImages, cacheImageRef)
+	if !f.imageHandler.Docker() {
+		readImages = append(readImages, previousImageRef, runImageRef)
+		writeImages = append(writeImages, outputImageRef)
+		writeImages = append(writeImages, additionalTags...)
+	}
+
+	if err := f.registryHandler.EnsureReadAccess(readImages...); err != nil {
+		return errors.Wrap(err, "validating registry read access")
+	}
+	if err := f.registryHandler.EnsureWriteAccess(writeImages...); err != nil {
+		return errors.Wrap(err, "validating registry write access")
+	}
+	return nil
+}
+
+func (f *AnalyzerFactory) setBuildpacks(analyzer *Analyzer, group buildpack.Group, path string) error {
+	if len(group.Group) > 0 {
+		analyzer.Buildpacks = group.Group
+		return nil
+	}
+	var err error
+	analyzer.Buildpacks, err = f.configHandler.ReadGroup(path)
+	return err
+}
+
+func (f *AnalyzerFactory) setCache(analyzer *Analyzer, imageRef string, dir string) error {
+	var err error
+	analyzer.Cache, err = f.cacheHandler.InitCache(imageRef, dir)
+	return err
+}
+
+func (f *AnalyzerFactory) setPrevious(analyzer *Analyzer, imageRef string, launchCacheDir string) error {
+	if imageRef == "" {
+		return nil
+	}
+	var err error
+	analyzer.PreviousImage, err = f.imageHandler.InitImage(imageRef)
+	if err != nil {
+		return errors.Wrap(err, "getting previous image")
+	}
+	if launchCacheDir == "" || !f.imageHandler.Docker() {
+		return nil
+	}
+
+	volumeCache, err := cache.NewVolumeCache(launchCacheDir)
+	if err != nil {
+		return errors.Wrap(err, "creating launch cache")
+	}
+	analyzer.PreviousImage = cache.NewCachingImage(analyzer.PreviousImage, volumeCache)
+	return nil
+}
+
+func (f *AnalyzerFactory) setRun(analyzer *Analyzer, imageRef string) error {
+	if imageRef == "" {
+		return nil
+	}
+	var err error
+	analyzer.RunImage, err = f.imageHandler.InitImage(imageRef)
+	if err != nil {
+		return errors.Wrap(err, "getting run image")
+	}
+	return nil
 }
 
 // Analyze fetches the layers metadata from the previous image and writes analyzed.toml.
@@ -62,7 +209,7 @@ func (a *Analyzer) Analyze() (platform.AnalyzedMetadata, error) {
 		}
 	}
 
-	if a.restoresLayerMetadata() {
+	if a.RestoresLayerMetadata {
 		cacheMeta, err = retrieveCacheMetadata(a.Cache, a.Logger)
 		if err != nil {
 			return platform.AnalyzedMetadata{}, err
@@ -81,10 +228,6 @@ func (a *Analyzer) Analyze() (platform.AnalyzedMetadata, error) {
 	}, nil
 }
 
-func (a *Analyzer) restoresLayerMetadata() bool {
-	return a.Platform.API().LessThan("0.7")
-}
-
 func (a *Analyzer) getImageIdentifier(image imgutil.Image) (*platform.ImageIdentifier, error) {
 	if !image.Found() {
 		a.Logger.Infof("Previous image with name %q not found", image.Name())