Remove registry Service use

Looks like the service is not needed, as we always pass an empty config,
so we can use ParseRepositoryInfo instead.

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

Author: thaJeztah

cli/command/plugin/install.go

@@ -8,7 +8,6 @@ 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,28 +54,14 @@ func newInstallCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-type pluginRegistryService struct {
-	svc *registry.Service
-}
-
-func (s pluginRegistryService) ResolveRepository(name reference.Named) (*registry.RepositoryInfo, error) {
-	// FIXME(thaJeztah): do we need the Service here? Or can we just use ParseRepositoryInfo?
-	repoInfo, err := s.svc.ResolveRepository(name)
+func resolveRepository(name reference.Named) (*registry.RepositoryInfo, error) {
+	repoInfo, err := registry.ParseRepositoryInfo(name)
 	if repoInfo != nil {
 		repoInfo.Class = "plugin"
 	}
 	return repoInfo, err
 }
 
-func newRegistryService() (trust.RepositoryResolver, error) {
-	// FIXME(thaJeztah): do we need the Service here? Or can we just use ParseRepositoryInfo? We never pass actual ServiceOptions here?
-	svc, err := registry.NewService(registry.ServiceOptions{})
-	if err != nil {
-		return nil, err
-	}
-	return pluginRegistryService{svc: svc}, nil
-}
-
 func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOptions, cmdName string) (types.PluginInstallOptions, error) {
 	// Names with both tag and digest will be treated by the daemon
 	// as a pull by digest with a local name for the tag
@@ -101,12 +86,7 @@ func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOpti
 			return types.PluginInstallOptions{}, errors.Errorf("invalid name: %s", ref.String())
 		}
 
-		ctx := context.Background()
-		svc, err := newRegistryService()
-		if err != nil {
-			return types.PluginInstallOptions{}, err
-		}
-		trusted, err := image.TrustedReference(ctx, dockerCli, nt, svc)
+		trusted, err := image.TrustedReference(context.Background(), dockerCli, nt, resolveRepository)
 		if err != nil {
 			return types.PluginInstallOptions{}, err
 		}

cli/trust/trust.go

@@ -298,13 +298,12 @@ type ImageRefAndAuth struct {
 	digest     digest.Digest
 }
 
-type RepositoryResolver interface {
-	ResolveRepository(name reference.Named) (*registry.RepositoryInfo, error)
-}
+// RepositoryResolver returns repository info for the given reference.
+type RepositoryResolver func(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 RepositoryResolver,
+func GetImageReferencesAndAuth(ctx context.Context, resolveFn RepositoryResolver,
 	authResolver func(ctx context.Context, index *registrytypes.IndexInfo) registrytypes.AuthConfig,
 	imgName string,
 ) (ImageRefAndAuth, error) {
@@ -315,8 +314,8 @@ func GetImageReferencesAndAuth(ctx context.Context, rs RepositoryResolver,
 
 	// Resolve the Repository name from fqn to RepositoryInfo
 	var repoInfo *registry.RepositoryInfo
-	if rs != nil {
-		repoInfo, err = rs.ResolveRepository(ref)
+	if resolveFn != nil {
+		repoInfo, err = resolveFn(ref)
 	} else {
 		repoInfo, err = registry.ParseRepositoryInfo(ref)
 	}