status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Register the multicluster types for the catalogtest integration tests (#20516) 

In particular the failover controller needs these in Consul Enterprise
This commit is contained in:
Matt Keeler 2024-02-07 13:35:02 -05:00 committed by GitHub
parent ab8f23478a
commit 3ca4f39fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/catalog/catalogtest/run_test.go
View File

@ -8,6 +8,7 @@ import (
"github.com/hashicorp/consul/internal/catalog" "github.com/hashicorp/consul/internal/catalog"
"github.com/hashicorp/consul/internal/controller/controllertest" "github.com/hashicorp/consul/internal/controller/controllertest"
"github.com/hashicorp/consul/internal/multicluster"
"github.com/hashicorp/consul/internal/resource/reaper" "github.com/hashicorp/consul/internal/resource/reaper"
rtest "github.com/hashicorp/consul/internal/resource/resourcetest" rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
"github.com/hashicorp/consul/proto-public/pbresource" "github.com/hashicorp/consul/proto-public/pbresource"
@ -21,7 +22,7 @@ func runInMemResourceServiceAndControllers(t *testing.T) pbresource.ResourceServ
t.Helper() t.Helper()
return controllertest.NewControllerTestBuilder(). return controllertest.NewControllerTestBuilder().
WithResourceRegisterFns(catalog.RegisterTypes). WithResourceRegisterFns(catalog.RegisterTypes, multicluster.RegisterTypes).
WithControllerRegisterFns( WithControllerRegisterFns(
reaper.RegisterControllers, reaper.RegisterControllers,
catalog.RegisterControllers, catalog.RegisterControllers,