Merge pull request #189 from ngrok/warrn/allows_pooling

config: allows_pooling boolean defaults false

config/allows_pooling.go

@@ -0,0 +1,23 @@
+package config
+
+type allowsPoolingOption bool
+
+func WithAllowsPooling(allowsPooling bool) interface {
+	HTTPEndpointOption
+	TCPEndpointOption
+	TLSEndpointOption
+} {
+	return allowsPoolingOption(allowsPooling)
+}
+
+func (opt allowsPoolingOption) ApplyHTTP(opts *httpOptions) {
+	opts.AllowsPooling = bool(opt)
+}
+
+func (opt allowsPoolingOption) ApplyTLS(opts *tlsOptions) {
+	opts.AllowsPooling = bool(opt)
+}
+
+func (opt allowsPoolingOption) ApplyTCP(opts *tcpOptions) {
+	opts.AllowsPooling = bool(opt)
+}

config/common.go

@@ -33,6 +33,9 @@ type commonOpts struct {
 
 	// Enables ingress for ngrok endpoints.
 	Bindings []string
+
+	// Allows the endpoint to pool with other endpoints with the same host/port/binding
+	AllowsPooling bool
 }
 
 type CommonOptionsFunc func(cfg *commonOpts)

config/http.go

@@ -147,9 +147,10 @@ func (cfg *httpOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg httpOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
-		Metadata:    cfg.Metadata,
-		Description: cfg.Description,
-		Bindings:    cfg.Bindings,
+		Metadata:      cfg.Metadata,
+		Description:   cfg.Description,
+		Bindings:      cfg.Bindings,
+		AllowsPooling: cfg.AllowsPooling,
 	}
 }
 

config/tcp.go

@@ -71,9 +71,10 @@ func (cfg *tcpOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg tcpOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
-		Metadata:    cfg.Metadata,
-		Description: cfg.Description,
-		Bindings:    cfg.Bindings,
+		Metadata:      cfg.Metadata,
+		Description:   cfg.Description,
+		Bindings:      cfg.Bindings,
+		AllowsPooling: cfg.AllowsPooling,
 	}
 }
 

config/tls.go

@@ -99,9 +99,10 @@ func (cfg *tlsOptions) WithForwardsTo(url *url.URL) {
 
 func (cfg tlsOptions) Extra() proto.BindExtra {
 	return proto.BindExtra{
-		Metadata:    cfg.Metadata,
-		Description: cfg.Description,
-		Bindings:    cfg.Bindings,
+		Metadata:      cfg.Metadata,
+		Description:   cfg.Description,
+		Bindings:      cfg.Bindings,
+		AllowsPooling: cfg.AllowsPooling,
 	}
 }
 

internal/tunnel/proto/msg.go

@@ -221,11 +221,12 @@ type Bind struct {
 }
 
 type BindExtra struct {
-	Token       string
-	IPPolicyRef string
-	Metadata    string
-	Description string
-	Bindings    []string
+	Token         string
+	IPPolicyRef   string
+	Metadata      string
+	Description   string
+	Bindings      []string
+	AllowsPooling bool
 }
 
 // The server responds with a BindResp message to notify the client of the