From 3ca4f39fa1789be794294d7db83f9d3a84d25338 Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Wed, 7 Feb 2024 13:35:02 -0500 Subject: [PATCH] Register the multicluster types for the catalogtest integration tests (#20516) In particular the failover controller needs these in Consul Enterprise --- internal/catalog/catalogtest/run_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/catalog/catalogtest/run_test.go b/internal/catalog/catalogtest/run_test.go index e2a4718aa0..cc7f0e4afa 100644 --- a/internal/catalog/catalogtest/run_test.go +++ b/internal/catalog/catalogtest/run_test.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/consul/internal/catalog" "github.com/hashicorp/consul/internal/controller/controllertest" + "github.com/hashicorp/consul/internal/multicluster" "github.com/hashicorp/consul/internal/resource/reaper" rtest "github.com/hashicorp/consul/internal/resource/resourcetest" "github.com/hashicorp/consul/proto-public/pbresource" @@ -21,7 +22,7 @@ func runInMemResourceServiceAndControllers(t *testing.T) pbresource.ResourceServ t.Helper() return controllertest.NewControllerTestBuilder(). - WithResourceRegisterFns(catalog.RegisterTypes). + WithResourceRegisterFns(catalog.RegisterTypes, multicluster.RegisterTypes). WithControllerRegisterFns( reaper.RegisterControllers, catalog.RegisterControllers,