2019-08-19 13:17:38 +00:00
|
|
|
package api
|
|
|
|
|
|
|
|
import (
|
2021-01-22 19:45:26 +00:00
|
|
|
"fmt"
|
2019-08-19 13:17:38 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
client: enable configuring enable_tag_override for services
Consul provides a feature of Service Definitions where the tags
associated with a service can be modified through the Catalog API,
overriding the value(s) configured in the agent's service configuration.
To enable this feature, the flag enable_tag_override must be configured
in the service definition.
Previously, Nomad did not allow configuring this flag, and thus the default
value of false was used. Now, it is configurable.
Because Nomad itself acts as a state machine around the the service definitions
of the tasks it manages, it's worth describing what happens when this feature
is enabled and why.
Consider the basic case where there is no Nomad, and your service is provided
to consul as a boring JSON file. The ultimate source of truth for the definition
of that service is the file, and is stored in the agent. Later, Consul performs
"anti-entropy" which synchronizes the Catalog (stored only the leaders). Then
with enable_tag_override=true, the tags field is available for "external"
modification through the Catalog API (rather than directly configuring the
service definition file, or using the Agent API). The important observation
is that if the service definition ever changes (i.e. the file is changed &
config reloaded OR the Agent API is used to modify the service), those
"external" tag values are thrown away, and the new service definition is
once again the source of truth.
In the Nomad case, Nomad itself is the source of truth over the Agent in
the same way the JSON file was the source of truth in the example above.
That means any time Nomad sets a new service definition, any externally
configured tags are going to be replaced. When does this happen? Only on
major lifecycle events, for example when a task is modified because of an
updated job spec from the 'nomad job run <existing>' command. Otherwise,
Nomad's periodic re-sync's with Consul will now no longer try to restore
the externally modified tag values (as long as enable_tag_override=true).
Fixes #2057
2020-02-07 21:22:19 +00:00
|
|
|
"github.com/stretchr/testify/require"
|
2019-08-19 13:17:38 +00:00
|
|
|
)
|
|
|
|
|
2021-01-22 19:45:26 +00:00
|
|
|
func TestService_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
j := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
s := &Service{}
|
|
|
|
|
|
|
|
s.Canonicalize(task, tg, j)
|
|
|
|
|
|
|
|
require.Equal(t, fmt.Sprintf("%s-%s-%s", *j.Name, *tg.Name, task.Name), s.Name)
|
|
|
|
require.Equal(t, "auto", s.AddressMode)
|
|
|
|
require.Equal(t, OnUpdateRequireHealthy, s.OnUpdate)
|
|
|
|
}
|
|
|
|
|
2021-02-04 15:18:03 +00:00
|
|
|
func TestServiceCheck_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
j := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
s := &Service{
|
|
|
|
Checks: []ServiceCheck{
|
|
|
|
{
|
|
|
|
Name: "check",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
s.Canonicalize(task, tg, j)
|
|
|
|
|
|
|
|
require.Equal(t, OnUpdateRequireHealthy, s.Checks[0].OnUpdate)
|
|
|
|
}
|
|
|
|
|
2020-08-08 01:22:06 +00:00
|
|
|
func TestService_Check_PassFail(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
job := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
|
|
|
|
t.Run("enforce minimums", func(t *testing.T) {
|
|
|
|
s := &Service{
|
|
|
|
Checks: []ServiceCheck{{
|
|
|
|
SuccessBeforePassing: -1,
|
|
|
|
FailuresBeforeCritical: -2,
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
|
|
|
|
s.Canonicalize(task, tg, job)
|
|
|
|
require.Zero(t, s.Checks[0].SuccessBeforePassing)
|
|
|
|
require.Zero(t, s.Checks[0].FailuresBeforeCritical)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("normal", func(t *testing.T) {
|
|
|
|
s := &Service{
|
|
|
|
Checks: []ServiceCheck{{
|
|
|
|
SuccessBeforePassing: 3,
|
|
|
|
FailuresBeforeCritical: 4,
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
|
|
|
|
s.Canonicalize(task, tg, job)
|
|
|
|
require.Equal(t, 3, s.Checks[0].SuccessBeforePassing)
|
|
|
|
require.Equal(t, 4, s.Checks[0].FailuresBeforeCritical)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-08-19 13:17:38 +00:00
|
|
|
// TestService_CheckRestart asserts Service.CheckRestart settings are properly
|
|
|
|
// inherited by Checks.
|
|
|
|
func TestService_CheckRestart(t *testing.T) {
|
client: enable configuring enable_tag_override for services
Consul provides a feature of Service Definitions where the tags
associated with a service can be modified through the Catalog API,
overriding the value(s) configured in the agent's service configuration.
To enable this feature, the flag enable_tag_override must be configured
in the service definition.
Previously, Nomad did not allow configuring this flag, and thus the default
value of false was used. Now, it is configurable.
Because Nomad itself acts as a state machine around the the service definitions
of the tasks it manages, it's worth describing what happens when this feature
is enabled and why.
Consider the basic case where there is no Nomad, and your service is provided
to consul as a boring JSON file. The ultimate source of truth for the definition
of that service is the file, and is stored in the agent. Later, Consul performs
"anti-entropy" which synchronizes the Catalog (stored only the leaders). Then
with enable_tag_override=true, the tags field is available for "external"
modification through the Catalog API (rather than directly configuring the
service definition file, or using the Agent API). The important observation
is that if the service definition ever changes (i.e. the file is changed &
config reloaded OR the Agent API is used to modify the service), those
"external" tag values are thrown away, and the new service definition is
once again the source of truth.
In the Nomad case, Nomad itself is the source of truth over the Agent in
the same way the JSON file was the source of truth in the example above.
That means any time Nomad sets a new service definition, any externally
configured tags are going to be replaced. When does this happen? Only on
major lifecycle events, for example when a task is modified because of an
updated job spec from the 'nomad job run <existing>' command. Otherwise,
Nomad's periodic re-sync's with Consul will now no longer try to restore
the externally modified tag values (as long as enable_tag_override=true).
Fixes #2057
2020-02-07 21:22:19 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
2019-08-19 13:17:38 +00:00
|
|
|
job := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
service := &Service{
|
|
|
|
CheckRestart: &CheckRestart{
|
|
|
|
Limit: 11,
|
|
|
|
Grace: timeToPtr(11 * time.Second),
|
|
|
|
IgnoreWarnings: true,
|
|
|
|
},
|
|
|
|
Checks: []ServiceCheck{
|
|
|
|
{
|
|
|
|
Name: "all-set",
|
|
|
|
CheckRestart: &CheckRestart{
|
|
|
|
Limit: 22,
|
|
|
|
Grace: timeToPtr(22 * time.Second),
|
|
|
|
IgnoreWarnings: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "some-set",
|
|
|
|
CheckRestart: &CheckRestart{
|
|
|
|
Limit: 33,
|
|
|
|
Grace: timeToPtr(33 * time.Second),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "unset",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
service.Canonicalize(task, tg, job)
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Equal(t, service.Checks[0].CheckRestart.Limit, 22)
|
|
|
|
require.Equal(t, *service.Checks[0].CheckRestart.Grace, 22*time.Second)
|
|
|
|
require.True(t, service.Checks[0].CheckRestart.IgnoreWarnings)
|
2019-08-19 13:17:38 +00:00
|
|
|
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Equal(t, service.Checks[1].CheckRestart.Limit, 33)
|
|
|
|
require.Equal(t, *service.Checks[1].CheckRestart.Grace, 33*time.Second)
|
|
|
|
require.True(t, service.Checks[1].CheckRestart.IgnoreWarnings)
|
2019-08-19 13:17:38 +00:00
|
|
|
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Equal(t, service.Checks[2].CheckRestart.Limit, 11)
|
|
|
|
require.Equal(t, *service.Checks[2].CheckRestart.Grace, 11*time.Second)
|
|
|
|
require.True(t, service.Checks[2].CheckRestart.IgnoreWarnings)
|
2019-08-19 13:17:38 +00:00
|
|
|
}
|
2019-09-23 18:30:48 +00:00
|
|
|
|
2020-05-18 22:03:10 +00:00
|
|
|
func TestService_Connect_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil connect", func(t *testing.T) {
|
|
|
|
cc := (*ConsulConnect)(nil)
|
|
|
|
cc.Canonicalize()
|
|
|
|
require.Nil(t, cc)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty connect", func(t *testing.T) {
|
|
|
|
cc := new(ConsulConnect)
|
|
|
|
cc.Canonicalize()
|
2020-05-13 20:15:55 +00:00
|
|
|
require.Empty(t, cc.Native)
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Nil(t, cc.SidecarService)
|
|
|
|
require.Nil(t, cc.SidecarTask)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_Connect_ConsulSidecarService_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil sidecar_service", func(t *testing.T) {
|
|
|
|
css := (*ConsulSidecarService)(nil)
|
|
|
|
css.Canonicalize()
|
|
|
|
require.Nil(t, css)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty sidecar_service", func(t *testing.T) {
|
|
|
|
css := new(ConsulSidecarService)
|
|
|
|
css.Canonicalize()
|
|
|
|
require.Empty(t, css.Tags)
|
|
|
|
require.Nil(t, css.Proxy)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("non-empty sidecar_service", func(t *testing.T) {
|
|
|
|
css := &ConsulSidecarService{
|
|
|
|
Tags: make([]string, 0),
|
|
|
|
Port: "port",
|
|
|
|
Proxy: &ConsulProxy{
|
|
|
|
LocalServiceAddress: "lsa",
|
|
|
|
LocalServicePort: 80,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
css.Canonicalize()
|
|
|
|
require.Equal(t, &ConsulSidecarService{
|
|
|
|
Tags: nil,
|
|
|
|
Port: "port",
|
|
|
|
Proxy: &ConsulProxy{
|
|
|
|
LocalServiceAddress: "lsa",
|
|
|
|
LocalServicePort: 80},
|
|
|
|
}, css)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_Connect_ConsulProxy_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil proxy", func(t *testing.T) {
|
|
|
|
cp := (*ConsulProxy)(nil)
|
|
|
|
cp.Canonicalize()
|
|
|
|
require.Nil(t, cp)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty proxy", func(t *testing.T) {
|
|
|
|
cp := new(ConsulProxy)
|
|
|
|
cp.Canonicalize()
|
|
|
|
require.Empty(t, cp.LocalServiceAddress)
|
|
|
|
require.Zero(t, cp.LocalServicePort)
|
|
|
|
require.Nil(t, cp.ExposeConfig)
|
|
|
|
require.Nil(t, cp.Upstreams)
|
|
|
|
require.Empty(t, cp.Config)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("non empty proxy", func(t *testing.T) {
|
|
|
|
cp := &ConsulProxy{
|
|
|
|
LocalServiceAddress: "127.0.0.1",
|
|
|
|
LocalServicePort: 80,
|
|
|
|
ExposeConfig: new(ConsulExposeConfig),
|
|
|
|
Upstreams: make([]*ConsulUpstream, 0),
|
|
|
|
Config: make(map[string]interface{}),
|
|
|
|
}
|
|
|
|
cp.Canonicalize()
|
|
|
|
require.Equal(t, "127.0.0.1", cp.LocalServiceAddress)
|
|
|
|
require.Equal(t, 80, cp.LocalServicePort)
|
|
|
|
require.Equal(t, &ConsulExposeConfig{}, cp.ExposeConfig)
|
|
|
|
require.Nil(t, cp.Upstreams)
|
|
|
|
require.Nil(t, cp.Config)
|
|
|
|
})
|
2021-04-12 19:10:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_Connect_ConsulUpstream_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil upstream", func(t *testing.T) {
|
|
|
|
cu := (*ConsulUpstream)(nil)
|
|
|
|
result := cu.Copy()
|
|
|
|
require.Nil(t, result)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("complete upstream", func(t *testing.T) {
|
|
|
|
cu := &ConsulUpstream{
|
|
|
|
DestinationName: "dest1",
|
|
|
|
Datacenter: "dc2",
|
|
|
|
LocalBindPort: 2000,
|
|
|
|
LocalBindAddress: "10.0.0.1",
|
|
|
|
MeshGateway: &ConsulMeshGateway{Mode: "remote"},
|
|
|
|
}
|
|
|
|
result := cu.Copy()
|
|
|
|
require.Equal(t, cu, result)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_Connect_ConsulUpstream_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil upstream", func(t *testing.T) {
|
|
|
|
cu := (*ConsulUpstream)(nil)
|
|
|
|
cu.Canonicalize()
|
|
|
|
require.Nil(t, cu)
|
|
|
|
})
|
|
|
|
|
2021-06-04 14:31:38 +00:00
|
|
|
t.Run("complete", func(t *testing.T) {
|
2021-04-12 19:10:10 +00:00
|
|
|
cu := &ConsulUpstream{
|
|
|
|
DestinationName: "dest1",
|
|
|
|
Datacenter: "dc2",
|
|
|
|
LocalBindPort: 2000,
|
|
|
|
LocalBindAddress: "10.0.0.1",
|
|
|
|
MeshGateway: &ConsulMeshGateway{Mode: ""},
|
|
|
|
}
|
|
|
|
cu.Canonicalize()
|
|
|
|
require.Equal(t, &ConsulUpstream{
|
|
|
|
DestinationName: "dest1",
|
|
|
|
Datacenter: "dc2",
|
|
|
|
LocalBindPort: 2000,
|
|
|
|
LocalBindAddress: "10.0.0.1",
|
2021-06-04 14:31:38 +00:00
|
|
|
MeshGateway: &ConsulMeshGateway{Mode: ""},
|
2021-04-12 19:10:10 +00:00
|
|
|
}, cu)
|
|
|
|
})
|
2020-05-18 22:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_Connect_proxy_settings(t *testing.T) {
|
client: enable configuring enable_tag_override for services
Consul provides a feature of Service Definitions where the tags
associated with a service can be modified through the Catalog API,
overriding the value(s) configured in the agent's service configuration.
To enable this feature, the flag enable_tag_override must be configured
in the service definition.
Previously, Nomad did not allow configuring this flag, and thus the default
value of false was used. Now, it is configurable.
Because Nomad itself acts as a state machine around the the service definitions
of the tasks it manages, it's worth describing what happens when this feature
is enabled and why.
Consider the basic case where there is no Nomad, and your service is provided
to consul as a boring JSON file. The ultimate source of truth for the definition
of that service is the file, and is stored in the agent. Later, Consul performs
"anti-entropy" which synchronizes the Catalog (stored only the leaders). Then
with enable_tag_override=true, the tags field is available for "external"
modification through the Catalog API (rather than directly configuring the
service definition file, or using the Agent API). The important observation
is that if the service definition ever changes (i.e. the file is changed &
config reloaded OR the Agent API is used to modify the service), those
"external" tag values are thrown away, and the new service definition is
once again the source of truth.
In the Nomad case, Nomad itself is the source of truth over the Agent in
the same way the JSON file was the source of truth in the example above.
That means any time Nomad sets a new service definition, any externally
configured tags are going to be replaced. When does this happen? Only on
major lifecycle events, for example when a task is modified because of an
updated job spec from the 'nomad job run <existing>' command. Otherwise,
Nomad's periodic re-sync's with Consul will now no longer try to restore
the externally modified tag values (as long as enable_tag_override=true).
Fixes #2057
2020-02-07 21:22:19 +00:00
|
|
|
t.Parallel()
|
|
|
|
|
2019-09-23 18:30:48 +00:00
|
|
|
job := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
service := &Service{
|
|
|
|
Connect: &ConsulConnect{
|
|
|
|
SidecarService: &ConsulSidecarService{
|
|
|
|
Proxy: &ConsulProxy{
|
|
|
|
Upstreams: []*ConsulUpstream{
|
|
|
|
{
|
2021-02-23 15:49:18 +00:00
|
|
|
DestinationName: "upstream",
|
|
|
|
LocalBindPort: 80,
|
|
|
|
Datacenter: "dc2",
|
|
|
|
LocalBindAddress: "127.0.0.2",
|
2019-09-23 18:30:48 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
LocalServicePort: 8000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
service.Canonicalize(task, tg, job)
|
|
|
|
proxy := service.Connect.SidecarService.Proxy
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Equal(t, proxy.Upstreams[0].DestinationName, "upstream")
|
2020-11-30 15:57:29 +00:00
|
|
|
require.Equal(t, proxy.Upstreams[0].LocalBindPort, 80)
|
|
|
|
require.Equal(t, proxy.Upstreams[0].Datacenter, "dc2")
|
2021-02-23 15:49:18 +00:00
|
|
|
require.Equal(t, proxy.Upstreams[0].LocalBindAddress, "127.0.0.2")
|
2020-05-18 22:03:10 +00:00
|
|
|
require.Equal(t, proxy.LocalServicePort, 8000)
|
2019-09-23 18:30:48 +00:00
|
|
|
}
|
client: enable configuring enable_tag_override for services
Consul provides a feature of Service Definitions where the tags
associated with a service can be modified through the Catalog API,
overriding the value(s) configured in the agent's service configuration.
To enable this feature, the flag enable_tag_override must be configured
in the service definition.
Previously, Nomad did not allow configuring this flag, and thus the default
value of false was used. Now, it is configurable.
Because Nomad itself acts as a state machine around the the service definitions
of the tasks it manages, it's worth describing what happens when this feature
is enabled and why.
Consider the basic case where there is no Nomad, and your service is provided
to consul as a boring JSON file. The ultimate source of truth for the definition
of that service is the file, and is stored in the agent. Later, Consul performs
"anti-entropy" which synchronizes the Catalog (stored only the leaders). Then
with enable_tag_override=true, the tags field is available for "external"
modification through the Catalog API (rather than directly configuring the
service definition file, or using the Agent API). The important observation
is that if the service definition ever changes (i.e. the file is changed &
config reloaded OR the Agent API is used to modify the service), those
"external" tag values are thrown away, and the new service definition is
once again the source of truth.
In the Nomad case, Nomad itself is the source of truth over the Agent in
the same way the JSON file was the source of truth in the example above.
That means any time Nomad sets a new service definition, any externally
configured tags are going to be replaced. When does this happen? Only on
major lifecycle events, for example when a task is modified because of an
updated job spec from the 'nomad job run <existing>' command. Otherwise,
Nomad's periodic re-sync's with Consul will now no longer try to restore
the externally modified tag values (as long as enable_tag_override=true).
Fixes #2057
2020-02-07 21:22:19 +00:00
|
|
|
|
|
|
|
func TestService_Tags(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
r := require.New(t)
|
|
|
|
|
|
|
|
// canonicalize does not modify eto or tags
|
|
|
|
job := &Job{Name: stringToPtr("job")}
|
|
|
|
tg := &TaskGroup{Name: stringToPtr("group")}
|
|
|
|
task := &Task{Name: "task"}
|
|
|
|
service := &Service{
|
|
|
|
Tags: []string{"a", "b"},
|
|
|
|
CanaryTags: []string{"c", "d"},
|
|
|
|
EnableTagOverride: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
service.Canonicalize(task, tg, job)
|
|
|
|
r.True(service.EnableTagOverride)
|
|
|
|
r.Equal([]string{"a", "b"}, service.Tags)
|
|
|
|
r.Equal([]string{"c", "d"}, service.CanaryTags)
|
|
|
|
}
|
2020-05-18 22:03:10 +00:00
|
|
|
|
|
|
|
func TestService_Connect_SidecarTask_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil sidecar_task", func(t *testing.T) {
|
|
|
|
st := (*SidecarTask)(nil)
|
|
|
|
st.Canonicalize()
|
|
|
|
require.Nil(t, st)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty sidecar_task", func(t *testing.T) {
|
|
|
|
st := new(SidecarTask)
|
|
|
|
st.Canonicalize()
|
|
|
|
require.Nil(t, st.Config)
|
|
|
|
require.Nil(t, st.Env)
|
|
|
|
require.Equal(t, DefaultResources(), st.Resources)
|
|
|
|
require.Equal(t, DefaultLogConfig(), st.LogConfig)
|
|
|
|
require.Nil(t, st.Meta)
|
|
|
|
require.Equal(t, 5*time.Second, *st.KillTimeout)
|
|
|
|
require.Equal(t, 0*time.Second, *st.ShutdownDelay)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("non empty sidecar_task resources", func(t *testing.T) {
|
|
|
|
exp := DefaultResources()
|
|
|
|
exp.MemoryMB = intToPtr(333)
|
|
|
|
st := &SidecarTask{
|
|
|
|
Resources: &Resources{MemoryMB: intToPtr(333)},
|
|
|
|
}
|
|
|
|
st.Canonicalize()
|
|
|
|
require.Equal(t, exp, st.Resources)
|
|
|
|
})
|
|
|
|
}
|
2020-07-28 20:12:08 +00:00
|
|
|
|
|
|
|
func TestService_ConsulGateway_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
cg := (*ConsulGateway)(nil)
|
|
|
|
cg.Canonicalize()
|
|
|
|
require.Nil(t, cg)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("set defaults", func(t *testing.T) {
|
|
|
|
cg := &ConsulGateway{
|
|
|
|
Proxy: &ConsulGatewayProxy{
|
|
|
|
ConnectTimeout: nil,
|
|
|
|
EnvoyGatewayBindTaggedAddresses: true,
|
|
|
|
EnvoyGatewayBindAddresses: make(map[string]*ConsulGatewayBindAddress, 0),
|
|
|
|
EnvoyGatewayNoDefaultBind: true,
|
|
|
|
Config: make(map[string]interface{}, 0),
|
|
|
|
},
|
|
|
|
Ingress: &ConsulIngressConfigEntry{
|
|
|
|
TLS: &ConsulGatewayTLSConfig{
|
|
|
|
Enabled: false,
|
|
|
|
},
|
|
|
|
Listeners: make([]*ConsulIngressListener, 0),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
cg.Canonicalize()
|
|
|
|
require.Equal(t, timeToPtr(5*time.Second), cg.Proxy.ConnectTimeout)
|
2020-12-15 20:38:33 +00:00
|
|
|
require.True(t, cg.Proxy.EnvoyGatewayBindTaggedAddresses)
|
2020-07-28 20:12:08 +00:00
|
|
|
require.Nil(t, cg.Proxy.EnvoyGatewayBindAddresses)
|
2020-12-15 20:38:33 +00:00
|
|
|
require.True(t, cg.Proxy.EnvoyGatewayNoDefaultBind)
|
|
|
|
require.Empty(t, cg.Proxy.EnvoyDNSDiscoveryType)
|
2020-07-28 20:12:08 +00:00
|
|
|
require.Nil(t, cg.Proxy.Config)
|
|
|
|
require.Nil(t, cg.Ingress.Listeners)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulGateway_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
result := (*ConsulGateway)(nil).Copy()
|
|
|
|
require.Nil(t, result)
|
|
|
|
})
|
|
|
|
|
|
|
|
gateway := &ConsulGateway{
|
|
|
|
Proxy: &ConsulGatewayProxy{
|
|
|
|
ConnectTimeout: timeToPtr(3 * time.Second),
|
|
|
|
EnvoyGatewayBindTaggedAddresses: true,
|
|
|
|
EnvoyGatewayBindAddresses: map[string]*ConsulGatewayBindAddress{
|
|
|
|
"listener1": {Address: "10.0.0.1", Port: 2000},
|
|
|
|
"listener2": {Address: "10.0.0.1", Port: 2001},
|
|
|
|
},
|
|
|
|
EnvoyGatewayNoDefaultBind: true,
|
2020-12-15 20:38:33 +00:00
|
|
|
EnvoyDNSDiscoveryType: "STRICT_DNS",
|
2020-07-28 20:12:08 +00:00
|
|
|
Config: map[string]interface{}{
|
|
|
|
"foo": "bar",
|
|
|
|
"baz": 3,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Ingress: &ConsulIngressConfigEntry{
|
|
|
|
TLS: &ConsulGatewayTLSConfig{
|
|
|
|
Enabled: true,
|
|
|
|
},
|
|
|
|
Listeners: []*ConsulIngressListener{{
|
|
|
|
Port: 3333,
|
|
|
|
Protocol: "tcp",
|
|
|
|
Services: []*ConsulIngressService{{
|
|
|
|
Name: "service1",
|
|
|
|
Hosts: []string{
|
|
|
|
"127.0.0.1", "127.0.0.1:3333",
|
|
|
|
}},
|
|
|
|
}},
|
|
|
|
},
|
|
|
|
},
|
2020-12-15 20:38:33 +00:00
|
|
|
Terminating: &ConsulTerminatingConfigEntry{
|
|
|
|
Services: []*ConsulLinkedService{{
|
|
|
|
Name: "linked-service1",
|
|
|
|
}},
|
|
|
|
},
|
2020-07-28 20:12:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
t.Run("complete", func(t *testing.T) {
|
|
|
|
result := gateway.Copy()
|
|
|
|
require.Equal(t, gateway, result)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulIngressConfigEntry_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
c := (*ConsulIngressConfigEntry)(nil)
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Nil(t, c)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty fields", func(t *testing.T) {
|
|
|
|
c := &ConsulIngressConfigEntry{
|
|
|
|
TLS: nil,
|
|
|
|
Listeners: []*ConsulIngressListener{},
|
|
|
|
}
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Nil(t, c.TLS)
|
|
|
|
require.Nil(t, c.Listeners)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("complete", func(t *testing.T) {
|
|
|
|
c := &ConsulIngressConfigEntry{
|
|
|
|
TLS: &ConsulGatewayTLSConfig{Enabled: true},
|
|
|
|
Listeners: []*ConsulIngressListener{{
|
|
|
|
Port: 9090,
|
|
|
|
Protocol: "http",
|
|
|
|
Services: []*ConsulIngressService{{
|
|
|
|
Name: "service1",
|
|
|
|
Hosts: []string{"1.1.1.1"},
|
|
|
|
}},
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Equal(t, &ConsulIngressConfigEntry{
|
|
|
|
TLS: &ConsulGatewayTLSConfig{Enabled: true},
|
|
|
|
Listeners: []*ConsulIngressListener{{
|
|
|
|
Port: 9090,
|
|
|
|
Protocol: "http",
|
|
|
|
Services: []*ConsulIngressService{{
|
|
|
|
Name: "service1",
|
|
|
|
Hosts: []string{"1.1.1.1"},
|
|
|
|
}},
|
|
|
|
}},
|
|
|
|
}, c)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulIngressConfigEntry_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
result := (*ConsulIngressConfigEntry)(nil).Copy()
|
|
|
|
require.Nil(t, result)
|
|
|
|
})
|
|
|
|
|
|
|
|
entry := &ConsulIngressConfigEntry{
|
|
|
|
TLS: &ConsulGatewayTLSConfig{
|
|
|
|
Enabled: true,
|
|
|
|
},
|
|
|
|
Listeners: []*ConsulIngressListener{{
|
|
|
|
Port: 1111,
|
|
|
|
Protocol: "http",
|
|
|
|
Services: []*ConsulIngressService{{
|
|
|
|
Name: "service1",
|
|
|
|
Hosts: []string{"1.1.1.1", "1.1.1.1:9000"},
|
|
|
|
}, {
|
|
|
|
Name: "service2",
|
|
|
|
Hosts: []string{"2.2.2.2"},
|
|
|
|
}},
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Run("complete", func(t *testing.T) {
|
|
|
|
result := entry.Copy()
|
|
|
|
require.Equal(t, entry, result)
|
|
|
|
})
|
|
|
|
}
|
2020-12-15 20:38:33 +00:00
|
|
|
|
|
|
|
func TestService_ConsulTerminatingConfigEntry_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
c := (*ConsulTerminatingConfigEntry)(nil)
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Nil(t, c)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("empty services", func(t *testing.T) {
|
|
|
|
c := &ConsulTerminatingConfigEntry{
|
|
|
|
Services: []*ConsulLinkedService{},
|
|
|
|
}
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Nil(t, c.Services)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulTerminatingConfigEntry_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
result := (*ConsulIngressConfigEntry)(nil).Copy()
|
|
|
|
require.Nil(t, result)
|
|
|
|
})
|
|
|
|
|
|
|
|
entry := &ConsulTerminatingConfigEntry{
|
|
|
|
Services: []*ConsulLinkedService{{
|
|
|
|
Name: "servic1",
|
|
|
|
}, {
|
|
|
|
Name: "service2",
|
|
|
|
CAFile: "ca_file.pem",
|
|
|
|
CertFile: "cert_file.pem",
|
|
|
|
KeyFile: "key_file.pem",
|
|
|
|
SNI: "sni.terminating.consul",
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Run("complete", func(t *testing.T) {
|
|
|
|
result := entry.Copy()
|
|
|
|
require.Equal(t, entry, result)
|
|
|
|
})
|
|
|
|
}
|
2021-04-12 19:10:10 +00:00
|
|
|
|
|
|
|
func TestService_ConsulMeshConfigEntry_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
ce := (*ConsulMeshConfigEntry)(nil)
|
|
|
|
ce.Canonicalize()
|
|
|
|
require.Nil(t, ce)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("instantiated", func(t *testing.T) {
|
|
|
|
ce := new(ConsulMeshConfigEntry)
|
|
|
|
ce.Canonicalize()
|
|
|
|
require.NotNil(t, ce)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulMeshConfigEntry_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
ce := (*ConsulMeshConfigEntry)(nil)
|
|
|
|
ce2 := ce.Copy()
|
|
|
|
require.Nil(t, ce2)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("instantiated", func(t *testing.T) {
|
|
|
|
ce := new(ConsulMeshConfigEntry)
|
|
|
|
ce2 := ce.Copy()
|
|
|
|
require.NotNil(t, ce2)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulMeshGateway_Canonicalize(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
c := (*ConsulMeshGateway)(nil)
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Nil(t, c)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("unset mode", func(t *testing.T) {
|
2021-06-04 13:50:14 +00:00
|
|
|
c := &ConsulMeshGateway{Mode: ""}
|
2021-04-12 19:10:10 +00:00
|
|
|
c.Canonicalize()
|
2021-06-04 13:50:14 +00:00
|
|
|
require.Equal(t, "", c.Mode)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("set mode", func(t *testing.T) {
|
|
|
|
c := &ConsulMeshGateway{Mode: "remote"}
|
|
|
|
c.Canonicalize()
|
|
|
|
require.Equal(t, "remote", c.Mode)
|
2021-04-12 19:10:10 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestService_ConsulMeshGateway_Copy(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
|
|
c := (*ConsulMeshGateway)(nil)
|
|
|
|
result := c.Copy()
|
|
|
|
require.Nil(t, result)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("instantiated", func(t *testing.T) {
|
|
|
|
c := &ConsulMeshGateway{
|
|
|
|
Mode: "local",
|
|
|
|
}
|
|
|
|
result := c.Copy()
|
|
|
|
require.Equal(t, c, result)
|
|
|
|
})
|
|
|
|
}
|