xds: remove obsolete xDS transport custom dialer option (#8079)

grpc · Feb 18, 2025 · ddb2484 · ddb2484
1 parent 8528f43
commit ddb2484
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 165 deletions.
diff --git a/internal/xds/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go
@@ -22,11 +22,9 @@ package bootstrap
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"maps"
-	"net"
 	"net/url"
 	"os"
 	"slices"
@@ -281,13 +279,6 @@ func (sc *ServerConfig) MarshalJSON() ([]byte, error) {
 	return json.Marshal(server)
 }
 
-// dialer captures the Dialer method specified via the credentials bundle.
-// Deprecated: use extradDialOptions. Will take precedence over this.
-type dialer interface {
-	// Dialer specifies how to dial the xDS server.
-	Dialer(context.Context, string) (net.Conn, error)
-}
-
 // extraDialOptions captures custom dial options specified via
 // credentials.Bundle.
 type extraDialOptions interface {
@@ -319,8 +310,6 @@ func (sc *ServerConfig) UnmarshalJSON(data []byte) error {
 		sc.credsDialOption = grpc.WithCredentialsBundle(bundle)
 		if d, ok := bundle.(extraDialOptions); ok {
 			sc.extraDialOptions = d.DialOptions()
-		} else if d, ok := bundle.(dialer); ok {
-			sc.extraDialOptions = []grpc.DialOption{grpc.WithContextDialer(d.Dialer)}
 		}
 		sc.cleanups = append(sc.cleanups, cancel)
 		break

diff --git a/test/xds/xds_client_custom_dialer_test.go b/test/xds/xds_client_custom_dialer_test.go