From 33280d79befa529cdffc1a1664b4ede5f90f3b3f Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Sat, 15 Aug 2015 18:34:47 -0700
Subject: [PATCH] command/agent: basic command

---
 command/agent/command.go | 88 ++++++++++++++++++++++++++++++++++++++++
 commands.go              | 11 +++++
 2 files changed, 99 insertions(+)
 create mode 100644 command/agent/command.go

diff --git a/command/agent/command.go b/command/agent/command.go
new file mode 100644
index 000000000..12024ba1f
--- /dev/null
+++ b/command/agent/command.go
@@ -0,0 +1,88 @@
+package agent
+
+import (
+	"strings"
+
+	"github.com/mitchellh/cli"
+)
+
+// Command is a Command implementation that runs a Consul agent.
+// The command will not end unless a shutdown message is sent on the
+// ShutdownCh. If two messages are sent on the ShutdownCh it will forcibly
+// exit.
+type Command struct {
+	Revision          string
+	Version           string
+	VersionPrerelease string
+	Ui                cli.Ui
+	ShutdownCh        <-chan struct{}
+}
+
+func (c *Command) Run(args []string) int {
+	c.Ui = &cli.PrefixedUi{
+		OutputPrefix: "==> ",
+		InfoPrefix:   "    ",
+		ErrorPrefix:  "==> ",
+		Ui:           c.Ui,
+	}
+	return 0
+}
+
+func (c *Command) Synopsis() string {
+	return "Runs a Nomad agent"
+}
+
+func (c *Command) Help() string {
+	helpText := `
+Usage: nomad agent [options]
+
+  Starts the Nomad agent and runs until an interrupt is received.
+  The agent may be a client and/or server.
+
+Options:
+
+  -advertise=addr          Sets the advertise address to use
+  -atlas=org/name          Sets the Atlas infrastructure name, enables SCADA.
+  -atlas-join              Enables auto-joining the Atlas cluster
+  -atlas-token=token       Provides the Atlas API token
+  -bootstrap               Sets server to bootstrap mode
+  -bind=0.0.0.0            Sets the bind address for cluster communication
+  -bootstrap-expect=0      Sets server to expect bootstrap mode.
+  -client=127.0.0.1        Sets the address to bind for client access.
+                           This includes RPC, DNS, HTTP and HTTPS (if configured)
+  -config-file=foo         Path to a JSON file to read configuration from.
+                           This can be specified multiple times.
+  -config-dir=foo          Path to a directory to read configuration files
+                           from. This will read every file ending in ".json"
+                           as configuration in this directory in alphabetical
+                           order. This can be specified multiple times.
+  -data-dir=path           Path to a data directory to store agent state
+  -recursor=1.2.3.4        Address of an upstream DNS server.
+                           Can be specified multiple times.
+  -dc=east-aws             Datacenter of the agent
+  -encrypt=key             Provides the gossip encryption key
+  -join=1.2.3.4            Address of an agent to join at start time.
+                           Can be specified multiple times.
+  -join-wan=1.2.3.4        Address of an agent to join -wan at start time.
+                           Can be specified multiple times.
+  -retry-join=1.2.3.4      Address of an agent to join at start time with
+                           retries enabled. Can be specified multiple times.
+  -retry-interval=30s      Time to wait between join attempts.
+  -retry-max=0             Maximum number of join attempts. Defaults to 0, which
+                           will retry indefinitely.
+  -retry-join-wan=1.2.3.4  Address of an agent to join -wan at start time with
+                           retries enabled. Can be specified multiple times.
+  -retry-interval-wan=30s  Time to wait between join -wan attempts.
+  -retry-max-wan=0         Maximum number of join -wan attempts. Defaults to 0, which
+                           will retry indefinitely.
+  -log-level=info          Log level of the agent.
+  -node=hostname           Name of this node. Must be unique in the cluster
+  -protocol=N              Sets the protocol version. Defaults to latest.
+  -rejoin                  Ignores a previous leave and attempts to rejoin the cluster.
+  -server                  Switches agent to server mode.
+  -syslog                  Enables logging to syslog
+  -ui-dir=path             Path to directory containing the Web UI resources
+  -pid-file=path           Path to file to store agent PID
+ `
+	return strings.TrimSpace(helpText)
+}
diff --git a/commands.go b/commands.go
index b0b0a11d3..5e47abb1c 100644
--- a/commands.go
+++ b/commands.go
@@ -4,6 +4,7 @@ import (
 	"os"
 
 	"github.com/hashicorp/nomad/command"
+	"github.com/hashicorp/nomad/command/agent"
 	"github.com/mitchellh/cli"
 )
 
@@ -23,6 +24,16 @@ func Commands(metaPtr *command.Meta) map[string]cli.CommandFactory {
 	}
 
 	return map[string]cli.CommandFactory{
+		"agent": func() (cli.Command, error) {
+			return &agent.Command{
+				Revision:          GitCommit,
+				Version:           Version,
+				VersionPrerelease: VersionPrerelease,
+				Ui:                meta.Ui,
+				ShutdownCh:        make(chan struct{}),
+			}, nil
+		},
+
 		"version": func() (cli.Command, error) {
 			ver := Version
 			rel := VersionPrerelease