From d869d2b0a07105c80a24755ac6dd12476a085453 Mon Sep 17 00:00:00 2001 From: cyli Date: Mon, 25 Apr 2016 11:13:56 -0700 Subject: [PATCH] Update trust.go to reflect NotaryRepository API changes: - Update now returns only an error - NewNotaryRepository now takes a trustpinning configuration - we will provide an empty one for now. Signed-off-by: cyli --- api/client/trust.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/client/trust.go b/api/client/trust.go index 37d5e51bfa..7a13b90e49 100644 --- a/api/client/trust.go +++ b/api/client/trust.go @@ -33,6 +33,7 @@ import ( "github.com/docker/notary/client" "github.com/docker/notary/passphrase" "github.com/docker/notary/trustmanager" + "github.com/docker/notary/trustpinning" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/signed" "github.com/docker/notary/tuf/store" @@ -184,7 +185,9 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut modifiers = append(modifiers, transport.RequestModifier(auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler))) tr := transport.NewTransport(base, modifiers...) - return client.NewNotaryRepository(cli.trustDirectory(), repoInfo.FullName(), server, tr, cli.getPassphraseRetriever()) + return client.NewNotaryRepository( + cli.trustDirectory(), repoInfo.FullName(), server, tr, cli.getPassphraseRetriever(), + trustpinning.TrustPinConfig{}) } func convertTarget(t client.Target) (target, error) { @@ -474,7 +477,7 @@ func (cli *DockerCli) trustedPush(repoInfo *registry.RepositoryInfo, ref referen } // get the latest repository metadata so we can figure out which roles to sign - _, err = repo.Update(false) + err = repo.Update(false) switch err.(type) { case client.ErrRepoNotInitialized, client.ErrRepositoryNotExist: