diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2023-04-10 16:08:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-10 20:08:40 +0000 |
| commit | 4636109ce17e6ba5f46e73b7b1f3ae82d076a625 (patch) | |
| tree | 93d9bda1a253a002bcb4b4e4d0daa9a67d1bad79 /caddytest/integration | |
| parent | 205b142614d5de08ffc33a04ae4cfc00e65b5dfc (diff) | |
reverseproxy: Remove deprecated `lookup_srv` (#5396)
Diffstat (limited to 'caddytest/integration')
| -rw-r--r-- | caddytest/integration/reverseproxy_test.go | 95 |
1 files changed, 4 insertions, 91 deletions
diff --git a/caddytest/integration/reverseproxy_test.go b/caddytest/integration/reverseproxy_test.go index 4333d12..4f4261b 100644 --- a/caddytest/integration/reverseproxy_test.go +++ b/caddytest/integration/reverseproxy_test.go @@ -40,11 +40,10 @@ func TestSRVReverseProxy(t *testing.T) { "handle": [ { "handler": "reverse_proxy", - "upstreams": [ - { - "lookup_srv": "srv.host.service.consul" - } - ] + "dynamic_upstreams": { + "source": "srv", + "name": "srv.host.service.consul" + } } ] } @@ -57,47 +56,6 @@ func TestSRVReverseProxy(t *testing.T) { `, "json") } -func TestSRVWithDial(t *testing.T) { - caddytest.AssertLoadError(t, ` - { - "apps": { - "pki": { - "certificate_authorities": { - "local": { - "install_trust": false - } - } - }, - "http": { - "grace_period": 1, - "servers": { - "srv0": { - "listen": [ - ":18080" - ], - "routes": [ - { - "handle": [ - { - "handler": "reverse_proxy", - "upstreams": [ - { - "dial": "tcp/address.to.upstream:80", - "lookup_srv": "srv.host.service.consul" - } - ] - } - ] - } - ] - } - } - } - } - } - `, "json", `upstream: specifying dial address is incompatible with lookup_srv: 0: {\"dial\": \"tcp/address.to.upstream:80\", \"lookup_srv\": \"srv.host.service.consul\"}`) -} - func TestDialWithPlaceholderUnix(t *testing.T) { if runtime.GOOS == "windows" { @@ -369,51 +327,6 @@ func TestReverseProxyWithPlaceholderTCPDialAddress(t *testing.T) { tester.AssertResponse(req, 200, "Hello, World!") } -func TestSRVWithActiveHealthcheck(t *testing.T) { - caddytest.AssertLoadError(t, ` - { - "apps": { - "pki": { - "certificate_authorities" : { - "local" : { - "install_trust": false - } - } - }, - "http": { - "grace_period": 1, - "servers": { - "srv0": { - "listen": [ - ":18080" - ], - "routes": [ - { - "handle": [ - { - "handler": "reverse_proxy", - "health_checks": { - "active": { - "path": "/ok" - } - }, - "upstreams": [ - { - "lookup_srv": "srv.host.service.consul" - } - ] - } - ] - } - ] - } - } - } - } - } - `, "json", `upstream: lookup_srv is incompatible with active health checks: 0: {\"dial\": \"\", \"lookup_srv\": \"srv.host.service.consul\"}`) -} - func TestReverseProxyHealthCheck(t *testing.T) { tester := caddytest.NewTester(t) tester.InitServer(` |