1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/command: remove deprecated NotaryClient from CLI interface

Browse Source 
This method is a shallow wrapper around trust.GetNotaryRepository, but
due to its signature resulted in the trust package, and notary dependencies
to become a dependency of the CLI. Consequence of this was that cli-plugins,
which need the cli/command package, would also get notary and its
dependencies as a dependency. It is no longer used, and was deprecated
in 9bc16bbde085c618d3bddfb633560ab9af83a58d.

This patch removes the NotaryClient method from the interface

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2025-03-01 01:34:23 +01:00
parent e002576821
commit 66eb27a487
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli/command/cli.go
View File

@ -56,7 +56,6 @@ type Cli interface {
CurrentContext() string CurrentContext() string
DockerEndpoint() docker.Endpoint DockerEndpoint() docker.Endpoint
TelemetryClient TelemetryClient
DeprecatedNotaryClient
DeprecatedManifestClient DeprecatedManifestClient
} }

14
cli/command/cli_deprecated.go
View File

@ -7,18 +7,9 @@ import (
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
manifeststore "github.com/docker/cli/cli/manifest/store" manifeststore "github.com/docker/cli/cli/manifest/store"
registryclient "github.com/docker/cli/cli/registry/client" registryclient "github.com/docker/cli/cli/registry/client"
"github.com/docker/cli/cli/trust"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"
notaryclient "github.com/theupdateframework/notary/client"
) )
type DeprecatedNotaryClient interface {
// NotaryClient provides a Notary Repository to interact with signed metadata for an image
//
// Deprecated: use [trust.GetNotaryRepository] instead. This method is no longer used and will be removed in the next release.
NotaryClient(imgRefAndAuth trust.ImageRefAndAuth, actions []string) (notaryclient.Repository, error)
}
type DeprecatedManifestClient interface { type DeprecatedManifestClient interface {
// ManifestStore returns a store for local manifests // ManifestStore returns a store for local manifests
// //
@ -32,11 +23,6 @@ type DeprecatedManifestClient interface {
RegistryClient(bool) registryclient.RegistryClient RegistryClient(bool) registryclient.RegistryClient
} }
// NotaryClient provides a Notary Repository to interact with signed metadata for an image
func (cli *DockerCli) NotaryClient(imgRefAndAuth trust.ImageRefAndAuth, actions []string) (notaryclient.Repository, error) {
return trust.GetNotaryRepository(cli.In(), cli.Out(), UserAgent(), imgRefAndAuth.RepoInfo(), imgRefAndAuth.AuthConfig(), actions...)
}
// ManifestStore returns a store for local manifests // ManifestStore returns a store for local manifests
// //
// Deprecated: use [manifeststore.NewStore] instead. This method is no longer used and will be removed in the next release. // Deprecated: use [manifeststore.NewStore] instead. This method is no longer used and will be removed in the next release.