92fe8c8e89
* Refactor Service Definition ProxyDestination. This includes: - Refactoring all internal structs used - Updated tests for both deprecated and new input for: - Agent Services endpoint response - Agent Service endpoint response - Agent Register endpoint - Unmanaged deprecated field - Unmanaged new fields - Managed deprecated upstreams - Managed new - Catalog Register - Unmanaged deprecated field - Unmanaged new fields - Managed deprecated upstreams - Managed new - Catalog Services endpoint response - Catalog Node endpoint response - Catalog Service endpoint response - Updated API tests for all of the above too (both deprecated and new forms of register) TODO: - config package changes for on-disk service definitions - proxy config endpoint - built-in proxy support for new fields * Agent proxy config endpoint updated with upstreams * Config file changes for upstreams. * Add upstream opaque config and update all tests to ensure it works everywhere. * Built in proxy working with new Upstreams config * Command fixes and deprecations * Fix key translation, upstream type defaults and a spate of other subtele bugs found with ned to end test scripts... TODO: tests still failing on one case that needs a fix. I think it's key translation for upstreams nested in Managed proxy struct. * Fix translated keys in API registration. ≈ * Fixes from docs - omit some empty undocumented fields in API - Bring back ServiceProxyDestination in Catalog responses to not break backwards compat - this was removed assuming it was only used internally. * Documentation updates for Upstreams in service definition * Fixes for tests broken by many refactors. * Enable travis on f-connect branch in this branch too. * Add consistent Deprecation comments to ProxyDestination uses * Update version number on deprecation notices, and correct upstream datacenter field with explanation in docs
207 lines
3.9 KiB
Go
207 lines
3.9 KiB
Go
package structs
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/pascaldekloe/goe/verify"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAgentStructs_CheckTypes(t *testing.T) {
|
|
t.Parallel()
|
|
svc := new(ServiceDefinition)
|
|
|
|
// Singular Check field works
|
|
svc.Check = CheckType{
|
|
ScriptArgs: []string{"/foo/bar"},
|
|
Interval: 10 * time.Second,
|
|
}
|
|
|
|
// Returns HTTP checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
HTTP: "http://foo/bar",
|
|
Interval: 10 * time.Second,
|
|
})
|
|
|
|
// Returns Script checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
ScriptArgs: []string{"/foo/bar"},
|
|
Interval: 10 * time.Second,
|
|
})
|
|
|
|
// Returns TTL checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
TTL: 10 * time.Second,
|
|
})
|
|
|
|
// Validate checks
|
|
cases := []struct {
|
|
in *CheckType
|
|
err error
|
|
desc string
|
|
}{
|
|
{&CheckType{HTTP: "http://foo/baz"}, fmt.Errorf("Interval must be > 0 for Script, HTTP, or TCP checks"), "Missing interval"},
|
|
{&CheckType{TTL: -1}, fmt.Errorf("TTL must be > 0 for TTL checks"), "Negative TTL"},
|
|
{&CheckType{TTL: 20 * time.Second, Interval: 10 * time.Second}, fmt.Errorf("Interval and TTL cannot both be specified"), "Interval and TTL both set"},
|
|
}
|
|
for _, tc := range cases {
|
|
svc.Check = *tc.in
|
|
checks, err := svc.CheckTypes()
|
|
verify.Values(t, tc.desc, err.Error(), tc.err.Error())
|
|
if len(checks) != 0 {
|
|
t.Fatalf("bad: %#v", svc)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestServiceDefinitionValidate(t *testing.T) {
|
|
cases := []struct {
|
|
Name string
|
|
Modify func(*ServiceDefinition)
|
|
Err string
|
|
}{
|
|
{
|
|
"valid",
|
|
func(x *ServiceDefinition) {},
|
|
"",
|
|
},
|
|
|
|
{
|
|
"managed proxy with a port set",
|
|
func(x *ServiceDefinition) {
|
|
x.Port = 8080
|
|
x.Connect = &ServiceConnect{
|
|
Proxy: &ServiceDefinitionConnectProxy{},
|
|
}
|
|
},
|
|
"",
|
|
},
|
|
|
|
{
|
|
"managed proxy with no port set",
|
|
func(x *ServiceDefinition) {
|
|
x.Port = 0 // Explicitly unset this as the test default sets it sanely
|
|
x.Connect = &ServiceConnect{
|
|
Proxy: &ServiceDefinitionConnectProxy{},
|
|
}
|
|
},
|
|
"must have a port",
|
|
},
|
|
|
|
{
|
|
"managed proxy with native set",
|
|
func(x *ServiceDefinition) {
|
|
x.Port = 8080
|
|
x.Connect = &ServiceConnect{
|
|
Native: true,
|
|
Proxy: &ServiceDefinitionConnectProxy{},
|
|
}
|
|
},
|
|
"may not have a proxy",
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
require := require.New(t)
|
|
service := TestServiceDefinition(t)
|
|
tc.Modify(service)
|
|
|
|
err := service.Validate()
|
|
if tc.Err == "" {
|
|
require.NoError(err)
|
|
} else {
|
|
require.Error(err)
|
|
require.Contains(strings.ToLower(err.Error()), strings.ToLower(tc.Err))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServiceDefinitionConnectProxy_json(t *testing.T) {
|
|
cases := []struct {
|
|
Name string
|
|
Input *ServiceDefinitionConnectProxy
|
|
Expected string
|
|
Err string
|
|
}{
|
|
{
|
|
"no config",
|
|
&ServiceDefinitionConnectProxy{
|
|
Command: []string{"foo"},
|
|
ExecMode: "bar",
|
|
},
|
|
`
|
|
{
|
|
"Command": [
|
|
"foo"
|
|
],
|
|
"ExecMode": "bar"
|
|
}
|
|
`,
|
|
"",
|
|
},
|
|
|
|
{
|
|
"basic config",
|
|
&ServiceDefinitionConnectProxy{
|
|
Config: map[string]interface{}{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
`
|
|
{
|
|
"Config": {
|
|
"foo": "bar"
|
|
}
|
|
}
|
|
`,
|
|
"",
|
|
},
|
|
|
|
{
|
|
"config with upstreams",
|
|
&ServiceDefinitionConnectProxy{
|
|
Config: map[string]interface{}{
|
|
"upstreams": []interface{}{
|
|
map[interface{}]interface{}{
|
|
"key": []byte("value"),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
`
|
|
{
|
|
"Config": {
|
|
"upstreams": [
|
|
{
|
|
"key": "value"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
`,
|
|
"",
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
require := require.New(t)
|
|
result, err := json.MarshalIndent(tc.Input, "", "\t")
|
|
t.Logf("error: %s", err)
|
|
require.Equal(err != nil, tc.Err != "")
|
|
if err != nil {
|
|
require.Contains(strings.ToLower(err.Error()), strings.ToLower(tc.Err))
|
|
return
|
|
}
|
|
|
|
require.Equal(strings.TrimSpace(tc.Expected), strings.TrimSpace(string(result)))
|
|
})
|
|
}
|
|
}
|