5eace88ce2
Fixes: #5396 This PR adds a proxy configuration stanza called expose. These flags register listeners in Connect sidecar proxies to allow requests to specific HTTP paths from outside of the node. This allows services to protect themselves by only listening on the loopback interface, while still accepting traffic from non Connect-enabled services. Under expose there is a boolean checks flag that would automatically expose all registered HTTP and gRPC check paths. This stanza also accepts a paths list to expose individual paths. The primary use case for this functionality would be to expose paths for third parties like Prometheus or the kubelet. Listeners for requests to exposed paths are be configured dynamically at run time. Any time a proxy, or check can be registered, a listener can also be created. In this initial implementation requests to these paths are not authenticated/encrypted.
111 lines
2.9 KiB
Go
111 lines
2.9 KiB
Go
package agent
|
|
|
|
import (
|
|
"context"
|
|
"github.com/hashicorp/consul/agent/cache"
|
|
cachetype "github.com/hashicorp/consul/agent/cache-types"
|
|
"github.com/hashicorp/consul/agent/checks"
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
"github.com/hashicorp/consul/testrpc"
|
|
"github.com/stretchr/testify/require"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// Integration test for ServiceHTTPBasedChecks cache-type
|
|
// Placed in agent pkg rather than cache-types to avoid circular dependency when importing agent.TestAgent
|
|
func TestAgent_ServiceHTTPChecksNotification(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
a := NewTestAgent(t, t.Name(), "")
|
|
defer a.Shutdown()
|
|
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
|
|
|
|
service := structs.NodeService{
|
|
ID: "web",
|
|
Service: "web",
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
ch := make(chan cache.UpdateEvent)
|
|
|
|
// Watch for service check updates
|
|
err := a.cache.Notify(ctx, cachetype.ServiceHTTPChecksName, &cachetype.ServiceHTTPChecksRequest{
|
|
ServiceID: service.ID,
|
|
}, "service-checks:"+service.ID, ch)
|
|
if err != nil {
|
|
t.Fatalf("failed to set cache notification: %v", err)
|
|
}
|
|
|
|
chkTypes := []*structs.CheckType{
|
|
{
|
|
CheckID: "http-check",
|
|
HTTP: "localhost:8080/health",
|
|
Interval: 5 * time.Second,
|
|
OutputMaxSize: checks.DefaultBufSize,
|
|
},
|
|
{
|
|
CheckID: "grpc-check",
|
|
GRPC: "localhost:9090/v1.Health",
|
|
Interval: 5 * time.Second,
|
|
},
|
|
{
|
|
CheckID: "ttl-check",
|
|
TTL: 10 * time.Second,
|
|
},
|
|
}
|
|
// Adding TTL type should lead to a timeout, since only HTTP-based checks are watched
|
|
if err := a.AddService(&service, chkTypes[2:], false, "", ConfigSourceLocal); err != nil {
|
|
t.Fatalf("failed to add service: %v", err)
|
|
}
|
|
|
|
var val cache.UpdateEvent
|
|
select {
|
|
case val = <-ch:
|
|
t.Fatal("got cache update for TTL check, expected timeout")
|
|
case <-time.After(100 * time.Millisecond):
|
|
}
|
|
|
|
// Adding service with HTTP checks should lead notification for them
|
|
if err := a.AddService(&service, chkTypes[0:2], false, "", ConfigSourceLocal); err != nil {
|
|
t.Fatalf("failed to add service: %v", err)
|
|
}
|
|
|
|
select {
|
|
case val = <-ch:
|
|
case <-time.After(100 * time.Millisecond):
|
|
t.Fatal("didn't get cache update event")
|
|
}
|
|
|
|
got, ok := val.Result.([]structs.CheckType)
|
|
if !ok {
|
|
t.Fatalf("notified of result of wrong type, got %T, want []structs.CheckType", got)
|
|
}
|
|
want := chkTypes[0:2]
|
|
for i, c := range want {
|
|
require.Equal(t, *c, got[i])
|
|
}
|
|
|
|
// Removing the GRPC check should leave only the HTTP check
|
|
if err := a.RemoveCheck(chkTypes[1].CheckID, false); err != nil {
|
|
t.Fatalf("failed to remove check: %v", err)
|
|
}
|
|
|
|
select {
|
|
case val = <-ch:
|
|
case <-time.After(100 * time.Millisecond):
|
|
t.Fatal("didn't get cache update event")
|
|
}
|
|
|
|
got, ok = val.Result.([]structs.CheckType)
|
|
if !ok {
|
|
t.Fatalf("notified of result of wrong type, got %T, want []structs.CheckType", got)
|
|
}
|
|
want = chkTypes[0:1]
|
|
for i, c := range want {
|
|
require.Equal(t, *c, got[i])
|
|
}
|
|
}
|