Use wiregen for brokercell and deployment controller

cmd/controller/main.go

@@ -65,6 +65,8 @@ func Controllers(
 	channelController channel.Constructor,
 	triggerController trigger.Constructor,
 	brokerController broker.Constructor,
+	deploymentController deployment.Constructor,
+	brokercellController brokercell.Constructor,
 ) []injection.ControllerConstructor {
 	return []injection.ControllerConstructor{
 		injection.ControllerConstructor(auditlogsController),
@@ -78,8 +80,8 @@ func Controllers(
 		injection.ControllerConstructor(channelController),
 		injection.ControllerConstructor(triggerController),
 		injection.ControllerConstructor(brokerController),
-		deployment.NewController,
-		brokercell.NewController,
+		injection.ControllerConstructor(deploymentController),
+		injection.ControllerConstructor(brokercellController),
 	}
 }
 

cmd/controller/wire.go

@@ -21,6 +21,8 @@ import (
 	"github.com/google/knative-gcp/pkg/apis/configs/dataresidency"
 	"github.com/google/knative-gcp/pkg/apis/configs/gcpauth"
 	"github.com/google/knative-gcp/pkg/reconciler/broker"
+	"github.com/google/knative-gcp/pkg/reconciler/brokercell"
+	"github.com/google/knative-gcp/pkg/reconciler/deployment"
 	"github.com/google/knative-gcp/pkg/reconciler/events/auditlogs"
 	"github.com/google/knative-gcp/pkg/reconciler/events/build"
 	"github.com/google/knative-gcp/pkg/reconciler/events/pubsub"
@@ -54,5 +56,7 @@ func InitializeControllers(ctx context.Context) ([]injection.ControllerConstruct
 		channel.NewConstructor,
 		trigger.NewConstructor,
 		broker.NewConstructor,
+		deployment.NewConstructor,
+		brokercell.NewConstructor,
 	))
 }

pkg/reconciler/broker/controller.go

@@ -52,7 +52,7 @@ const (
 
 type Constructor injection.ControllerConstructor
 
-// NewConstructor creates a constructor to make a Topic controller.
+// NewConstructor creates a constructor to make a Broker controller.
 func NewConstructor(dataresidencyss *dataresidency.StoreSingleton) Constructor {
 	return func(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
 		return newController(ctx, cmw, dataresidencyss.Store(ctx, cmw))

pkg/reconciler/broker/controller_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/google/knative-gcp/pkg/apis/configs/dataresidency"
+	reconcilertesting "github.com/google/knative-gcp/pkg/reconciler/testing"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,7 +39,7 @@ import (
 func TestNew(t *testing.T) {
 	ctx, _ := SetupFakeContext(t)
 
-	c := NewController(ctx, configmap.NewStaticWatcher(
+	c := newController(ctx, configmap.NewStaticWatcher(
 		&corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      logging.ConfigMapName(),
@@ -67,7 +68,7 @@ func TestNew(t *testing.T) {
 			},
 			Data: map[string]string{},
 		},
-	))
+	), reconcilertesting.NewDataresidencyTestStore(t, nil))
 
 	if c == nil {
 		t.Fatal("Expected NewController to return a non-nil value")

pkg/reconciler/deployment/controller.go

@@ -26,6 +26,7 @@ import (
 	"knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
+	"knative.dev/pkg/injection"
 
 	"github.com/google/knative-gcp/pkg/apis/duck"
 	"github.com/google/knative-gcp/pkg/reconciler"
@@ -45,6 +46,15 @@ const (
 	envKey         = "GOOGLE_APPLICATION_CREDENTIALS"
 )
 
+type Constructor injection.ControllerConstructor
+
+// NewConstructor creates a constructor to make a Deployment controller.
+func NewConstructor() Constructor {
+	return func(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
+		return NewController(ctx, cmw)
+	}
+}
+
 // NewController initializes the controller and is called by the generated code
 // Registers event handlers to enqueue events.
 // When the secret `google-cloud-key` of namespace `cloud-run-events` gets updated, we will enqueue the deployment `controller` of namespace `cloud-run-events`.

pkg/reconciler/trigger/controller.go

@@ -65,7 +65,7 @@ type envConfig struct {
 
 type Constructor injection.ControllerConstructor
 
-// NewConstructor creates a constructor to make a Topic controller.
+// NewConstructor creates a constructor to make a Trigger controller.
 func NewConstructor(dataresidencyss *dataresidency.StoreSingleton) Constructor {
 	return func(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
 		return newController(ctx, cmw, dataresidencyss.Store(ctx, cmw))

pkg/reconciler/trigger/controller_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/google/knative-gcp/pkg/apis/configs/dataresidency"
 	_ "github.com/google/knative-gcp/pkg/client/injection/informers/broker/v1beta1/broker/fake"
 	_ "github.com/google/knative-gcp/pkg/client/injection/informers/broker/v1beta1/trigger/fake"
+	reconcilertesting "github.com/google/knative-gcp/pkg/reconciler/testing"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/conditions/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake"
@@ -44,7 +45,7 @@ import (
 func TestNew(t *testing.T) {
 	ctx, _ := SetupFakeContext(t)
 
-	c := NewController(ctx, configmap.NewStaticWatcher(
+	c := newController(ctx, configmap.NewStaticWatcher(
 		&corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      logging.ConfigMapName(),
@@ -73,7 +74,7 @@ func TestNew(t *testing.T) {
 			},
 			Data: map[string]string{},
 		},
-	))
+	), reconcilertesting.NewDataresidencyTestStore(t, nil))
 
 	if c == nil {
 		t.Fatal("Expected NewController to return a non-nil value")