Make experimental a runtime flag

Signed-off-by: Kenfe-Mickael Laventure <[email protected]>

api/server/middleware/experimental.go

@@ -0,0 +1,29 @@
+package middleware
+
+import (
+	"net/http"
+
+	"golang.org/x/net/context"
+)
+
+// ExperimentalMiddleware is a the middleware in charge of adding the
+// 'Docker-Experimental' header to every outgoing request
+type ExperimentalMiddleware struct {
+	experimental string
+}
+
+// NewExperimentalMiddleware creates a new ExperimentalMiddleware
+func NewExperimentalMiddleware(experimentalEnabled bool) ExperimentalMiddleware {
+	if experimentalEnabled {
+		return ExperimentalMiddleware{"true"}
+	}
+	return ExperimentalMiddleware{"false"}
+}
+
+// WrapHandler returns a new handler function wrapping the previous one in the request chain.
+func (e ExperimentalMiddleware) WrapHandler(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
+	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
+		w.Header().Set("Docker-Experimental", e.experimental)
+		return handler(ctx, w, r, vars)
+	}
+}

api/server/router/checkpoint/backend.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package checkpoint
 
 import "github.com/docker/docker/api/types"

api/server/router/checkpoint/checkpoint.go

@@ -26,3 +26,11 @@ func NewRouter(b Backend, decoder httputils.ContainerDecoder) router.Router {
 func (r *checkpointRouter) Routes() []router.Route {
 	return r.routes
 }
+
+func (r *checkpointRouter) initRoutes() {
+	r.routes = []router.Route{
+		router.NewGetRoute("/containers/{name:.*}/checkpoints", r.getContainerCheckpoints),
+		router.NewPostRoute("/containers/{name:.*}/checkpoints", r.postContainerCheckpoint),
+		router.NewDeleteRoute("/containers/{name}/checkpoints/{checkpoint}", r.deleteContainerCheckpoint),
+	}
+}

api/server/router/checkpoint/checkpoint_routes.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package checkpoint
 
 import (

api/server/router/plugin/backend.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

api/server/router/plugin/plugin.go

@@ -21,3 +21,16 @@ func NewRouter(b Backend) router.Router {
 func (r *pluginRouter) Routes() []router.Route {
 	return r.routes
 }
+
+func (r *pluginRouter) initRoutes() {
+	r.routes = []router.Route{
+		router.NewGetRoute("/plugins", r.listPlugins),
+		router.NewGetRoute("/plugins/{name:.*}", r.inspectPlugin),
+		router.NewDeleteRoute("/plugins/{name:.*}", r.removePlugin),
+		router.NewPostRoute("/plugins/{name:.*}/enable", r.enablePlugin), // PATCH?
+		router.NewPostRoute("/plugins/{name:.*}/disable", r.disablePlugin),
+		router.NewPostRoute("/plugins/pull", r.pullPlugin),
+		router.NewPostRoute("/plugins/{name:.*}/push", r.pushPlugin),
+		router.NewPostRoute("/plugins/{name:.*}/set", r.setPlugin),
+	}
+}

api/server/router/plugin/plugin_routes.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

cli/command/bundlefile/bundlefile.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package bundlefile
 
 import (

cli/command/bundlefile/bundlefile_test.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package bundlefile
 
 import (

cli/command/checkpoint/cmd.go

@@ -1,13 +1,27 @@
-// +build !experimental
-
 package checkpoint
 
 import (
+	"fmt"
+
+	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
 // NewCheckpointCommand returns the `checkpoint` subcommand (only in experimental)
 func NewCheckpointCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{}
+	cmd := &cobra.Command{
+		Use:   "checkpoint",
+		Short: "Manage checkpoints",
+		Args:  cli.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
+		},
+	}
+	cmd.AddCommand(
+		newCreateCommand(dockerCli),
+		newListCommand(dockerCli),
+		newRemoveCommand(dockerCli),
+	)
+	return cmd
 }

cli/command/checkpoint/create.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package checkpoint
 
 import (

cli/command/checkpoint/list.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package checkpoint
 
 import (

cli/command/checkpoint/remove.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package checkpoint
 
 import (

cli/command/cli.go

@@ -19,6 +19,7 @@ import (
 	dopts "github.com/docker/docker/opts"
 	"github.com/docker/go-connections/sockets"
 	"github.com/docker/go-connections/tlsconfig"
+	"golang.org/x/net/context"
 )
 
 // Streams is an interface which exposes the standard input and output streams
@@ -31,12 +32,27 @@ type Streams interface {
 // DockerCli represents the docker command line client.
 // Instances of the client can be returned from NewDockerCli.
 type DockerCli struct {
-	configFile *configfile.ConfigFile
-	in         *InStream
-	out        *OutStream
-	err        io.Writer
-	keyFile    string
-	client     client.APIClient
+	configFile      *configfile.ConfigFile
+	in              *InStream
+	out             *OutStream
+	err             io.Writer
+	keyFile         string
+	client          client.APIClient
+	hasExperimental *bool
+}
+
+// HasExperimental returns true if experimental features are accessible
+func (cli *DockerCli) HasExperimental() bool {
+	if cli.hasExperimental == nil {
+		if cli.client == nil {
+			cli.Initialize(cliflags.NewClientOptions())
+		}
+		enabled := false
+		cli.hasExperimental = &enabled
+		enabled, _ = cli.client.Ping(context.Background())
+	}
+
+	return *cli.hasExperimental
 }
 
 // Client returns the APIClient

cli/command/commands/commands.go

@@ -24,8 +24,6 @@ func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
 	cmd.AddCommand(
 		node.NewNodeCommand(dockerCli),
 		service.NewServiceCommand(dockerCli),
-		stack.NewStackCommand(dockerCli),
-		stack.NewTopLevelDeployCommand(dockerCli),
 		swarm.NewSwarmCommand(dockerCli),
 		container.NewContainerCommand(dockerCli),
 		image.NewImageCommand(dockerCli),
@@ -72,9 +70,17 @@ func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
 		hide(image.NewSaveCommand(dockerCli)),
 		hide(image.NewTagCommand(dockerCli)),
 		hide(system.NewInspectCommand(dockerCli)),
-		checkpoint.NewCheckpointCommand(dockerCli),
-		plugin.NewPluginCommand(dockerCli),
 	)
+
+	if dockerCli.HasExperimental() {
+		cmd.AddCommand(
+			stack.NewStackCommand(dockerCli),
+			stack.NewTopLevelDeployCommand(dockerCli),
+			checkpoint.NewCheckpointCommand(dockerCli),
+			plugin.NewPluginCommand(dockerCli),
+		)
+	}
+
 }
 
 func hide(cmd *cobra.Command) *cobra.Command {

cli/command/container/start.go

@@ -44,7 +44,9 @@ func NewStartCommand(dockerCli *command.DockerCli) *cobra.Command {
 	flags.BoolVarP(&opts.openStdin, "interactive", "i", false, "Attach container's STDIN")
 	flags.StringVar(&opts.detachKeys, "detach-keys", "", "Override the key sequence for detaching a container")
 
-	addExperimentalStartFlags(flags, &opts)
+	if dockerCli.HasExperimental() {
+		flags.StringVar(&opts.checkpoint, "checkpoint", "", "Restore from this checkpoint")
+	}
 
 	return cmd
 }

cli/command/plugin/cmd.go

@@ -1,13 +1,33 @@
-// +build !experimental
-
 package plugin
 
 import (
+	"fmt"
+
+	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
 // NewPluginCommand returns a cobra command for `plugin` subcommands
 func NewPluginCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{}
+	cmd := &cobra.Command{
+		Use:   "plugin",
+		Short: "Manage plugins",
+		Args:  cli.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
+		},
+	}
+
+	cmd.AddCommand(
+		newDisableCommand(dockerCli),
+		newEnableCommand(dockerCli),
+		newInspectCommand(dockerCli),
+		newInstallCommand(dockerCli),
+		newListCommand(dockerCli),
+		newRemoveCommand(dockerCli),
+		newSetCommand(dockerCli),
+		newPushCommand(dockerCli),
+	)
+	return cmd
 }