979e1c9c94
- A new endpoint `/v1/agent/service/:service_id` which is a generic way to look up the service for a single instance. The primary value here is that it: - **supports hash-based blocking** and so; - **replaces `/agent/connect/proxy/:proxy_id`** as the mechanism the built-in proxy uses to read its config. - It's not proxy specific and so works for any service. - It has a temporary shim to call through to the existing endpoint to preserve current managed proxy config defaulting behaviour until that is removed entirely (tested). - The built-in proxy now uses the new endpoint exclusively for it's config - The built-in proxy now has a `-sidecar-for` flag that allows the service ID of the _target_ service to be specified, on the condition that there is exactly one "sidecar" proxy (that is one that has `Proxy.DestinationServiceID` set) for the service registered. - Several fixes for edge cases for SidecarService - A fix for `Alias` checks - when running locally they didn't update their state until some external thing updated the target. If the target service has no checks registered as below, then the alias never made it past critical.
53 lines
1.6 KiB
Go
53 lines
1.6 KiB
Go
package structs
|
|
|
|
import "github.com/mitchellh/go-testing-interface"
|
|
|
|
// TestConnectProxyConfig returns a ConnectProxyConfig representing a valid
|
|
// Connect proxy.
|
|
func TestConnectProxyConfig(t testing.T) ConnectProxyConfig {
|
|
return ConnectProxyConfig{
|
|
DestinationServiceName: "web",
|
|
Upstreams: TestUpstreams(t),
|
|
}
|
|
}
|
|
|
|
// TestUpstreams returns a set of upstreams to be used in tests exercising most
|
|
// important configuration patterns.
|
|
func TestUpstreams(t testing.T) Upstreams {
|
|
return Upstreams{
|
|
{
|
|
// We rely on this one having default type in a few tests...
|
|
DestinationName: "db",
|
|
LocalBindPort: 9191,
|
|
Config: map[string]interface{}{
|
|
// Float because this is how it is decoded by JSON decoder so this
|
|
// enables the value returned to be compared directly to a decoded JSON
|
|
// response without spurios type loss.
|
|
"connect_timeout_ms": float64(1000),
|
|
},
|
|
},
|
|
{
|
|
DestinationType: UpstreamDestTypePreparedQuery,
|
|
DestinationName: "geo-cache",
|
|
LocalBindPort: 8181,
|
|
LocalBindAddress: "127.10.10.10",
|
|
},
|
|
}
|
|
}
|
|
|
|
// TestAddDefaultsToUpstreams takes an array of upstreams (such as that from
|
|
// TestUpstreams) and adds default values that are populated during
|
|
// refigistration. Use this for generating the expected Upstreams value after
|
|
// registration.
|
|
func TestAddDefaultsToUpstreams(t testing.T, upstreams []Upstream) Upstreams {
|
|
ups := make([]Upstream, len(upstreams))
|
|
for i := range upstreams {
|
|
ups[i] = upstreams[i]
|
|
// Fill in default fields we expect to have back explicitly in a response
|
|
if ups[i].DestinationType == "" {
|
|
ups[i].DestinationType = UpstreamDestTypeService
|
|
}
|
|
}
|
|
return ups
|
|
}
|