Merge pull request #625 from aiordache/app-214_experimental_validate

[WIP] APP-214 Enable 'docker app validate' for experimental mode only

Author: rumpl

Gopkg.lock

@@ -50,7 +50,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  revision = "6318939f30e01585b34eb6a68a54b890a8d54eb0"
+  revision = "37f9a88c696ae81be14c1697bd083d6421b4933c"
 
 [[override]]
   name = "github.com/deislabs/cnab-go"
@@ -71,7 +71,7 @@ required = ["github.com/wadey/gocovmerge"]
 [[override]]
   name = "github.com/xeipuuv/gojsonschema"
   version = "v1.2.0"
-
+  
 [[override]]
   name = "github.com/docker/go-metrics"
   revision = "d466d4f6fd960e01820085bd7e1a24426ee7ef18"
@@ -117,6 +117,7 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/Microsoft/hcsshim"
   revision = "2226e083fc390003ae5aa8325c3c92789afa0e7a"
 
+
 [[constraint]]
   name = "github.com/spf13/pflag"
   branch = "master"

Gopkg.toml

@@ -48,7 +48,7 @@ func NewRootCmd(use string, dockerCli command.Cli) *cobra.Command {
 }
 
 func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
-	cmd.AddCommand(
+	listOfCommands := []*cobra.Command{
 		runCmd(dockerCli),
 		updateCmd(dockerCli),
 		removeCmd(dockerCli),
@@ -60,7 +60,19 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		image.Cmd(dockerCli),
 		build.Cmd(dockerCli),
 		inspectCmd(dockerCli),
-	)
+	}
+
+	isExperimentalMode := dockerCli.ClientInfo().HasExperimental
+	for _, ccmd := range listOfCommands {
+		switch ccmd.Annotations["experimental"] {
+		case "true":
+			if isExperimentalMode {
+				cmd.AddCommand(ccmd)
+			}
+		default:
+			cmd.AddCommand(ccmd)
+		}
+	}
 }
 
 func firstOrEmpty(list []string) string {

internal/commands/root.go

@@ -22,10 +22,11 @@ type validateOptions struct {
 func validateCmd() *cobra.Command {
 	var opts validateOptions
 	cmd := &cobra.Command{
-		Use:     "validate [OPTIONS] APP_DEFINITION",
-		Short:   "Check that an App definition (.dockerapp) is syntactically correct",
-		Example: `$ docker app validate myapp.dockerapp --set key=value --parameters-file myparam.yml`,
-		Args:    cli.RequiresMaxArgs(1),
+		Use:         "validate [OPTIONS] APP_DEFINITION",
+		Short:       "Check that an App definition (.dockerapp) is syntactically correct",
+		Example:     `$ docker app validate myapp.dockerapp --set key=value --parameters-file myparam.yml`,
+		Args:        cli.RequiresMaxArgs(1),
+		Annotations: map[string]string{"experimental": "true"},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runValidate(args, opts)
 		},