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
123 lines
2.1 KiB
Go
123 lines
2.1 KiB
Go
package state
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestIndexConnectService_FromObject(t *testing.T) {
|
|
cases := []struct {
|
|
Name string
|
|
Input interface{}
|
|
ExpectMatch bool
|
|
ExpectVal []byte
|
|
ExpectErr string
|
|
}{
|
|
{
|
|
"not a ServiceNode",
|
|
42,
|
|
false,
|
|
nil,
|
|
"ServiceNode",
|
|
},
|
|
|
|
{
|
|
"typical service, not native",
|
|
&structs.ServiceNode{
|
|
ServiceName: "db",
|
|
},
|
|
false,
|
|
nil,
|
|
"",
|
|
},
|
|
|
|
{
|
|
"typical service, is native",
|
|
&structs.ServiceNode{
|
|
ServiceName: "dB",
|
|
ServiceConnect: structs.ServiceConnect{Native: true},
|
|
},
|
|
true,
|
|
[]byte("db\x00"),
|
|
"",
|
|
},
|
|
|
|
{
|
|
"proxy service",
|
|
&structs.ServiceNode{
|
|
ServiceKind: structs.ServiceKindConnectProxy,
|
|
ServiceName: "db",
|
|
ServiceProxy: structs.ConnectProxyConfig{DestinationServiceName: "fOo"},
|
|
},
|
|
true,
|
|
[]byte("foo\x00"),
|
|
"",
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
require := require.New(t)
|
|
|
|
var idx IndexConnectService
|
|
match, val, err := idx.FromObject(tc.Input)
|
|
if tc.ExpectErr != "" {
|
|
require.Error(err)
|
|
require.Contains(err.Error(), tc.ExpectErr)
|
|
return
|
|
}
|
|
require.NoError(err)
|
|
require.Equal(tc.ExpectMatch, match)
|
|
require.Equal(tc.ExpectVal, val)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIndexConnectService_FromArgs(t *testing.T) {
|
|
cases := []struct {
|
|
Name string
|
|
Args []interface{}
|
|
ExpectVal []byte
|
|
ExpectErr string
|
|
}{
|
|
{
|
|
"multiple arguments",
|
|
[]interface{}{"foo", "bar"},
|
|
nil,
|
|
"single",
|
|
},
|
|
|
|
{
|
|
"not a string",
|
|
[]interface{}{42},
|
|
nil,
|
|
"must be a string",
|
|
},
|
|
|
|
{
|
|
"string",
|
|
[]interface{}{"fOO"},
|
|
[]byte("foo\x00"),
|
|
"",
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
require := require.New(t)
|
|
|
|
var idx IndexConnectService
|
|
val, err := idx.FromArgs(tc.Args...)
|
|
if tc.ExpectErr != "" {
|
|
require.Error(err)
|
|
require.Contains(err.Error(), tc.ExpectErr)
|
|
return
|
|
}
|
|
require.NoError(err)
|
|
require.Equal(tc.ExpectVal, val)
|
|
})
|
|
}
|
|
}
|