Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trust: update remove to error on empty references for consistency 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2017-09-18 12:50:31 -07:00
parent 67cf09cbe1
commit 4e95fcd72c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/command/trust/revoke.go
View File

@ -93,10 +93,6 @@ func revokeSignature(notaryRepo client.Repository, tag string) error {
func revokeSingleSig(notaryRepo client.Repository, tag string) error { func revokeSingleSig(notaryRepo client.Repository, tag string) error {
releasedTargetWithRole, err := notaryRepo.GetTargetByName(tag, trust.ReleasesRole, data.CanonicalTargetsRole) releasedTargetWithRole, err := notaryRepo.GetTargetByName(tag, trust.ReleasesRole, data.CanonicalTargetsRole)
if err != nil { if err != nil {
// if we try to remove the target and it doesn't exist, "succeed" silently
if _, ok := err.(client.ErrNoSuchTarget); ok {
return nil
}
return err return err
} }
releasedTarget := releasedTargetWithRole.Target releasedTarget := releasedTargetWithRole.Target
@ -109,6 +105,10 @@ func revokeAllSigs(notaryRepo client.Repository) error {
return err return err
} }
if len(releasedTargetWithRoleList) == 0 {
return fmt.Errorf("no signed tags to remove")
}
// we need all the roles that signed each released target so we can remove from all roles. // we need all the roles that signed each released target so we can remove from all roles.
for _, releasedTargetWithRole := range releasedTargetWithRoleList { for _, releasedTargetWithRole := range releasedTargetWithRoleList {
// remove from all roles // remove from all roles

7
cli/command/trust/revoke_test.go
View File

@ -67,7 +67,6 @@ func TestTrustRevokeCommandOfflineErrors(t *testing.T) {
cmd = newRevokeCommand(cli) cmd = newRevokeCommand(cli)
cmd.SetArgs([]string{"reg-name.io/image", "-y"}) cmd.SetArgs([]string{"reg-name.io/image", "-y"})
cmd.SetOutput(ioutil.Discard) cmd.SetOutput(ioutil.Discard)
testutil.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image: client is offline")
cli = test.NewFakeCli(&fakeClient{}) cli = test.NewFakeCli(&fakeClient{})
cli.SetNotaryClient(getOfflineNotaryRepository) cli.SetNotaryClient(getOfflineNotaryRepository)
@ -115,16 +114,14 @@ func TestTrustRevokeCommandEmptyNotaryRepo(t *testing.T) {
cmd = newRevokeCommand(cli) cmd = newRevokeCommand(cli)
cmd.SetArgs([]string{"reg-name.io/image", "-y"}) cmd.SetArgs([]string{"reg-name.io/image", "-y"})
cmd.SetOutput(ioutil.Discard) cmd.SetOutput(ioutil.Discard)
assert.NoError(t, cmd.Execute()) testutil.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image: no signed tags to remove")
assert.Contains(t, cli.OutBuffer().String(), "Successfully deleted signature for reg-name.io/image")
cli = test.NewFakeCli(&fakeClient{}) cli = test.NewFakeCli(&fakeClient{})
cli.SetNotaryClient(getEmptyTargetsNotaryRepository) cli.SetNotaryClient(getEmptyTargetsNotaryRepository)
cmd = newRevokeCommand(cli) cmd = newRevokeCommand(cli)
cmd.SetArgs([]string{"reg-name.io/image:tag"}) cmd.SetArgs([]string{"reg-name.io/image:tag"})
cmd.SetOutput(ioutil.Discard) cmd.SetOutput(ioutil.Discard)
assert.NoError(t, cmd.Execute()) testutil.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image:tag: No valid trust data for tag")
assert.Contains(t, cli.OutBuffer().String(), "Successfully deleted signature for reg-name.io/image:tag")
} }
func TestNewRevokeTrustAllSigConfirmation(t *testing.T) { func TestNewRevokeTrustAllSigConfirmation(t *testing.T) {