Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cli/command/trust/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,5 @@ func addStagedSigner(notaryRepo client.Repository, newSigner data.RoleName, sign
if err := notaryRepo.AddDelegationRoleAndKeys(trust.ReleasesRole, signerKeys); err != nil {
return err
}
if err := notaryRepo.AddDelegationPaths(trust.ReleasesRole, []string{""}); err != nil {
return err
}
return nil
return notaryRepo.AddDelegationPaths(trust.ReleasesRole, []string{""})
}
5 changes: 1 addition & 4 deletions cli/command/trust/signer_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,5 @@ func removeSingleSigner(cli command.Cli, repoName, signerName string, forceYes b
if err = notaryRepo.RemoveDelegationRole(signerDelegation); err != nil {
return err
}
if err = notaryRepo.Publish(); err != nil {
return err
}
return nil
return notaryRepo.Publish()
}
7 changes: 1 addition & 6 deletions cmd/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,7 @@ func isSupported(cmd *cobra.Command, details versionDetails) error {
if err := areSubcommandsSupported(cmd, details); err != nil {
return err
}

if err := areFlagsSupported(cmd, details); err != nil {
return err
}

return nil
return areFlagsSupported(cmd, details)
}

func areFlagsSupported(cmd *cobra.Command, details versionDetails) error {
Expand Down
5 changes: 1 addition & 4 deletions docs/yaml/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@ func GenYamlTreeCustom(cmd *cobra.Command, dir string, filePrepender func(string
if _, err := io.WriteString(f, filePrepender(filename)); err != nil {
return err
}
if err := GenYamlCustom(cmd, f); err != nil {
return err
}
return nil
return GenYamlCustom(cmd, f)
}

// GenYamlCustom creates custom yaml output
Expand Down