toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix comment and misc code issues

Browse Source 
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit 8c3d0b93d6)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Nassim 'Nass' Eddequiouaq
2018-03-14 09:11:25 +01:00
committed by Vincent Demeester
parent 2d81349010
commit 3d69121433
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/cli/cli/command/trust/inspect.go
+4 -5
View File
@@ -14,9 +14,8 @@ import (
type inspectOptions struct {
remotes []string
/* FIXME(n4ss): this is consistent with `docker service inspect` but we should provide
* a `--format` flag too. (format and pretty-print should be exclusive)
*/
// FIXME(n4ss): this is consistent with `docker service inspect` but we should provide
// a `--format` flag too. (format and pretty-print should be exclusive)
prettyPrint bool
}
@@ -41,7 +40,7 @@ func newInspectCommand(dockerCli command.Cli) *cobra.Command {
func runInspect(dockerCli command.Cli, opts inspectOptions) error {
if opts.prettyPrint {
var err error = nil
var err error
for index, remote := range opts.remotes {
if err = prettyPrintTrustInfo(dockerCli, remote); err != nil {
@@ -49,7 +48,7 @@ func runInspect(dockerCli command.Cli, opts inspectOptions) error {
}
// Additional separator between the inspection output of each image
if index < len(opts.remotes) - 1 {
if index < len(opts.remotes)-1 {
fmt.Fprint(dockerCli.Out(), "\n\n")
}
}
components/cli/cli/command/trust/inspect_pretty_test.go
+3 -3
View File
@@ -16,7 +16,7 @@ import (
"github.com/theupdateframework/notary/tuf/data"
)
/* TODO(n4ss): remove common tests with the regular inspect command */
// TODO(n4ss): remove common tests with the regular inspect command
type fakeClient struct {
dockerClient.Client
@@ -98,7 +98,7 @@ func TestTrustInspectPrettyCommandEmptyNotaryRepoErrors(t *testing.T) {
cmd.SetOutput(ioutil.Discard)
assert.NoError(t, cmd.Execute())
assert.Contains(t, cli.OutBuffer().String(), "No signatures for reg/img:unsigned-tag")
assert.Contains(t, cli.OutBuffer().String(), "Administrative keys for reg/img:")
assert.Contains(t, cli.OutBuffer().String(), "Administrative keys for reg/img")
cli = test.NewFakeCli(&fakeClient{})
cli.SetNotaryClient(getEmptyTargetsNotaryRepository)
@@ -108,7 +108,7 @@ func TestTrustInspectPrettyCommandEmptyNotaryRepoErrors(t *testing.T) {
cmd.SetOutput(ioutil.Discard)
assert.NoError(t, cmd.Execute())
assert.Contains(t, cli.OutBuffer().String(), "No signatures for reg/img")
assert.Contains(t, cli.OutBuffer().String(), "Administrative keys for reg/img:")
assert.Contains(t, cli.OutBuffer().String(), "Administrative keys for reg/img")
}
func TestTrustInspectPrettyCommandFullRepoWithoutSigners(t *testing.T) {