Merge pull request #199 from ngrok/revert-198-mo/bindings-to-binding

Revert "endpoints bind to a single binding "

CHANGELOG.md

@@ -1,14 +1,9 @@
-## 1.13.0
-
-Breaking changes:
-
-- Renames pre-release option `WithBindings` to `WithBinding`
-
 ## 1.12.0
 
 Breaking changes:
 
 - Renames pre-release option `WithAllowsPooling` to `WithPoolingEnabled`
+- 
 
 ## 1.11.0
 
@@ -29,7 +24,7 @@ Enhancements:
 - Adds fasthttp example
 - Adds `WithBindings` option
 - Adds support for `TrafficPolicy` field
-
+ 
 Changes:
 
 - Replace log adapter module license symlinks with full files

config/bindings.go

@@ -0,0 +1,30 @@
+package config
+
+type bindings []string
+
+// WithBinding configures ingress for an endpoint
+//
+// The requestedBindings argument specifies the type of ingress for the endpoint.
+func WithBindings(requestedBindings ...string) interface {
+	HTTPEndpointOption
+	TLSEndpointOption
+	TCPEndpointOption
+} {
+	ret := bindings{}
+	for _, binding := range requestedBindings {
+		ret = append(ret, binding)
+	}
+	return ret
+}
+
+func (b bindings) ApplyTLS(cfg *tlsOptions) {
+	cfg.Bindings = []string(b)
+}
+
+func (b bindings) ApplyTCP(cfg *tcpOptions) {
+	cfg.Bindings = []string(b)
+}
+
+func (b bindings) ApplyHTTP(cfg *httpOptions) {
+	cfg.Bindings = []string(b)
+}

config/bindings_test.go

@@ -0,0 +1,45 @@
+package config
+
+import (
+	"testing"
+)
+
+func testBindings[T tunnelConfigPrivate, OT any](t *testing.T,
+	makeOpts func(...OT) Tunnel,
+) {
+	optsFunc := func(opts ...any) Tunnel {
+		return makeOpts(assertSlice[OT](opts)...)
+	}
+
+	cases := testCases[T, any]{
+		{
+			name: "absent",
+			opts: optsFunc(),
+			expectExtra: &matchBindExtra{
+				Bindings: ptr([]string{}),
+			},
+		},
+		{
+			name: "with bindings",
+			opts: optsFunc(WithBindings("public")),
+			expectExtra: &matchBindExtra{
+				Bindings: ptr([]string{"public"}),
+			},
+		},
+		{
+			name: "with bindings with spread op",
+			opts: optsFunc(WithBindings([]string{"public"}...)),
+			expectExtra: &matchBindExtra{
+				Bindings: ptr([]string{"public"}),
+			},
+		},
+	}
+
+	cases.runAll(t)
+}
+
+func TestBindings(t *testing.T) {
+	testBindings[*httpOptions](t, HTTPEndpoint)
+	testBindings[*tlsOptions](t, TLSEndpoint)
+	testBindings[*tcpOptions](t, TCPEndpoint)
+}

config/common.go

@@ -35,7 +35,7 @@ type commonOpts struct {
 	TrafficPolicy string
 
 	// Enables ingress for ngrok endpoints.
-	Binding string
+	Bindings []string
 
 	// Allows the endpoint to pool with other endpoints with the same host/port/binding
 	PoolingEnabled bool

config/config_test.go

@@ -27,7 +27,7 @@ type matchBindExtra struct {
 	Token       *string
 	IPPolicyRef *string
 	Metadata    *string
-	Binding     *string
+	Bindings    *[]string
 }
 
 func (m matchBindExtra) RequireMatches(t *testing.T, actual proto.BindExtra) {

config/http.go

@@ -150,7 +150,7 @@ func (cfg httpOptions) Extra() proto.BindExtra {
 		Name:           cfg.Name,
 		Metadata:       cfg.Metadata,
 		Description:    cfg.Description,
-		Binding:        cfg.Binding,
+		Bindings:       cfg.Bindings,
 		PoolingEnabled: cfg.PoolingEnabled,
 	}
 }

config/tcp.go

@@ -74,7 +74,7 @@ func (cfg tcpOptions) Extra() proto.BindExtra {
 		Name:           cfg.Name,
 		Metadata:       cfg.Metadata,
 		Description:    cfg.Description,
-		Binding:        cfg.Binding,
+		Bindings:       cfg.Bindings,
 		PoolingEnabled: cfg.PoolingEnabled,
 	}
 }

config/tls.go

@@ -102,7 +102,7 @@ func (cfg tlsOptions) Extra() proto.BindExtra {
 		Name:           cfg.Name,
 		Metadata:       cfg.Metadata,
 		Description:    cfg.Description,
-		Binding:        cfg.Binding,
+		Bindings:       cfg.Bindings,
 		PoolingEnabled: cfg.PoolingEnabled,
 	}
 }

internal/tunnel/proto/msg.go

@@ -226,7 +226,7 @@ type BindExtra struct {
 	IPPolicyRef    string
 	Metadata       string
 	Description    string
-	Binding        string
+	Bindings       []string
 	PoolingEnabled bool
 }