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

Fixup agent/config tests 

Signed-off-by: Mark Anderson <manderson@hashicorp.com>
This commit is contained in:
Mark Anderson 2021-05-04 18:30:20 -07:00
parent ab0b90d480
commit ac4cb213a1
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/config/runtime_test.go
View File

@ -5648,6 +5648,13 @@ func TestLoad_FullConfig(t *testing.T) {
LocalBindPort: 11884, LocalBindPort: 11884,
LocalBindAddress: "127.24.88.0", LocalBindAddress: "127.24.88.0",
}, },
{
DestinationType: "prepared_query",
DestinationNamespace: "9nakw0td",
DestinationName: "placeholder",
LocalBindSocketPath: "/foo/bar/upstream",
LocalBindSocketMode: "0600",
},
}, },
Expose: structs.ExposeConfig{ Expose: structs.ExposeConfig{
Checks: true, Checks: true,

1
agent/config/testdata/TestRuntimeConfig_Sanitize.golden vendored
View File

@ -325,6 +325,7 @@
"Name": "foo", "Name": "foo",
"Port": 0, "Port": 0,
"Proxy": null, "Proxy": null,
"SocketPath": "",
"TaggedAddresses": {}, "TaggedAddresses": {},
"Tags": [], "Tags": [],
"Token": "hidden", "Token": "hidden",

8
agent/config/testdata/full-config.hcl vendored
View File

@ -362,7 +362,6 @@ service = {
address = "cOlSOhbp" address = "cOlSOhbp"
token = "msy7iWER" token = "msy7iWER"
port = 24237 port = 24237
socket_path = "/tmp/rc78ap"
weights = { weights = {
passing = 100, passing = 100,
warning = 1 warning = 1
@ -456,7 +455,6 @@ services = [
address = "9RhqPSPB" address = "9RhqPSPB"
token = "myjKJkWH" token = "myjKJkWH"
port = 72219 port = 72219
socket_path = "/foo/bar/sock_7IszXMQ1"
enable_tag_override = true enable_tag_override = true
check = { check = {
id = "qmfeO5if" id = "qmfeO5if"
@ -563,7 +561,6 @@ services = [
destination_service_id = "6L6BVfgH-id" destination_service_id = "6L6BVfgH-id"
local_service_address = "127.0.0.2" local_service_address = "127.0.0.2"
local_service_port = 23759 local_service_port = 23759
local_service_socket_path = "/foo/bar/local"
config { config {
cedGGtZf = "pWrUNiWw" cedGGtZf = "pWrUNiWw"
} }
@ -581,6 +578,11 @@ services = [
destination_name = "KSd8HsRl" destination_name = "KSd8HsRl"
local_bind_port = 11884 local_bind_port = 11884
local_bind_address = "127.24.88.0" local_bind_address = "127.24.88.0"
},
{
destination_type = "prepared_query"
destination_namespace = "9nakw0td"
destination_name = "placeholder"
local_bind_socket_path = "/foo/bar/upstream" local_bind_socket_path = "/foo/bar/upstream"
local_bind_socket_mode = "0600" local_bind_socket_mode = "0600"
}, },

10
agent/config/testdata/full-config.json vendored
View File

@ -358,7 +358,6 @@
"address": "cOlSOhbp", "address": "cOlSOhbp",
"token": "msy7iWER", "token": "msy7iWER",
"port": 24237, "port": 24237,
"socket_path": "/tmp/rc78ap",
"weights": { "weights": {
"passing": 100, "passing": 100,
"warning": 1 "warning": 1
@ -453,7 +452,6 @@
"address": "9RhqPSPB", "address": "9RhqPSPB",
"token": "myjKJkWH", "token": "myjKJkWH",
"port": 72219, "port": 72219,
"socket_path":"/foo/bar/sock_7IszXMQ1",
"enable_tag_override": true, "enable_tag_override": true,
"check": { "check": {
"id": "qmfeO5if", "id": "qmfeO5if",
@ -563,7 +561,6 @@
"destination_service_name": "6L6BVfgH", "destination_service_name": "6L6BVfgH",
"local_service_address": "127.0.0.2", "local_service_address": "127.0.0.2",
"local_service_port": 23759, "local_service_port": 23759,
"local_service_socket_path": "/foo/bar/local",
"expose": { "expose": {
"checks": true, "checks": true,
"paths": [ "paths": [
@ -592,7 +589,12 @@
"destination_namespace": "9nakw0td", "destination_namespace": "9nakw0td",
"destination_type": "prepared_query", "destination_type": "prepared_query",
"local_bind_address": "127.24.88.0", "local_bind_address": "127.24.88.0",
"local_bind_port": 11884, "local_bind_port": 11884
},
{
"destination_name": "placeholder",
"destination_namespace": "9nakw0td",
"destination_type": "prepared_query",
"local_bind_socket_path": "/foo/bar/upstream", "local_bind_socket_path": "/foo/bar/upstream",
"local_bind_socket_mode": "0600" "local_bind_socket_mode": "0600"
} }