@@ -3,15 +3,18 @@ package grpc
33
44import (
55 "context"
6+ "fmt"
67 "net"
78 "net/url"
89 "os"
10+ "strings"
911 "sync"
1012 "testing"
1113 "time"
1214
1315 "github.com/sirupsen/logrus"
1416 "github.com/stretchr/testify/require"
17+ "golang.org/x/net/proxy"
1518 "google.golang.org/grpc"
1619 "google.golang.org/grpc/connectivity"
1720
@@ -157,6 +160,143 @@ func TestConnectionEvents(t *testing.T) {
157160 }
158161}
159162
163+ // Confirms the controller records failure when the registry endpoint cannot be reached.
164+ func TestConnectionEventsRecordsFailureForUnreachableAddress (t * testing.T ) {
165+ catalogKey := registry.CatalogKey {Name : "test" , Namespace : "test" }
166+
167+ syncer := NewFakeSourceSyncer (1 )
168+ sources := NewSourceStore (logrus .New (), 500 * time .Millisecond , time .Second , syncer .sync )
169+ ctx , cancel := context .WithTimeout (context .Background (), 10 * time .Second )
170+ defer cancel ()
171+ sources .Start (ctx )
172+
173+ _ , err := sources .Add (catalogKey , "127.0.0.1:65534" )
174+ require .NoError (t , err )
175+
176+ require .Eventually (t , func () bool {
177+ syncer .Lock ()
178+ defer syncer .Unlock ()
179+ for _ , state := range syncer .History [catalogKey ] {
180+ if state == connectivity .TransientFailure {
181+ return true
182+ }
183+ }
184+ return false
185+ }, 5 * time .Second , 100 * time .Millisecond , "expected transient failure when catalog address is unreachable" )
186+ }
187+
188+ // Validates proxied connections succeed even when the client cannot resolve the cluster address.
189+ func TestGrpcConnectionConnectsThroughProxyForClusterAddress (t * testing.T ) {
190+ t .Setenv ("GRPC_PROXY" , "" )
191+ t .Setenv ("grpc_proxy" , "" )
192+ t .Setenv ("NO_PROXY" , "" )
193+ t .Setenv ("no_proxy" , "" )
194+
195+ serve , backendAddr , stopServer := server (& fakes.FakeQuery {})
196+ go serve ()
197+ defer stopServer ()
198+
199+ target := "service.namespace.svc:50051"
200+
201+ directConn , err := grpcConnection (target )
202+ require .NoError (t , err )
203+ waitForState (t , directConn , 5 * time .Second , func (state connectivity.State ) bool {
204+ return state == connectivity .TransientFailure || state == connectivity .Shutdown
205+ })
206+ require .NoError (t , directConn .Close ())
207+
208+ dialer := setupTestProxyDialer (backendAddr )
209+
210+ t .Setenv ("GRPC_PROXY" , "grpc-test://proxy" )
211+ t .Setenv ("NO_PROXY" , "" )
212+
213+ proxyConn , err := grpcConnection (target )
214+ require .NoError (t , err )
215+ defer proxyConn .Close ()
216+
217+ waitForState (t , proxyConn , 10 * time .Second , func (state connectivity.State ) bool {
218+ return state == connectivity .Ready
219+ })
220+
221+ require .Greater (t , dialer .Calls (), 0 , "expected proxy dialer to be used" )
222+ require .NotEmpty (t , dialer .LastAddr (), "expected proxy dialer to record address" )
223+ require .True (t , strings .Contains (dialer .LastAddr (), target ), "expected dial address to include target, got %q" , dialer .LastAddr ())
224+ }
225+
226+ func waitForState (t * testing.T , conn * grpc.ClientConn , timeout time.Duration , match func (connectivity.State ) bool ) {
227+ t .Helper ()
228+
229+ var last connectivity.State
230+ require .Eventually (t , func () bool {
231+ conn .Connect ()
232+ last = conn .GetState ()
233+ if match (last ) {
234+ return true
235+ }
236+
237+ ctx , cancel := context .WithTimeout (context .Background (), 100 * time .Millisecond )
238+ conn .WaitForStateChange (ctx , last )
239+ cancel ()
240+
241+ last = conn .GetState ()
242+ return match (last )
243+ }, timeout , 100 * time .Millisecond , fmt .Sprintf ("connection never satisfied predicate; last state=%s" , last ))
244+ }
245+
246+ var (
247+ registerTestProxyDialerOnce sync.Once
248+ testProxyDialer = & recordingProxyDialer {}
249+ )
250+
251+ func setupTestProxyDialer (backend string ) * recordingProxyDialer {
252+ registerTestProxyDialerOnce .Do (func () {
253+ proxy .RegisterDialerType ("grpc-test" , func (u * url.URL , _ proxy.Dialer ) (proxy.Dialer , error ) {
254+ return testProxyDialer , nil
255+ })
256+ })
257+ testProxyDialer .Reset (backend )
258+ return testProxyDialer
259+ }
260+
261+ type recordingProxyDialer struct {
262+ mu sync.Mutex
263+ backend string
264+ addrs []string
265+ calls int
266+ }
267+
268+ func (d * recordingProxyDialer ) Dial (network , addr string ) (net.Conn , error ) {
269+ d .mu .Lock ()
270+ d .calls ++
271+ d .addrs = append (d .addrs , addr )
272+ backend := d .backend
273+ d .mu .Unlock ()
274+ return net .Dial (network , backend )
275+ }
276+
277+ func (d * recordingProxyDialer ) Reset (backend string ) {
278+ d .mu .Lock ()
279+ defer d .mu .Unlock ()
280+ d .backend = backend
281+ d .addrs = nil
282+ d .calls = 0
283+ }
284+
285+ func (d * recordingProxyDialer ) Calls () int {
286+ d .mu .Lock ()
287+ defer d .mu .Unlock ()
288+ return d .calls
289+ }
290+
291+ func (d * recordingProxyDialer ) LastAddr () string {
292+ d .mu .Lock ()
293+ defer d .mu .Unlock ()
294+ if len (d .addrs ) == 0 {
295+ return ""
296+ }
297+ return d .addrs [len (d .addrs )- 1 ]
298+ }
299+
160300func TestGetEnvAny (t * testing.T ) {
161301 type envVar struct {
162302 key string
![openshift-merge-bot[bot]](https://avatars.githubusercontent.com/in/412865?v=4&size=40){kind=avatar}
0 commit comments