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/apis/intevents/v1alpha1/topic_defaults.go

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

pkg/apis/intevents/v1alpha1/topic_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"
@@ -30,32 +31,62 @@ import (
 )
 
 func TestTopicDefaults(t *testing.T) {
-	want := &Topic{
-		ObjectMeta: metav1.ObjectMeta{
-			Annotations: map[string]string{
-				duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
-			},
+	testCases := map[string]struct {
+		want *Topic
+		got  *Topic
+		ctx  context.Context
+	}{
+		"with GCP Auth": {
+			want: &Topic{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
+					},
+				},
+				Spec: TopicSpec{
+					PropagationPolicy: TopicPolicyCreateNoDelete,
+					Secret: &corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{
+							Name: "google-cloud-key",
+						},
+						Key: "key.json",
+					},
+				}},
+			got: &Topic{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
+					},
+				},
+				Spec: TopicSpec{}},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
 		},
-		Spec: TopicSpec{
-			PropagationPolicy: TopicPolicyCreateNoDelete,
-			Secret: &corev1.SecretKeySelector{
-				LocalObjectReference: corev1.LocalObjectReference{
-					Name: "google-cloud-key",
+		"without GCP Auth": {
+			want: &Topic{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
+					},
 				},
-				Key: "key.json",
+				Spec: TopicSpec{
+					PropagationPolicy: TopicPolicyCreateNoDelete},
 			},
-		}}
-
-	got := &Topic{
-		ObjectMeta: metav1.ObjectMeta{
-			Annotations: map[string]string{
-				duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
+			got: &Topic{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						duckv1alpha1.ClusterNameAnnotation: testingMetadataClient.FakeClusterName,
+					},
+				},
 			},
+			ctx: context.Background(),
 		},
-		Spec: TopicSpec{}}
-	got.SetDefaults(gcpauthtesthelper.ContextWithDefaults())
-
-	if diff := cmp.Diff(want, got); diff != "" {
-		t.Errorf("failed to get expected (-want, +got) = %v", diff)
+	}
+	for n, tc := range testCases {
+		t.Run(n, func(t *testing.T) {
+			tc.got.SetDefaults(tc.ctx)
+			if diff := cmp.Diff(tc.want, tc.got); diff != "" {
+				t.Errorf("Unexpected differences (-want +got): %v", diff)
+			}
+		})
 	}
 }

pkg/apis/intevents/v1beta1/topic_defaults.go

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

pkg/apis/intevents/v1beta1/topic_defaults_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -25,20 +26,38 @@ import (
 )
 
 func TestTopicDefaults(t *testing.T) {
-	want := &Topic{Spec: TopicSpec{
-		PropagationPolicy: TopicPolicyCreateNoDelete,
-		Secret: &corev1.SecretKeySelector{
-			LocalObjectReference: corev1.LocalObjectReference{
-				Name: "google-cloud-key",
+	testCases := map[string]struct {
+		want *Topic
+		got  *Topic
+		ctx  context.Context
+	}{
+		"with GCP Auth": {
+			want: &Topic{Spec: TopicSpec{
+				PropagationPolicy: TopicPolicyCreateNoDelete,
+				Secret: &corev1.SecretKeySelector{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: "google-cloud-key",
+					},
+					Key: "key.json",
+				},
+			}},
+			got: &Topic{Spec: TopicSpec{}},
+			ctx: gcpauthtesthelper.ContextWithDefaults(),
+		},
+		"without GCP Auth": {
+			want: &Topic{Spec: TopicSpec{
+				PropagationPolicy: TopicPolicyCreateNoDelete},
 			},
-			Key: "key.json",
+			got: &Topic{},
+			ctx: context.Background(),
 		},
-	}}
-
-	got := &Topic{Spec: TopicSpec{}}
-	got.SetDefaults(gcpauthtesthelper.ContextWithDefaults())
-
-	if diff := cmp.Diff(want, got); diff != "" {
-		t.Errorf("failed to get expected (-want, +got) = %v", diff)
+	}
+	for n, tc := range testCases {
+		t.Run(n, func(t *testing.T) {
+			tc.got.SetDefaults(tc.ctx)
+			if diff := cmp.Diff(tc.want, tc.got); 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{