From 2da7dd077ad5825607b67a3421368b3dd1a7bdd6 Mon Sep 17 00:00:00 2001
From: Semir Patel <semir.patel@hashicorp.com>
Date: Tue, 7 Nov 2023 08:06:10 -0600
Subject: [PATCH] v2tenancy: register tenancy controller deps (#19531)

---
 agent/consul/server.go                               |  5 ++++-
 internal/controller/manager.go                       |  3 +--
 internal/resource/resourcetest/client.go             | 11 +++++++++++
 internal/tenancy/exports.go                          |  6 ++++--
 internal/tenancy/internal/controllers/register.go    | 12 ++++++++++++
 internal/tenancy/internal/controllers/register_ce.go |  2 +-
 6 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 internal/tenancy/internal/controllers/register.go

diff --git a/agent/consul/server.go b/agent/consul/server.go
index 0dfe48b4bf..7986725b80 100644
--- a/agent/consul/server.go
+++ b/agent/consul/server.go
@@ -937,7 +937,10 @@ func isV1CatalogRequest(rpcName string) bool {
 func (s *Server) registerControllers(deps Deps, proxyUpdater ProxyUpdater) error {
 	// When not enabled, the v1 tenancy bridge is used by default.
 	if s.useV2Tenancy {
-		tenancy.RegisterControllers(s.controllerManager)
+		tenancy.RegisterControllers(
+			s.controllerManager,
+			tenancy.Dependencies{Registry: deps.Registry},
+		)
 	}
 
 	if s.useV2Resources {
diff --git a/internal/controller/manager.go b/internal/controller/manager.go
index 1e7e910210..2e46b21400 100644
--- a/internal/controller/manager.go
+++ b/internal/controller/manager.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 
-	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
@@ -68,7 +67,7 @@ func (m *Manager) Run(ctx context.Context) {
 	for _, desc := range m.controllers {
 		logger := desc.logger
 		if logger == nil {
-			logger = m.logger.With("managed_type", resource.ToGVK(desc.managedType))
+			logger = m.logger.With("managed_type", desc.managedType.Kind)
 		}
 
 		runner := &controllerRunner{
diff --git a/internal/resource/resourcetest/client.go b/internal/resource/resourcetest/client.go
index 8983a858ac..94bcd60426 100644
--- a/internal/resource/resourcetest/client.go
+++ b/internal/resource/resourcetest/client.go
@@ -231,6 +231,17 @@ func (client *Client) WaitForStatusCondition(t T, id *pbresource.ID, statusKey s
 	return res
 }
 
+func (client *Client) WaitForStatusConditionAnyGen(t T, id *pbresource.ID, statusKey string, condition *pbresource.Condition) *pbresource.Resource {
+	t.Helper()
+
+	var res *pbresource.Resource
+	client.retry(t, func(r *retry.R) {
+		res = client.RequireStatusCondition(r, id, statusKey, condition)
+	})
+
+	return res
+}
+
 func (client *Client) WaitForStatusConditions(t T, id *pbresource.ID, statusKey string, conditions ...*pbresource.Condition) *pbresource.Resource {
 	t.Helper()
 
diff --git a/internal/tenancy/exports.go b/internal/tenancy/exports.go
index 806e85b7b0..18340ce039 100644
--- a/internal/tenancy/exports.go
+++ b/internal/tenancy/exports.go
@@ -23,10 +23,12 @@ func RegisterTypes(r resource.Registry) {
 
 // RegisterControllers registers controllers for the tenancy types with
 // the given controller manager.
-func RegisterControllers(mgr *controller.Manager) {
-	controllers.Register(mgr)
+func RegisterControllers(mgr *controller.Manager, deps Dependencies) {
+	controllers.Register(mgr, deps)
 }
 
 func NewV2TenancyBridge() *V2TenancyBridge {
 	return bridge.NewV2TenancyBridge()
 }
+
+type Dependencies = controllers.Dependencies
diff --git a/internal/tenancy/internal/controllers/register.go b/internal/tenancy/internal/controllers/register.go
new file mode 100644
index 0000000000..94b4255bae
--- /dev/null
+++ b/internal/tenancy/internal/controllers/register.go
@@ -0,0 +1,12 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package controllers
+
+import (
+	"github.com/hashicorp/consul/internal/resource"
+)
+
+type Dependencies struct {
+	Registry resource.Registry
+}
diff --git a/internal/tenancy/internal/controllers/register_ce.go b/internal/tenancy/internal/controllers/register_ce.go
index 324f1bcfc0..a1623e5e95 100644
--- a/internal/tenancy/internal/controllers/register_ce.go
+++ b/internal/tenancy/internal/controllers/register_ce.go
@@ -9,6 +9,6 @@ import (
 	"github.com/hashicorp/consul/internal/controller"
 )
 
-func Register(mgr *controller.Manager) {
+func Register(mgr *controller.Manager, deps Dependencies) {
 	//mgr.Register(namespace.NamespaceController())
 }