--installer-context option is experimental

internal/cliopts/installerContext.go

@@ -22,6 +22,7 @@ func (o *InstallerContextOptions) AddFlags(flags *pflag.FlagSet) {
 		defaultContext = "default"
 	}
 	flags.StringVar(&o.installerContext, "installer-context", defaultContext, "Context on which the installer image is ran")
+	flags.SetAnnotation("installer-context", "experimentalCLI", []string{"true"}) //nolint:errcheck
 }
 
 func (o *InstallerContextOptions) SetInstallerContext(dockerCli command.Cli) (command.Cli, error) {

internal/commands/root.go

@@ -48,7 +48,7 @@ func NewRootCmd(use string, dockerCli command.Cli) *cobra.Command {
 }
 
 func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
-	listOfCommands := []*cobra.Command{
+	cmd.AddCommand(
 		runCmd(dockerCli),
 		updateCmd(dockerCli),
 		removeCmd(dockerCli),
@@ -60,18 +60,24 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		image.Cmd(dockerCli),
 		build.Cmd(dockerCli),
 		inspectCmd(dockerCli),
+	)
+
+	if !dockerCli.ClientInfo().HasExperimental {
+		hideExperimentalCLI(cmd)
 	}
+}
 
-	isExperimentalMode := dockerCli.ClientInfo().HasExperimental
-	for _, ccmd := range listOfCommands {
-		switch ccmd.Annotations["experimental"] {
-		case "true":
-			if isExperimentalMode {
-				cmd.AddCommand(ccmd)
-			}
-		default:
-			cmd.AddCommand(ccmd)
+func hideExperimentalCLI(cmd *cobra.Command) {
+	if _, ok := cmd.Annotations["experimentalCLI"]; ok {
+		cmd.Hidden = true
+	}
+	cmd.Flags().VisitAll(func(f *pflag.Flag) {
+		if _, ok := f.Annotations["experimentalCLI"]; ok {
+			f.Hidden = true
 		}
+	})
+	for _, subcmd := range cmd.Commands() {
+		hideExperimentalCLI(subcmd)
 	}
 }
 

internal/commands/validate.go

@@ -26,7 +26,7 @@ func validateCmd() *cobra.Command {
 		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"},
+		Annotations: map[string]string{"experimentalCLI": "true"},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runValidate(args, opts)
 		},