Skip to content

Commit 3357b5f

Browse files
cappyzawacappyzawa
committed
fixup! fixup! fixup! Migrate Bucket controller to runtime/secrets
Address Stefan's review comments on error message detail Signed-off-by: cappyzawa <[email protected]>
1 parent 19b1f45 commit 3357b5f

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

‎internal/controller/bucket_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ func (r *BucketReconciler) setupCredentials(ctx context.Context, obj *sourcev1.B
770770
}
771771
secret = &corev1.Secret{}
772772
if err := r.Get(ctx, secretName, secret); err != nil {
773-
return nil, fmt.Errorf("failed to get secret: %w", err)
773+
return nil, fmt.Errorf("failed to get secret '%s': %w", secretName, err)
774774
}
775775
}
776776

@@ -782,7 +782,7 @@ func (r *BucketReconciler) setupCredentials(ctx context.Context, obj *sourcev1.B
782782
}
783783
stsSecret = &corev1.Secret{}
784784
if err := r.Get(ctx, secretName, stsSecret); err != nil {
785-
return nil, fmt.Errorf("failed to get STS secret: %w", err)
785+
return nil, fmt.Errorf("failed to get STS secret '%s': %w", secretName, err)
786786
}
787787
}
788788

‎internal/controller/bucket_controller_test.go‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
481481
wantErr: true,
482482
assertIndex: index.NewDigester(),
483483
assertConditions: []metav1.Condition{
484-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get secret"),
484+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get secret '/dummy': secrets \"dummy\" not found"),
485485
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
486486
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
487487
},
@@ -522,7 +522,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
522522
wantErr: true,
523523
assertIndex: index.NewDigester(),
524524
assertConditions: []metav1.Condition{
525-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get TLS config"),
525+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get TLS config: secret '/dummy' not found"),
526526
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
527527
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
528528
},
@@ -547,7 +547,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
547547
assertConditions: []metav1.Condition{
548548
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
549549
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
550-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get TLS config"),
550+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get TLS config: secret '/dummy' must contain either 'ca.crt' or both 'tls.crt' and 'tls.key'"),
551551
},
552552
},
553553
{
@@ -563,7 +563,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
563563
wantErr: true,
564564
assertIndex: index.NewDigester(),
565565
assertConditions: []metav1.Condition{
566-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL"),
566+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL: secret '/dummy' not found"),
567567
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
568568
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
569569
},
@@ -573,8 +573,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
573573
bucketName: "dummy",
574574
secret: &corev1.Secret{
575575
ObjectMeta: metav1.ObjectMeta{
576-
Name: "dummy",
577-
Namespace: "default",
576+
Name: "dummy",
578577
},
579578
Data: map[string][]byte{},
580579
},
@@ -590,7 +589,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
590589
assertConditions: []metav1.Condition{
591590
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
592591
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
593-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL"),
592+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL: secret '/dummy': key 'address' not found"),
594593
},
595594
},
596595
{
@@ -606,7 +605,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
606605
wantErr: true,
607606
assertIndex: index.NewDigester(),
608607
assertConditions: []metav1.Condition{
609-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS secret"),
608+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS secret '/dummy': secrets \"dummy\" not found"),
610609
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
611610
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
612611
},
@@ -650,7 +649,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
650649
wantErr: true,
651650
assertIndex: index.NewDigester(),
652651
assertConditions: []metav1.Condition{
653-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS TLS config"),
652+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS TLS config: secret '/dummy' not found"),
654653
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
655654
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
656655
},
@@ -678,7 +677,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
678677
assertConditions: []metav1.Condition{
679678
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
680679
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
681-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS TLS config"),
680+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get STS TLS config: secret '/dummy' must contain either 'ca.crt' or both 'tls.crt' and 'tls.key'"),
682681
},
683682
},
684683
{
@@ -1032,7 +1031,7 @@ func TestBucketReconciler_reconcileSource_gcs(t *testing.T) {
10321031
wantErr: true,
10331032
assertIndex: index.NewDigester(),
10341033
assertConditions: []metav1.Condition{
1035-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get secret"),
1034+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get secret '/dummy': secrets \"dummy\" not found"),
10361035
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
10371036
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
10381037
},
@@ -1075,7 +1074,7 @@ func TestBucketReconciler_reconcileSource_gcs(t *testing.T) {
10751074
wantErr: true,
10761075
assertIndex: index.NewDigester(),
10771076
assertConditions: []metav1.Condition{
1078-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL"),
1077+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL: secret '/dummy' not found"),
10791078
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
10801079
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
10811080
},
@@ -1099,7 +1098,7 @@ func TestBucketReconciler_reconcileSource_gcs(t *testing.T) {
10991098
wantErr: true,
11001099
assertIndex: index.NewDigester(),
11011100
assertConditions: []metav1.Condition{
1102-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "key 'address' not found"),
1101+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "failed to get proxy URL: secret '/dummy': key 'address' not found"),
11031102
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
11041103
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
11051104
},
@@ -1505,7 +1504,6 @@ func TestBucketReconciler_reconcileArtifact(t *testing.T) {
15051504
ObjectMeta: metav1.ObjectMeta{
15061505
GenerateName: "test-bucket-",
15071506
Generation: 1,
1508-
Namespace: "default",
15091507
},
15101508
Spec: sourcev1.BucketSpec{
15111509
Timeout: &metav1.Duration{Duration: timeout},

0 commit comments

Comments
 (0)