luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

fixed tests

This commit is contained in:
AndrewChubatiuk 2021-02-08 18:16:49 +02:00
parent 99201412da
commit 77f9b84a30
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/agent/consul/connect.go
View File

@ -100,7 +100,7 @@ func connectSidecarRegistration(serviceId string, serviceName string, css *struc
if err != nil {
return nil, err
}
return &api.AgentServiceRegistration{
Tags: helper.CopySliceString(css.Tags),
Port: cPort.Value,
@ -108,7 +108,7 @@ func connectSidecarRegistration(serviceId string, serviceName string, css *struc
Proxy: proxy,
Checks: api.AgentServiceChecks{
{
Name: "Connect Sidecar Listening",
Name: "Connect Sidecar Listening",
TCP: ipaddr.FormatAddressPort(cNet.IP, cPort.Value),
Interval: "10s",
},

14
command/agent/consul/connect_test.go
View File

@ -27,13 +27,13 @@ func TestConnect_newConnect(t *testing.T) {
t.Parallel()
t.Run("nil", func(t *testing.T) {
asr, err := newConnect("", nil, nil)
asr, err := newConnect("","", nil, nil)
require.NoError(t, err)
require.Nil(t, asr)
})
t.Run("native", func(t *testing.T) {
asr, err := newConnect("", &structs.ConsulConnect{
asr, err := newConnect("", "", &structs.ConsulConnect{
Native: true,
}, nil)
require.NoError(t, err)
@ -42,7 +42,7 @@ func TestConnect_newConnect(t *testing.T) {
})
t.Run("with sidecar", func(t *testing.T) {
asr, err := newConnect("redis", &structs.ConsulConnect{
asr, err := newConnect("redis-service-id", "redis", &structs.ConsulConnect{
Native: false,
SidecarService: &structs.ConsulSidecarService{
Tags: []string{"foo", "bar"},
@ -68,20 +68,20 @@ func TestConnect_connectSidecarRegistration(t *testing.T) {
t.Parallel()
t.Run("nil", func(t *testing.T) {
sidecarReg, err := connectSidecarRegistration("", nil, testConnectNetwork)
sidecarReg, err := connectSidecarRegistration("", "", nil, testConnectNetwork)
require.NoError(t, err)
require.Nil(t, sidecarReg)
})
t.Run("no service port", func(t *testing.T) {
_, err := connectSidecarRegistration("unknown", &structs.ConsulSidecarService{
_, err := connectSidecarRegistration("unknown-id", "unknown", &structs.ConsulSidecarService{
// irrelevant
}, testConnectNetwork)
require.EqualError(t, err, `No Connect port defined for service "unknown"`)
})
t.Run("bad proxy", func(t *testing.T) {
_, err := connectSidecarRegistration("redis", &structs.ConsulSidecarService{
_, err := connectSidecarRegistration("redis-service-id", "redis", &structs.ConsulSidecarService{
Proxy: &structs.ConsulProxy{
Expose: &structs.ConsulExposeConfig{
Paths: []structs.ConsulExposePath{{
@ -94,7 +94,7 @@ func TestConnect_connectSidecarRegistration(t *testing.T) {
})
t.Run("normal", func(t *testing.T) {
proxy, err := connectSidecarRegistration("redis", &structs.ConsulSidecarService{
proxy, err := connectSidecarRegistration("redis-service-id", "redis", &structs.ConsulSidecarService{
Tags: []string{"foo", "bar"},
Port: "sidecarPort",
}, testConnectNetwork)