Merge pull request #191 from hashicorp/f-client-agent-cmdline

Add parsing of client configuration from the commandline

command/agent/command.go

@@ -50,6 +50,8 @@ type Command struct {
 func (c *Command) readConfig() *Config {
 	var dev bool
 	var configPath []string
+	var servers string
+	var meta []string
 
 	// Make a new, empty config.
 	cmdConfig := &Config{
@@ -70,6 +72,14 @@ func (c *Command) readConfig() *Config {
 	// Server-only options
 	flags.IntVar(&cmdConfig.Server.BootstrapExpect, "bootstrap-expect", 0, "")
 
+	// Client-only options
+	flags.StringVar(&cmdConfig.Client.StateDir, "state-dir", "", "")
+	flags.StringVar(&cmdConfig.Client.AllocDir, "alloc-dir", "", "")
+	flags.StringVar(&cmdConfig.Client.NodeID, "node-id", "", "")
+	flags.StringVar(&cmdConfig.Client.NodeClass, "node-class", "", "")
+	flags.StringVar(&servers, "servers", "", "")
+	flags.Var((*sliceflag.StringFlag)(&meta), "meta", "")
+
 	// General options
 	flags.Var((*sliceflag.StringFlag)(&configPath), "config", "config")
 	flags.StringVar(&cmdConfig.BindAddr, "bind", "", "")
@@ -88,6 +98,26 @@ func (c *Command) readConfig() *Config {
 		return nil
 	}
 
+	// Split the servers.
+	if servers != "" {
+		cmdConfig.Client.Servers = strings.Split(servers, ",")
+	}
+
+	// Parse the meta flags.
+	metaLength := len(meta)
+	if metaLength != 0 {
+		cmdConfig.Client.Meta = make(map[string]string, metaLength)
+		for _, kv := range meta {
+			parts := strings.SplitN(kv, "=", 2)
+			if len(parts) != 2 {
+				c.Ui.Error(fmt.Sprintf("Error parsing Client.Meta value: %v", kv))
+				return nil
+			}
+
+			cmdConfig.Client.Meta[parts[0]] = parts[1]
+		}
+	}
+
 	// Load the configuration
 	var config *Config
 	if dev {
@@ -134,12 +164,27 @@ func (c *Command) readConfig() *Config {
 		return config
 	}
 
-	// Check that we have a data-dir
-	if config.DataDir == "" {
+	// Check that the server is running in at least one mode.
+	if !(config.Server.Enabled || config.Client.Enabled) {
+		c.Ui.Error("Must specify either server, client or dev mode for the agent.")
+		return nil
+	}
+
+	// Ensure that we have the directories we neet to run.
+	if config.Server.Enabled && config.DataDir == "" {
 		c.Ui.Error("Must specify data directory")
 		return nil
 	}
 
+	// The config is valid if the top-level data-dir is set or if both
+	// alloc-dir and state-dir are set.
+	if config.Client.Enabled && config.DataDir == "" {
+		if config.Client.AllocDir == "" || config.Client.StateDir == "" {
+			c.Ui.Error("Must specify both the state and alloc dir if data-dir is omitted.")
+			return nil
+		}
+	}
+
 	// Check the bootstrap flags
 	if config.Server.BootstrapExpect > 0 && !config.Server.Enabled {
 		c.Ui.Error("Bootstrap requires server mode to be enabled")
@@ -588,9 +633,35 @@ Server Options:
 Client Options:
 
   -client
-    Enable client mode for the agent. Client mode enables a given node
-    to be evaluated for allocations. If client mode is not enabled,
-    no work will be scheduled to the agent.
+    Enable client mode for the agent. Client mode enables a given node to be
+    evaluated for allocations. If client mode is not enabled, no work will be
+    scheduled to the agent.
+
+  -state-dir
+    The directory used to store state and other persistent data. If not
+    specified a subdirectory under the "-data-dir" will be used.
+
+  -alloc-dir
+    The directory used to store allocation data such as downloaded artificats as
+    well as data produced by tasks. If not specified, a subdirectory under the
+    "-data-dir" will be used.
+
+  -servers
+    A list of known server addresses to connect to given as "host:port" and
+    delimited by commas.
+
+  -node-id
+    A unique identifier for the node to use. If not provided, a UUID is
+    generated.
+
+  -node-class
+    Mark this node as a member of a node-class. This can be used to label
+    similiar node types.
+
+  -meta
+    User specified metadata to associated with the node. Each instance of -meta
+    parses a single KEY=VALUE pair. Repeat the meta flag for each key/value pair
+    to be added.
 
 Atlas Options:
 

command/agent/command_test.go

@@ -27,16 +27,24 @@ func TestCommand_Args(t *testing.T) {
 	tcases := []tcase{
 		{
 			[]string{},
-			"Must specify data directory",
+			"Must specify either server, client or dev mode for the agent.",
 		},
 		{
-			[]string{"-data-dir=" + tmpDir, "-bootstrap-expect=1"},
+			[]string{"-client", "-data-dir=" + tmpDir, "-bootstrap-expect=1"},
 			"Bootstrap requires server mode to be enabled",
 		},
 		{
 			[]string{"-data-dir=" + tmpDir, "-server", "-bootstrap-expect=1"},
 			"WARNING: Bootstrap mode enabled!",
 		},
+		{
+			[]string{"-server"},
+			"Must specify data directory",
+		},
+		{
+			[]string{"-client", "-alloc-dir="},
+			"Must specify both the state and alloc dir if data-dir is omitted.",
+		},
 	}
 	for _, tc := range tcases {
 		// Make a new command. We pre-emptively close the shutdownCh