File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -5605,6 +5605,7 @@ func TestFullConfig(t *testing.T) {
5605
5605
"upstreams": [
5606
5606
{
5607
5607
"destination_name": "KPtAj2cb",
5608
+ "destination_namespace": "` + defaultEntMeta .NamespaceOrEmpty () + `",
5608
5609
"local_bind_port": 4051,
5609
5610
"config": {
5610
5611
"kzRnZOyd": "nUNKoL8H"
@@ -6287,6 +6288,7 @@ func TestFullConfig(t *testing.T) {
6287
6288
upstreams = [
6288
6289
{
6289
6290
destination_name = "KPtAj2cb"
6291
+ destination_namespace = "` + defaultEntMeta .NamespaceOrEmpty () + `"
6290
6292
local_bind_port = 4051
6291
6293
config {
6292
6294
kzRnZOyd = "nUNKoL8H"
@@ -6296,6 +6298,7 @@ func TestFullConfig(t *testing.T) {
6296
6298
destination_type = "prepared_query"
6297
6299
destination_namespace = "9nakw0td"
6298
6300
destination_name = "KSd8HsRl"
6301
+ destination_namespace = "9nakw0td"
6299
6302
local_bind_port = 11884
6300
6303
local_bind_address = "127.24.88.0"
6301
6304
},
Original file line number Diff line number Diff line change @@ -542,6 +542,7 @@ func TestServiceManager_PersistService_ConfigFiles(t *testing.T) {
542
542
543
543
// Now register a sidecar proxy via the API.
544
544
svcID := "web-sidecar-proxy"
545
+ defaultMeta := structs .DefaultEnterpriseMeta ()
545
546
546
547
expectState := & structs.NodeService {
547
548
Kind : structs .ServiceKindConnectProxy ,
@@ -560,9 +561,10 @@ func TestServiceManager_PersistService_ConfigFiles(t *testing.T) {
560
561
},
561
562
Upstreams : structs.Upstreams {
562
563
{
563
- DestinationType : "service" ,
564
- DestinationName : "redis" ,
565
- LocalBindPort : 5000 ,
564
+ DestinationType : "service" ,
565
+ DestinationName : "redis" ,
566
+ DestinationNamespace : defaultMeta .NamespaceOrEmpty (),
567
+ LocalBindPort : 5000 ,
566
568
Config : map [string ]interface {}{
567
569
"protocol" : "tcp" ,
568
570
},
@@ -573,7 +575,7 @@ func TestServiceManager_PersistService_ConfigFiles(t *testing.T) {
573
575
Passing : 1 ,
574
576
Warning : 1 ,
575
577
},
576
- EnterpriseMeta : * structs . DefaultEnterpriseMeta () ,
578
+ EnterpriseMeta : * defaultMeta ,
577
579
}
578
580
579
581
// Now wait until we've re-registered using central config updated data.
You can’t perform that action at this time.
0 commit comments