Skip to content

Commit 58b4e6d

Browse files
authored
Merge pull request #1550 from matheuscscp/fix-bucket-err-msg
Improve invalid proxy error message for Bucket API
2 parents 54cb2d8 + 8d19782 commit 58b4e6d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

internal/controller/bucket_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ func (r *BucketReconciler) getProxyURL(ctx context.Context, obj *bucketv1.Bucket
730730
address, ok := proxyData["address"]
731731
if !ok {
732732
return nil, fmt.Errorf("invalid proxy secret '%s/%s': key 'address' is missing",
733-
obj.Spec.ProxySecretRef.Name, namespace)
733+
namespace, obj.Spec.ProxySecretRef.Name)
734734
}
735735
proxyURL, err := url.Parse(string(address))
736736
if err != nil {

internal/controller/bucket_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ func TestBucketReconciler_reconcileSource_generic(t *testing.T) {
589589
assertConditions: []metav1.Condition{
590590
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"),
591591
*conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"),
592-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "invalid proxy secret 'dummy/': key 'address' is missing"),
592+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, "invalid proxy secret '/dummy': key 'address' is missing"),
593593
},
594594
},
595595
{
@@ -1622,7 +1622,7 @@ func TestBucketReconciler_getProxyURL(t *testing.T) {
16221622
Data: map[string][]byte{},
16231623
},
16241624
},
1625-
expectedErr: "invalid proxy secret 'dummy/': key 'address' is missing",
1625+
expectedErr: "invalid proxy secret '/dummy': key 'address' is missing",
16261626
},
16271627
{
16281628
name: "invalid address in proxySecretRef",

0 commit comments

Comments
 (0)