Merge pull request #923 from docker/purge-autopublish

add auto-publish to purge

cmd/notary/delegations.go

@@ -62,6 +62,7 @@ func (d *delegationCommander) GetCommand() *cobra.Command {
 
 	cmdPurgeDelgKeys := cmdDelegationPurgeKeysTemplate.ToCommand(d.delegationPurgeKeys)
 	cmdPurgeDelgKeys.Flags().StringSliceVar(&d.keyIDs, "key", nil, "Delegation key IDs to be removed from the GUN")
+	cmdPurgeDelgKeys.Flags().BoolVarP(&d.autoPublish, "publish", "p", false, htAutoPublish)
 	cmd.AddCommand(cmdPurgeDelgKeys)
 
 	cmdRemDelg := cmdDelegationRemoveTemplate.ToCommand(d.delegationRemove)
@@ -166,7 +167,7 @@ func (d *delegationCommander) delegationsList(cmd *cobra.Command, args []string)
 	cmd.Println("")
 	prettyPrintRoles(delegationRoles, cmd.Out(), "delegations")
 	cmd.Println("")
-	return nil
+	return maybeAutoPublish(cmd, d.autoPublish, gun, config, d.retriever)
 }
 
 // delegationRemove removes a public key from a specific role in a GUN

cmd/notary/integration_test.go

@@ -1450,11 +1450,8 @@ func TestPurge(t *testing.T) {
 	err = os.Remove(filepath.Join(tempDir, notary.PrivDir, notary.NonRootKeysSubdir, "gun", targetsKeyID+".key"))
 	require.NoError(t, err)
 
-	_, err = runCommand(t, tempDir, "delegation", "purge", "gun", "--key", keyID)
-	require.NoError(t, err)
-
-	// publish doesn't error because purge only updates the roles we have signing keys for
-	_, err = runCommand(t, tempDir, "-s", server.URL, "publish", "gun")
+	// auto-publish doesn't error because purge only updates the roles we have signing keys for
+	_, err = runCommand(t, tempDir, "delegation", "purge", "-s", server.URL, "-p", "gun", "--key", keyID)
 	require.NoError(t, err)
 
 	// check the delegation wasn't removed