`diff pkg/reconciler/{pubsub,intevents}` for https://github.com/google/knative-gcp/pull/1013

gistfile1.diff

# diff pkg/reconciler/{pubsub,intevents}
diff pkg/reconciler/pubsub/controller.go pkg/reconciler/intevents/controller.go
17c17
< package pubsub
---
> package intevents
diff pkg/reconciler/pubsub/controller_test.go pkg/reconciler/intevents/controller_test.go
17c17
< package pubsub
---
> package intevents
Common subdirectories: pkg/reconciler/pubsub/pullsubscription and pkg/reconciler/intevents/pullsubscription
diff pkg/reconciler/pubsub/reconciler.go pkg/reconciler/intevents/reconciler.go
17c17
< package pubsub
---
> package intevents
24c24
< 	pubsubv1alpha1 "github.com/google/knative-gcp/pkg/apis/pubsub/v1alpha1"
---
> 	inteventsv1alpha1 "github.com/google/knative-gcp/pkg/apis/intevents/v1alpha1"
28c28
< 	"github.com/google/knative-gcp/pkg/reconciler/pubsub/resources"
---
> 	"github.com/google/knative-gcp/pkg/reconciler/intevents/resources"
63c63
< func (psb *PubSubBase) ReconcilePubSub(ctx context.Context, pubsubable duck.PubSubable, topic, resourceGroup string) (*pubsubv1alpha1.Topic, *pubsubv1alpha1.PullSubscription, error) {
---
> func (psb *PubSubBase) ReconcilePubSub(ctx context.Context, pubsubable duck.PubSubable, topic, resourceGroup string) (*inteventsv1alpha1.Topic, *inteventsv1alpha1.PullSubscription, error) {
72c72
< 	topics := psb.pubsubClient.PubsubV1alpha1().Topics(namespace)
---
> 	topics := psb.pubsubClient.InternalV1alpha1().Topics(namespace)
109c109
< func (psb *PubSubBase) ReconcilePullSubscription(ctx context.Context, pubsubable duck.PubSubable, topic, resourceGroup string, isPushCompatible bool) (*pubsubv1alpha1.PullSubscription, pkgreconciler.Event) {
---
> func (psb *PubSubBase) ReconcilePullSubscription(ctx context.Context, pubsubable duck.PubSubable, topic, resourceGroup string, isPushCompatible bool) (*inteventsv1alpha1.PullSubscription, pkgreconciler.Event) {
122c122
< 	pullSubscriptions := psb.pubsubClient.PubsubV1alpha1().PullSubscriptions(namespace)
---
> 	pullSubscriptions := psb.pubsubClient.InternalV1alpha1().PullSubscriptions(namespace)
140c140
< 			args.Mode = pubsubv1alpha1.ModePushCompatible
---
> 			args.Mode = inteventsv1alpha1.ModePushCompatible
161c161
< func propagatePullSubscriptionStatus(ps *pubsubv1alpha1.PullSubscription, status *duckv1alpha1.PubSubStatus, cs *apis.ConditionSet) error {
---
> func propagatePullSubscriptionStatus(ps *inteventsv1alpha1.PullSubscription, status *duckv1alpha1.PubSubStatus, cs *apis.ConditionSet) error {
183c183
< func propagateTopicStatus(t *pubsubv1alpha1.Topic, status *duckv1alpha1.PubSubStatus, cs *apis.ConditionSet, topic string) error {
---
> func propagateTopicStatus(t *inteventsv1alpha1.Topic, status *duckv1alpha1.PubSubStatus, cs *apis.ConditionSet, topic string) error {
232c232
< 	err := psb.pubsubClient.PubsubV1alpha1().Topics(namespace).Delete(name, nil)
---
> 	err := psb.pubsubClient.InternalV1alpha1().Topics(namespace).Delete(name, nil)
243c243
< 	err = psb.pubsubClient.PubsubV1alpha1().PullSubscriptions(namespace).Delete(name, nil)
---
> 	err = psb.pubsubClient.InternalV1alpha1().PullSubscriptions(namespace).Delete(name, nil)
diff pkg/reconciler/pubsub/reconciler_test.go pkg/reconciler/intevents/reconciler_test.go
17c17
< package pubsub
---
> package intevents
36c36
< 	pubsubsourcev1alpha1 "github.com/google/knative-gcp/pkg/apis/pubsub/v1alpha1"
---
> 	inteventsv1alpha1 "github.com/google/knative-gcp/pkg/apis/intevents/v1alpha1"
87,88c87,88
< 		expectedTopic *pubsubsourcev1alpha1.Topic
< 		expectedPS    *pubsubsourcev1alpha1.PullSubscription
---
> 		expectedTopic *inteventsv1alpha1.Topic
> 		expectedPS    *inteventsv1alpha1.PullSubscription
93,94c93,94
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
99c99
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
103c103
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
108,109c108,109
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
113c113
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
117c117
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
123,124c123,124
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
128c128
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
132c132
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
135,136c135,136
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
141c141
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
145c145
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
152,153c152,153
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
157c157
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
161,163c161,163
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicReady(testTopicID),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicReady(testTopicID),
> 				rectesting.WithTopicAddress(testTopicURI),
166,167c166,167
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
172c172
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
176,179c176,179
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(testTopicID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(testTopicID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
186,187c186,187
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
191c191
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
195,197c195,197
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicFailed(),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicFailed(),
200,201c200,201
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
206c206
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
210,213c210,213
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicFailed(),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicFailed(),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
220,221c220,221
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
225c225
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
229,231c229,231
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicUnknown(),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicUnknown(),
234,235c234,235
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
240c240
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
244,247c244,247
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicUnknown(),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicUnknown(),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
254,255c254,255
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
259c259
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
263,266c263,266
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicReady(""),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicReady(""),
> 				rectesting.WithTopicAddress(testTopicURI),
269,270c269,270
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
275c275
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
279,283c279,283
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(""),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(""),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
290,291c290,291
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
295c295
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
299,302c299,302
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicReady(testTopicID),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicReady(testTopicID),
> 				rectesting.WithTopicAddress(testTopicURI),
305,306c305,306
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
311c311
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
315,319c315,319
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(testTopicID),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(testTopicID),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
321,322c321,322
< 		expectedPS: rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 			rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 		expectedPS: rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 			rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
328c328
< 			rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 			rectesting.WithPullSubscriptionLabels(map[string]string{
332c332
< 			rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 			rectesting.WithPullSubscriptionAnnotations(map[string]string{
335c335
< 			rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
339,340c339,340
< 			rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 				rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 			rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 				rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
346c346
< 				rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 				rectesting.WithPullSubscriptionLabels(map[string]string{
350c350
< 				rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 				rectesting.WithPullSubscriptionAnnotations(map[string]string{
353c353
< 				rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 				rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
359,360c359,360
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
364c364
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
368,371c368,371
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicReady(testTopicID),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicReady(testTopicID),
> 				rectesting.WithTopicAddress(testTopicURI),
373,374c373,374
< 			rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 				rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 			rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 				rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
380c380
< 				rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 				rectesting.WithPullSubscriptionLabels(map[string]string{
384c384
< 				rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 				rectesting.WithPullSubscriptionAnnotations(map[string]string{
387c387
< 				rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 				rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
390,391c390,391
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
396c396
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
400,404c400,404
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(testTopicID),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(testTopicID),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
406,407c406,407
< 		expectedPS: rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 			rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 		expectedPS: rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 			rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
413c413
< 			rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 			rectesting.WithPullSubscriptionLabels(map[string]string{
417c417
< 			rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 			rectesting.WithPullSubscriptionAnnotations(map[string]string{
420c420
< 			rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
426,427c426,427
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
431c431
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
435,438c435,438
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicReady(testTopicID),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicReady(testTopicID),
> 				rectesting.WithTopicAddress(testTopicURI),
440,441c440,441
< 			rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 				rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 			rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 				rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
447c447
< 				rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 				rectesting.WithPullSubscriptionLabels(map[string]string{
451c451
< 				rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 				rectesting.WithPullSubscriptionAnnotations(map[string]string{
454,455c454,455
< 				rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubPullSubscriptionFailed(),
---
> 				rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithPullSubscriptionFailed(),
458,459c458,459
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
464c464
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
468,472c468,472
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(testTopicID),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(testTopicID),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
474,475c474,475
< 		expectedPS: rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 			rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 		expectedPS: rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 			rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
481c481
< 			rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 			rectesting.WithPullSubscriptionLabels(map[string]string{
485c485
< 			rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 			rectesting.WithPullSubscriptionAnnotations(map[string]string{
488,489c488,489
< 			rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubPullSubscriptionFailed(),
---
> 			rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithPullSubscriptionFailed(),
495,496c495,496
< 			rectesting.NewPubSubTopic(name, testNS,
< 				rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 			rectesting.NewTopic(name, testNS,
> 				rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
500c500
< 				rectesting.WithPubSubTopicLabels(map[string]string{
---
> 				rectesting.WithTopicLabels(map[string]string{
504,507c504,507
< 				rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubTopicProjectID(testProjectID),
< 				rectesting.WithPubSubTopicReady(testTopicID),
< 				rectesting.WithPubSubTopicAddress(testTopicURI),
---
> 				rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithTopicProjectID(testProjectID),
> 				rectesting.WithTopicReady(testTopicID),
> 				rectesting.WithTopicAddress(testTopicURI),
509,510c509,510
< 			rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 				rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 			rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 				rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
516c516
< 				rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 				rectesting.WithPullSubscriptionLabels(map[string]string{
520c520
< 				rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 				rectesting.WithPullSubscriptionAnnotations(map[string]string{
523,524c523,524
< 				rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 				rectesting.WithPubSubPullSubscriptionUnknown(),
---
> 				rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 				rectesting.WithPullSubscriptionUnknown(),
527,528c527,528
< 		expectedTopic: rectesting.NewPubSubTopic(name, testNS,
< 			rectesting.WithPubSubTopicSpec(pubsubsourcev1alpha1.TopicSpec{
---
> 		expectedTopic: rectesting.NewTopic(name, testNS,
> 			rectesting.WithTopicSpec(inteventsv1alpha1.TopicSpec{
533c533
< 			rectesting.WithPubSubTopicLabels(map[string]string{
---
> 			rectesting.WithTopicLabels(map[string]string{
537,541c537,541
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubTopicReady(testTopicID),
< 			rectesting.WithPubSubTopicProjectID(testProjectID),
< 			rectesting.WithPubSubTopicAddress(testTopicURI),
< 			rectesting.WithPubSubTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
---
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithTopicReady(testTopicID),
> 			rectesting.WithTopicProjectID(testProjectID),
> 			rectesting.WithTopicAddress(testTopicURI),
> 			rectesting.WithTopicOwnerReferences([]metav1.OwnerReference{ownerRef()}),
543,544c543,544
< 		expectedPS: rectesting.NewPubSubPullSubscriptionWithNoDefaults(name, testNS,
< 			rectesting.WithPubSubPullSubscriptionSpecWithNoDefaults(pubsubsourcev1alpha1.PullSubscriptionSpec{
---
> 		expectedPS: rectesting.NewPullSubscriptionWithNoDefaults(name, testNS,
> 			rectesting.WithPullSubscriptionSpecWithNoDefaults(inteventsv1alpha1.PullSubscriptionSpec{
550c550
< 			rectesting.WithPubSubPullSubscriptionLabels(map[string]string{
---
> 			rectesting.WithPullSubscriptionLabels(map[string]string{
554c554
< 			rectesting.WithPubSubPullSubscriptionAnnotations(map[string]string{
---
> 			rectesting.WithPullSubscriptionAnnotations(map[string]string{
557,558c557,558
< 			rectesting.WithPubSubPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
< 			rectesting.WithPubSubPullSubscriptionUnknown(),
---
> 			rectesting.WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
> 			rectesting.WithPullSubscriptionUnknown(),
627c627
< 					Resource:  schema.GroupVersionResource{Group: "pubsub.cloud.google.com", Version: "v1alpha1", Resource: "topics"},
---
> 					Resource:  schema.GroupVersionResource{Group: "internal.events.cloud.google.com", Version: "v1alpha1", Resource: "topics"},
634c634
< 					Resource:  schema.GroupVersionResource{Group: "pubsub.cloud.google.com", Version: "v1alpha1", Resource: "pullsubscriptions"},
---
> 					Resource:  schema.GroupVersionResource{Group: "internal.events.cloud.google.com", Version: "v1alpha1", Resource: "pullsubscriptions"},
Common subdirectories: pkg/reconciler/pubsub/resources and pkg/reconciler/intevents/resources
Common subdirectories: pkg/reconciler/pubsub/topic and pkg/reconciler/intevents/topic