Update default credential and rename method

pkg/apis/duck/v1alpha1/pubsub_defaults.go

@@ -33,10 +33,9 @@ func (s *PubSubSpec) SetPubSubDefaults(ctx context.Context) {
 		logging.FromContext(ctx).Error("Failed to get the GCPAuthDefaults")
 		return
 	}
-	if s.ServiceAccountName == "" {
+	if s.ServiceAccountName == "" &&
+		(s.Secret == nil || equality.Semantic.DeepEqual(s.Secret, &corev1.SecretKeySelector{})) {
 		s.ServiceAccountName = ad.KSA(apis.ParentMeta(ctx).Namespace)
-	}
-	if s.Secret == nil || equality.Semantic.DeepEqual(s.Secret, &corev1.SecretKeySelector{}) {
 		s.Secret = ad.Secret(apis.ParentMeta(ctx).Namespace)
 	}
 }

pkg/apis/duck/v1alpha1/pubsub_defaults_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"context"
 	"testing"
 
 	gcpauthtesthelper "github.com/google/knative-gcp/pkg/apis/configs/gcpauth/testhelper"
@@ -29,6 +30,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 	testCases := map[string]struct {
 		orig     *PubSubSpec
 		expected *PubSubSpec
+		ctx      context.Context
 	}{
 		"missing defaults": {
 			orig: &PubSubSpec{},
@@ -40,6 +42,12 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
+		},
+		"missing default GCP Auth ctx": {
+			orig:     &PubSubSpec{},
+			expected: &PubSubSpec{},
+			ctx:      context.Background(),
 		},
 		"empty defaults": {
 			orig: &PubSubSpec{
@@ -53,6 +61,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists same key": {
 			orig: &PubSubSpec{
@@ -71,6 +80,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists same name": {
 			orig: &PubSubSpec{
@@ -89,6 +99,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "different-key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists all different": {
 			orig: &PubSubSpec{
@@ -107,11 +118,12 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "different-key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 	}
 	for n, tc := range testCases {
 		t.Run(n, func(t *testing.T) {
-			tc.orig.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
+			tc.orig.SetPubSubDefaults(tc.ctx)
 			if diff := cmp.Diff(tc.expected, tc.orig); diff != "" {
 				t.Errorf("Unexpected differences (-want +got): %v", diff)
 			}

pkg/apis/duck/v1beta1/pubsub_defaults.go

@@ -33,10 +33,9 @@ func (s *PubSubSpec) SetPubSubDefaults(ctx context.Context) {
 		logging.FromContext(ctx).Error("Failed to get the GCPAuthDefaults")
 		return
 	}
-	if s.ServiceAccountName == "" {
+	if s.ServiceAccountName == "" &&
+		(s.Secret == nil || equality.Semantic.DeepEqual(s.Secret, &corev1.SecretKeySelector{})) {
 		s.ServiceAccountName = ad.KSA(apis.ParentMeta(ctx).Namespace)
-	}
-	if s.Secret == nil || equality.Semantic.DeepEqual(s.Secret, &corev1.SecretKeySelector{}) {
 		s.Secret = ad.Secret(apis.ParentMeta(ctx).Namespace)
 	}
 }

pkg/apis/duck/v1beta1/pubsub_defaults_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
 	"testing"
 
 	gcpauthtesthelper "github.com/google/knative-gcp/pkg/apis/configs/gcpauth/testhelper"
@@ -29,6 +30,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 	testCases := map[string]struct {
 		orig     *PubSubSpec
 		expected *PubSubSpec
+		ctx      context.Context
 	}{
 		"missing defaults": {
 			orig: &PubSubSpec{},
@@ -40,6 +42,12 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
+		},
+		"missing default GCP Auth ctx": {
+			orig:     &PubSubSpec{},
+			expected: &PubSubSpec{},
+			ctx:      context.Background(),
 		},
 		"empty defaults": {
 			orig: &PubSubSpec{
@@ -53,6 +61,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists same key": {
 			orig: &PubSubSpec{
@@ -71,6 +80,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists same name": {
 			orig: &PubSubSpec{
@@ -89,6 +99,7 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "different-key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 		"secret exists all different": {
 			orig: &PubSubSpec{
@@ -107,11 +118,12 @@ func TestPubSubSpec_SetPubSubDefaults(t *testing.T) {
 					Key: "different-key.json",
 				},
 			},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
 	}
 	for n, tc := range testCases {
 		t.Run(n, func(t *testing.T) {
-			tc.orig.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
+			tc.orig.SetPubSubDefaults(tc.ctx)
 			if diff := cmp.Diff(tc.expected, tc.orig); diff != "" {
 				t.Errorf("Unexpected differences (-want +got): %v", diff)
 			}

pkg/reconciler/events/auditlogs/auditlogs_test.go

@@ -414,7 +414,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudAuditLogsSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudAuditLogsSourceDefaultAuthorization(),
+				WithCloudAuditLogsSourceDefaultGCPAuth(),
 			),
 			NewTopic(sourceName, testNS,
 				WithTopicSpec(inteventsv1alpha1.TopicSpec{
@@ -424,7 +424,7 @@ func TestAllCases(t *testing.T) {
 				WithTopicReady(testTopicID),
 				WithTopicAddress(testTopicURI),
 				WithTopicProjectID(testProject),
-				WithTopicDefaultAuthorization(),
+				WithTopicDefaultGCPAuth(),
 			),
 		},
 		Key: testNS + "/" + sourceName,
@@ -439,7 +439,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudAuditLogsSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudAuditLogsSourceDefaultAuthorization(),
+				WithCloudAuditLogsSourceDefaultGCPAuth(),
 				WithCloudAuditLogsSourcePullSubscriptionUnknown("PullSubscriptionNotConfigured", failedToReconcilePullSubscriptionMsg),
 			),
 		}},
@@ -462,7 +462,7 @@ func TestAllCases(t *testing.T) {
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
 				WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{sourceOwnerRef(sourceName, sourceUID)}),
-				WithPullSubscriptionDefaultAuthorization(),
+				WithPullSubscriptionDefaultGCPAuth(),
 			),
 		},
 		WantPatches: []clientgotesting.PatchActionImpl{

pkg/reconciler/events/build/build_test.go

@@ -166,7 +166,7 @@ func TestAllCases(t *testing.T) {
 					WithCloudBuildSourceAnnotations(map[string]string{
 						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 					}),
-					WithCloudBuildSourceDefaultAuthorization(),
+					WithCloudBuildSourceDefaultGCPAuth(),
 				),
 				newSink(),
 			},
@@ -182,7 +182,7 @@ func TestAllCases(t *testing.T) {
 					WithCloudBuildSourceAnnotations(map[string]string{
 						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 					}),
-					WithCloudBuildSourceDefaultAuthorization(),
+					WithCloudBuildSourceDefaultGCPAuth(),
 					WithCloudBuildSourcePullSubscriptionUnknown("PullSubscriptionNotConfigured", "PullSubscription has not yet been reconciled"),
 				),
 			}},
@@ -207,7 +207,7 @@ func TestAllCases(t *testing.T) {
 						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 					}),
 					WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
-					WithPullSubscriptionDefaultAuthorization(),
+					WithPullSubscriptionDefaultGCPAuth(),
 				),
 			},
 			WantPatches: []clientgotesting.PatchActionImpl{

pkg/reconciler/events/pubsub/pubsub_test.go

@@ -164,7 +164,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudPubSubSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudPubSubSourceDefaultAuthorization(),
+				WithCloudPubSubSourceDefaultGCPAuth(),
 			),
 			newSink(),
 		},
@@ -180,7 +180,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudPubSubSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudPubSubSourceDefaultAuthorization(),
+				WithCloudPubSubSourceDefaultGCPAuth(),
 				WithCloudPubSubSourcePullSubscriptionUnknown("PullSubscriptionNotConfigured", "PullSubscription has not yet been reconciled"),
 			),
 		}},
@@ -203,7 +203,7 @@ func TestAllCases(t *testing.T) {
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
 				WithPullSubscriptionOwnerReferences([]metav1.OwnerReference{ownerRef()}),
-				WithPullSubscriptionDefaultAuthorization(),
+				WithPullSubscriptionDefaultGCPAuth(),
 			),
 		},
 		WantPatches: []clientgotesting.PatchActionImpl{

pkg/reconciler/events/scheduler/scheduler_test.go

@@ -454,7 +454,7 @@ func TestAllCases(t *testing.T) {
 					WithCloudSchedulerSourceAnnotations(map[string]string{
 						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 					}),
-					WithCloudSchedulerSourceDefaultAuthorization(),
+					WithCloudSchedulerSourceDefaultGCPAuth(),
 				),
 				NewTopic(schedulerName, testNS,
 					WithTopicSpec(inteventsv1alpha1.TopicSpec{
@@ -464,7 +464,7 @@ func TestAllCases(t *testing.T) {
 					WithTopicReady(testTopicID),
 					WithTopicAddress(testTopicURI),
 					WithTopicProjectID(testProject),
-					WithTopicDefaultAuthorization(),
+					WithTopicDefaultGCPAuth(),
 				),
 				newSink(),
 			},
@@ -480,7 +480,7 @@ func TestAllCases(t *testing.T) {
 					WithCloudSchedulerSourceAnnotations(map[string]string{
 						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 					}),
-					WithCloudSchedulerSourceDefaultAuthorization(),
+					WithCloudSchedulerSourceDefaultGCPAuth(),
 					WithCloudSchedulerSourcePullSubscriptionUnknown("PullSubscriptionNotConfigured", failedToReconcilePullSubscriptionMsg),
 				),
 			}},

pkg/reconciler/events/storage/storage_test.go

@@ -444,7 +444,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudStorageSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudStorageSourceDefaultAuthorization(),
+				WithCloudStorageSourceDefaultGCPAuth(),
 			),
 			NewTopic(storageName, testNS,
 				WithTopicSpec(inteventsv1alpha1.TopicSpec{
@@ -454,7 +454,7 @@ func TestAllCases(t *testing.T) {
 				WithTopicReady(testTopicID),
 				WithTopicAddress(testTopicURI),
 				WithTopicProjectID(testProject),
-				WithTopicDefaultAuthorization(),
+				WithTopicDefaultGCPAuth(),
 			),
 			newSink(),
 		},
@@ -471,7 +471,7 @@ func TestAllCases(t *testing.T) {
 				WithCloudStorageSourceAnnotations(map[string]string{
 					duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
 				}),
-				WithCloudStorageSourceDefaultAuthorization(),
+				WithCloudStorageSourceDefaultGCPAuth(),
 				WithCloudStorageSourcePullSubscriptionUnknown("PullSubscriptionNotConfigured", failedToReconcilepullSubscriptionMsg),
 			),
 		}},
@@ -1163,7 +1163,7 @@ func TestAllCases(t *testing.T) {
 					WithDeletionTimestamp()),
 			}},
 		},
