feat: separate tagged image providers

.github/actions/bootstrap/action.yaml

@@ -4,7 +4,7 @@ inputs:
   go-version:
     description: "Go version to install"
     required: true
-    default: "1.19.x"
+    default: "1.20.x"
   use-go-cache:
     description: "Restore go cache"
     required: true

client.go

@@ -2,23 +2,17 @@ package stereoscope
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"runtime"
+	"strings"
 
 	"github.com/wagoodman/go-partybus"
 
 	"github.com/anchore/go-logger"
 	"github.com/anchore/stereoscope/internal/bus"
-	containerdClient "github.com/anchore/stereoscope/internal/containerd"
-	dockerClient "github.com/anchore/stereoscope/internal/docker"
 	"github.com/anchore/stereoscope/internal/log"
-	"github.com/anchore/stereoscope/internal/podman"
 	"github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/stereoscope/pkg/image"
-	"github.com/anchore/stereoscope/pkg/image/containerd"
-	"github.com/anchore/stereoscope/pkg/image/docker"
-	"github.com/anchore/stereoscope/pkg/image/oci"
-	"github.com/anchore/stereoscope/pkg/image/sif"
 )
 
 var rootTempDirGenerator = file.NewTempDirGenerator("stereoscope")
@@ -69,151 +63,50 @@ func WithPlatform(platform string) Option {
 	}
 }
 
