WIP: try to define an interface

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/command/image/trust.go

@@ -289,7 +289,7 @@ func imagePullPrivileged(ctx context.Context, cli command.Cli, imgRefAndAuth tru
 }
 
 // TrustedReference returns the canonical trusted reference for an image reference
-func TrustedReference(ctx context.Context, cli command.Cli, ref reference.NamedTagged, rs *registry.Service) (reference.Canonical, error) {
+func TrustedReference(ctx context.Context, cli command.Cli, ref reference.NamedTagged, rs trust.RepositoryResolver) (reference.Canonical, error) {
 	imgRefAndAuth, err := trust.GetImageReferencesAndAuth(ctx, rs, AuthResolver(cli), ref.String())
 	if err != nil {
 		return nil, err

cli/command/plugin/install.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/image"
+	"github.com/docker/cli/cli/trust"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/jsonmessage"
@@ -55,7 +56,7 @@ func newInstallCommand(dockerCli command.Cli) *cobra.Command {
 }
 
 type pluginRegistryService struct {
-	registry.Service
+	*registry.Service
 }
 
 func (s pluginRegistryService) ResolveRepository(name reference.Named) (*registry.RepositoryInfo, error) {
@@ -66,11 +67,12 @@ func (s pluginRegistryService) ResolveRepository(name reference.Named) (*registr
 	return repoInfo, err
 }
 
-func newRegistryService() (registry.Service, error) {
+func newRegistryService() (trust.RepositoryResolver, error) {
 	svc, err := registry.NewService(registry.ServiceOptions{})
 	if err != nil {
 		return nil, err
 	}
+	// FIXME(thaJeztah); is this correct? (when passing as pointer, it warns: Literal copies a lock value from '*svc': type 'registry.Service' contains 'sync.RWMutex' which is 'sync.Locker'
 	return pluginRegistryService{Service: svc}, nil
 }
 

cli/trust/trust.go

@@ -298,9 +298,13 @@ type ImageRefAndAuth struct {
 	digest     digest.Digest
 }
 
+type RepositoryResolver interface {
+	ResolveRepository(name reference.Named) (*registry.RepositoryInfo, error)
+}
+
 // GetImageReferencesAndAuth retrieves the necessary reference and auth information for an image name
 // as an ImageRefAndAuth struct
-func GetImageReferencesAndAuth(ctx context.Context, rs *registry.Service,
+func GetImageReferencesAndAuth(ctx context.Context, rs RepositoryResolver,
 	authResolver func(ctx context.Context, index *registrytypes.IndexInfo) registrytypes.AuthConfig,
 	imgName string,
 ) (ImageRefAndAuth, error) {