Merge pull request #195 from ngrok/kc/add-name-to-tunnels

Plumb `name` field through for agent and cli flags

config/common.go

@@ -17,6 +17,9 @@ type commonOpts struct {
 	// user supplied description of the endpoint
 	Description string
 
+	// user supplied name for the endpoint
+	Name string
+
 	// If not set, defaults to a URI in the format `app://hostname/path/to/executable?pid=12345`
 	ForwardsTo string
 

config/http.go

@@ -147,6 +147,7 @@ func (cfg *httpOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg httpOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
+		Name:          cfg.Name,
 		Metadata:      cfg.Metadata,
 		Description:   cfg.Description,
 		Bindings:      cfg.Bindings,

config/labeled.go

@@ -66,6 +66,7 @@ func (cfg *labeledOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg labeledOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
+		Name:        cfg.Name,
 		Metadata:    cfg.Metadata,
 		Description: cfg.Description,
 	}

config/name.go

@@ -0,0 +1,28 @@
+package config
+
+type nameOption string
+
+func WithName(name string) interface {
+	HTTPEndpointOption
+	TCPEndpointOption
+	TLSEndpointOption
+	LabeledTunnelOption
+} {
+	return nameOption(name)
+}
+
+func (opt nameOption) ApplyHTTP(opts *httpOptions) {
+	opts.Name = string(opt)
+}
+
+func (opt nameOption) ApplyTLS(opts *tlsOptions) {
+	opts.Name = string(opt)
+}
+
+func (opt nameOption) ApplyTCP(opts *tcpOptions) {
+	opts.Name = string(opt)
+}
+
+func (opt nameOption) ApplyLabeled(opts *labeledOptions) {
+	opts.Name = string(opt)
+}

config/tcp.go

@@ -71,6 +71,7 @@ func (cfg *tcpOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg tcpOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
+		Name:          cfg.Name,
 		Metadata:      cfg.Metadata,
 		Description:   cfg.Description,
 		Bindings:      cfg.Bindings,

config/tls.go

@@ -99,6 +99,7 @@ func (cfg *tlsOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg tlsOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
+		Name:          cfg.Name,
 		Metadata:      cfg.Metadata,
 		Description:   cfg.Description,
 		Bindings:      cfg.Bindings,

internal/tunnel/proto/msg.go

@@ -221,6 +221,7 @@ type Bind struct {
 }
 
 type BindExtra struct {
+	Name          string
 	Token         string
 	IPPolicyRef   string
 	Metadata      string