Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit bc6c8ed

Browse files
committed
validate: Output name of validated application
Signed-off-by: Christopher Crone <[email protected]>
1 parent c98a1fd commit bc6c8ed

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

e2e/commands_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ maintainers:
145145

146146
// validate metadata with JSON Schema
147147
cmd.Command = dockerCli.Command("app", "validate", testAppName)
148-
icmd.RunCmd(cmd).Assert(t, icmd.Success)
148+
stdOut = icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined()
149+
golden.Assert(t, stdOut, "validate-output.golden")
149150

150151
// test single-file init
151152
cmd.Command = dockerCli.Command("app",

e2e/testdata/validate-output.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Validated "app-test.dockerapp"

internal/commands/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
3232
mergeCmd(dockerCli),
3333
renderCmd(dockerCli),
3434
splitCmd(),
35-
validateCmd(),
35+
validateCmd(dockerCli),
3636
versionCmd(dockerCli),
3737
completionCmd(dockerCli, cmd),
3838
bundleCmd(dockerCli),

internal/commands/validate.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package commands
22

33
import (
4+
"fmt"
5+
46
"github.com/docker/app/internal/packager"
57
"github.com/docker/app/render"
68
"github.com/docker/app/types"
79
"github.com/docker/cli/cli"
10+
"github.com/docker/cli/cli/command"
811
cliopts "github.com/docker/cli/opts"
912
"github.com/spf13/cobra"
1013
)
@@ -13,7 +16,7 @@ type validateOptions struct {
1316
parametersOptions
1417
}
1518

16-
func validateCmd() *cobra.Command {
19+
func validateCmd(dockerCli command.Cli) *cobra.Command {
1720
var opts validateOptions
1821
cmd := &cobra.Command{
1922
Use: "validate [APP_NAME] [--set KEY=VALUE ...] [--parameters-file PARAMETERS_FILE]",
@@ -29,7 +32,11 @@ func validateCmd() *cobra.Command {
2932
defer app.Cleanup()
3033
argParameters := cliopts.ConvertKVStringsToMap(opts.overrides)
3134
_, err = render.Render(app, argParameters, nil)
32-
return err
35+
if err != nil {
36+
return err
37+
}
38+
fmt.Fprintf(dockerCli.Out(), "Validated %q\n", app.Path)
39+
return nil
3340
},
3441
}
3542
opts.parametersOptions.addFlags(cmd.Flags())

0 commit comments

Comments
 (0)