-			{
+		{
 			Name: "successfully deleted storage",
 			Objects: []runtime.Object{
 				NewCloudStorageSource(storageName, testNS,

pkg/reconciler/intevents/reconciler_test.go

@@ -87,7 +87,7 @@ var (
 
 	pubsubable = rectesting.NewCloudStorageSource(name, testNS,
 		rectesting.WithCloudStorageSourceSinkDestination(sink),
-		rectesting.WithCloudStorageSourceDefaultAuthorization())
+		rectesting.WithCloudStorageSourceDefaultGCPAuth())
 
 	ignoreLastTransitionTime = cmp.FilterPath(func(p cmp.Path) bool {
 		return strings.HasSuffix(p.String(), "LastTransitionTime.Inner.Time")

pkg/reconciler/testing/auditlogs.go

@@ -194,7 +194,7 @@ func WithCloudAuditLogsSourceAnnotations(Annotations map[string]string) CloudAud
 	}
 }
 
-func WithCloudAuditLogsSourceDefaultAuthorization() CloudAuditLogsSourceOption {
+func WithCloudAuditLogsSourceDefaultGCPAuth() CloudAuditLogsSourceOption {
 	return func(s *v1alpha1.CloudAuditLogsSource) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/build.go

@@ -165,7 +165,7 @@ func WithCloudBuildSourceAnnotations(Annotations map[string]string) CloudBuildSo
 	}
 }
 
-func WithCloudBuildSourceDefaultAuthorization() CloudBuildSourceOption {
+func WithCloudBuildSourceDefaultGCPAuth() CloudBuildSourceOption {
 	return func(s *v1alpha1.CloudBuildSource) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/pubsub.go

@@ -163,7 +163,7 @@ func WithCloudPubSubSourceAnnotations(Annotations map[string]string) CloudPubSub
 	}
 }
 
-func WithCloudPubSubSourceDefaultAuthorization() CloudPubSubSourceOption {
+func WithCloudPubSubSourceDefaultGCPAuth() CloudPubSubSourceOption {
 	return func(s *v1alpha1.CloudPubSubSource) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/pullsubscription.go

@@ -286,7 +286,7 @@ func WithPullSubscriptionMode(mode v1alpha1.ModeType) PullSubscriptionOption {
 	}
 }
 
-func WithPullSubscriptionDefaultAuthorization() PullSubscriptionOption {
+func WithPullSubscriptionDefaultGCPAuth() PullSubscriptionOption {
 	return func(s *v1alpha1.PullSubscription) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/scheduler.go

@@ -212,7 +212,7 @@ func WithCloudSchedulerSourceAnnotations(Annotations map[string]string) CloudSch
 	}
 }
 
-func WithCloudSchedulerSourceDefaultAuthorization() CloudSchedulerSourceOption {
+func WithCloudSchedulerSourceDefaultGCPAuth() CloudSchedulerSourceOption {
 	return func(s *v1alpha1.CloudSchedulerSource) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/storage.go

@@ -237,7 +237,7 @@ func WithCloudStorageSourceAnnotations(Annotations map[string]string) CloudStora
 	}
 }
 
-func WithCloudStorageSourceDefaultAuthorization() CloudStorageSourceOption {
+func WithCloudStorageSourceDefaultGCPAuth() CloudStorageSourceOption {
 	return func(s *v1alpha1.CloudStorageSource) {
 		s.Spec.PubSubSpec.SetPubSubDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}

pkg/reconciler/testing/topic.go

@@ -188,7 +188,7 @@ func WithTopicAnnotations(annotations map[string]string) TopicOption {
 	}
 }
 
-func WithTopicDefaultAuthorization() TopicOption {
+func WithTopicDefaultGCPAuth() TopicOption {
 	return func(t *v1alpha1.Topic) {
 		t.Spec.SetDefaults(gcpauthtesthelper.ContextWithDefaults())
 	}