+// GetImage parses the user provided image string and provides an image object;
+// note: the source where the image should be referenced from is automatically inferred.
+func GetImage(ctx context.Context, imgStr string, options ...Option) (*image.Image, error) {
+	return GetImageFromSource(ctx, imgStr, "", options...)
+}
+
 // GetImageFromSource returns an image from the explicitly provided source.
 func GetImageFromSource(ctx context.Context, imgStr string, source image.Source, options ...Option) (*image.Image, error) {
 	log.Debugf("image: source=%+v location=%+v", source, imgStr)
 
-	var cfg config
-	for _, option := range options {
-		if option == nil {
-			continue
-		}
-		if err := option(&cfg); err != nil {
-			return nil, fmt.Errorf("unable to parse option: %w", err)
-		}
-	}
-
-	provider, cleanup, err := selectImageProvider(imgStr, source, cfg)
-	if cleanup != nil {
-		defer cleanup()
-	}
-	if err != nil {
+	// apply ImageProviderConfig config
+	cfg := config{}
+	if err := applyOptions(&cfg, options...); err != nil {
 		return nil, err
 	}
 
-	img, err := provider.Provide(ctx, cfg.AdditionalMetadata...)
-	if err != nil {
-		return nil, fmt.Errorf("unable to use %s source: %w", source, err)
+	// select image provider
+	providers := ImageProviders(ImageProviderConfig{
+		Registry: cfg.Registry,
+		Platform: cfg.Platform,
+	})
+	source = strings.ToLower(strings.TrimSpace(source))
+	if source == "" {
+		// if no source is explicitly specified, look for a known scheme like docker:
+		source, imgStr = ExtractSchemeSource(providers, imgStr)
 	}
-
-	err = img.Read()
-	if err != nil {
-		return nil, fmt.Errorf("could not read image: %+v", err)
-	}
-
-	return img, nil
-}
-
-// nolint:funlen
-func selectImageProvider(imgStr string, source image.Source, cfg config) (image.Provider, func(), error) {
-	var provider image.Provider
-	tempDirGenerator := rootTempDirGenerator.NewGenerator()
-	platformSelectionUnsupported := fmt.Errorf("specified platform=%q however image source=%q does not support selecting platform", cfg.Platform.String(), source.String())
-
-	cleanup := func() {}
-
-	switch source {
-	case image.DockerTarballSource:
-		if cfg.Platform != nil {
-			return nil, cleanup, platformSelectionUnsupported
-		}
-		// note: the imgStr is the path on disk to the tar file
-		provider = docker.NewProviderFromTarball(imgStr, tempDirGenerator)
-	case image.ContainerdDaemonSource:
-		c, err := containerdClient.GetClient()
-		if err != nil {
-			return nil, cleanup, err
-		}
-
-		cleanup = func() {
-			if err := c.Close(); err != nil {
-				log.Errorf("unable to close docker client: %+v", err)
-			}
-		}
-
-		provider, err = containerd.NewProviderFromDaemon(imgStr, tempDirGenerator, c, containerdClient.Namespace(), cfg.Registry, cfg.Platform)
-		if err != nil {
-			return nil, cleanup, err
-		}
-	case image.DockerDaemonSource:
-		c, err := dockerClient.GetClient()
-		if err != nil {
-			return nil, cleanup, err
-		}
-
-		cleanup = func() {
-			if err := c.Close(); err != nil {
-				log.Errorf("unable to close docker client: %+v", err)
-			}
-		}
-
-		provider, err = docker.NewProviderFromDaemon(imgStr, tempDirGenerator, c, cfg.Platform)
-		if err != nil {
-			return nil, cleanup, err
-		}
-	case image.PodmanDaemonSource:
-		c, err := podman.GetClient()
-		if err != nil {
-			return nil, cleanup, err
-		}
-
-		cleanup = func() {
-			if err := c.Close(); err != nil {
-				log.Errorf("unable to close docker client: %+v", err)
-			}
+	if source != "" {
+		providers = providers.Select(source)
+		if len(providers) == 0 {
+			return nil, fmt.Errorf("unable to find image providers matching: '%s'", source)
 		}
+	}
 
-		provider, err = docker.NewProviderFromDaemon(imgStr, tempDirGenerator, c, cfg.Platform)
+	var errs []error
+	for _, provider := range providers.Collect() {
+		img, err := provider.Provide(ctx, imgStr, cfg.AdditionalMetadata...)
 		if err != nil {
-			return nil, cleanup, err
-		}
-	case image.OciDirectorySource:
-		if cfg.Platform != nil {
-			return nil, cleanup, platformSelectionUnsupported
+			errs = append(errs, err)
 		}
-		provider = oci.NewProviderFromPath(imgStr, tempDirGenerator)
-	case image.OciTarballSource:
-		if cfg.Platform != nil {
-			return nil, cleanup, platformSelectionUnsupported
+		if img != nil {
+			return img, nil
 		}
-		provider = oci.NewProviderFromTarball(imgStr, tempDirGenerator)
-	case image.OciRegistrySource:
-		defaultPlatformIfNil(&cfg)
-		provider = oci.NewProviderFromRegistry(imgStr, tempDirGenerator, cfg.Registry, cfg.Platform)
-	case image.SingularitySource:
-		if cfg.Platform != nil {
-			return nil, cleanup, platformSelectionUnsupported
-		}
-		provider = sif.NewProviderFromPath(imgStr, tempDirGenerator)
-	default:
-		return nil, cleanup, fmt.Errorf("unable to determine image source")
-	}
-	return provider, cleanup, nil
-}
-
-// defaultPlatformIfNil sets the platform to use the host's architecture
-// if no platform was specified. The OCI registry provider uses "linux/amd64"
-// as a hard-coded default platform, which has surprised customers
-// running stereoscope on non-amd64 hosts. If platform is already
-// set on the config, or the code can't generate a matching platform,
-// do nothing.
-func defaultPlatformIfNil(cfg *config) {
-	if cfg.Platform == nil {
-		p, err := image.NewPlatform(fmt.Sprintf("linux/%s", runtime.GOARCH))
-		if err == nil {
-			cfg.Platform = p
-		}
-	}
-}
-
-// GetImage parses the user provided image string and provides an image object;
-// note: the source where the image should be referenced from is automatically inferred.
-func GetImage(ctx context.Context, userStr string, options ...Option) (*image.Image, error) {
-	source, imgStr, err := image.DetectSource(userStr)
-	if err != nil {
-		return nil, err
 	}
-	return GetImageFromSource(ctx, imgStr, source, options...)
+	return nil, fmt.Errorf("unable to detect input for '%s', errs: %w", imgStr, errors.Join(errs...))
 }
 
 func SetLogger(logger logger.Logger) {

deprecated.go

@@ -0,0 +1,31 @@
+package stereoscope
+
+import (
+	"strings"
+
+	"github.com/anchore/stereoscope/tagged"
+)
+
+// ExtractSchemeSource parses a string with any colon-delimited prefix and validates it against the set
+// of known provider tags, returning a valid source name and input string to use for GetImageFromSource
+//
+// NOTE: since it is now possible to select which providers to use, using schemes
+// in the user input text is not necessary and should be avoided due to some ambiguity this introduces
+func ExtractSchemeSource[T comparable](schemeTags tagged.Values[T], userInput string) (scheme, newInput string) {
+	const SchemeSeparator = ":"
+
+	parts := strings.SplitN(userInput, SchemeSeparator, 2)
+	if len(parts) < 2 {
+		return "", userInput
+	}
+	// the user may have provided a source hint (or this is a split from a path or docker image reference, we aren't certain yet)
+	sourceHint := parts[0]
+	sourceHint = strings.TrimSpace(strings.ToLower(sourceHint))
+	// validate the hint against the possible tags
+	if !schemeTags.HasTag(sourceHint) {
+		// did not have any matching tags, scheme is not a valid provider scheme
+		return "", userInput
+	}
+
+	return sourceHint, parts[1]
+}

go.mod

@@ -1,6 +1,6 @@
 module github.com/anchore/stereoscope
 
-go 1.19
+go 1.20
 
 require (
 	github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible
@@ -11,12 +11,12 @@ require (
 	github.com/becheran/wildmatch-go v1.0.0
 	github.com/bmatcuk/doublestar/v4 v4.0.2
 	github.com/containerd/containerd v1.7.11
-	github.com/docker/cli v23.0.3+incompatible
-	github.com/docker/docker v23.0.8+incompatible
+	github.com/docker/cli v24.0.0+incompatible
+	github.com/docker/docker v24.0.0+incompatible
 	github.com/gabriel-vasile/mimetype v1.4.0
 	github.com/go-test/deep v1.0.8
 	github.com/google/go-cmp v0.5.9
-	github.com/google/go-containerregistry v0.14.0
+	github.com/google/go-containerregistry v0.19.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381
 	github.com/mitchellh/go-homedir v1.1.0
@@ -73,7 +73,7 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/klauspost/compress v1.16.4 // indirect
+	github.com/klauspost/compress v1.16.5 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
@@ -82,7 +82,7 @@ require (
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/sys/signal v0.7.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
+	github.com/opencontainers/image-spec v1.1.0-rc3
 	github.com/opencontainers/runc v1.1.12 // indirect
 	github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
 	github.com/opencontainers/selinux v1.11.0 // indirect
@@ -92,7 +92,7 @@ require (
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/vbatts/tar-split v0.11.2 // indirect
+	github.com/vbatts/tar-split v0.11.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
@@ -112,6 +112,7 @@ require (
 )
 
 require (
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/kr/pretty v0.3.0 // indirect