@@ -184,9 +184,9 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
184
184
Expect (key .StringData .AccessKeyRO ).To (Equal ("access-key-1" ))
185
185
Expect (key .StringData .SecretKeyRO ).To (Equal ("secret-key-1" ))
186
186
187
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys assigned" ))
188
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys stored in secret" ))
189
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage bucket synced" ))
187
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys assigned" ))
188
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys stored in secret" ))
189
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage bucket synced" ))
190
190
191
191
logOutput := mck .Logs ()
192
192
Expect (logOutput ).To (ContainSubstring ("Reconciling apply" ))
@@ -252,7 +252,7 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
252
252
Expect (k8sClient .Get (ctx , objectKey , & obj )).To (Succeed ())
253
253
Expect (* obj .Status .LastKeyGeneration ).To (Equal (1 ))
254
254
255
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys assigned" ))
255
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys assigned" ))
256
256
257
257
logOutput := mck .Logs ()
258
258
Expect (logOutput ).To (ContainSubstring ("Reconciling apply" ))
@@ -308,9 +308,9 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
308
308
Expect (key .StringData .AccessKeyRO ).To (Equal ("access-key-3" ))
309
309
Expect (key .StringData .SecretKeyRO ).To (Equal ("secret-key-3" ))
310
310
311
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys retrieved" ))
312
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys stored in secret" ))
313
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage bucket synced" ))
311
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys retrieved" ))
312
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys stored in secret" ))
313
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage bucket synced" ))
314
314
315
315
logOutput := mck .Logs ()
316
316
Expect (logOutput ).To (ContainSubstring ("Reconciling apply" ))
@@ -348,7 +348,7 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
348
348
Expect (err ).NotTo (HaveOccurred ())
349
349
Expect (apierrors .IsNotFound (k8sClient .Get (ctx , objectKey , & obj ))).To (BeTrue ())
350
350
351
- Expect (<- mck .Events ()).To (ContainSubstring ("Object storage keys revoked" ))
351
+ Expect (mck .Events ()).To (ContainSubstring ("Object storage keys revoked" ))
352
352
353
353
logOutput := mck .Logs ()
354
354
Expect (logOutput ).To (ContainSubstring ("Reconciling delete" ))
@@ -456,7 +456,7 @@ var _ = Describe("errors", Label("bucket", "errors"), func() {
456
456
bScope .Client = mck .K8sClient
457
457
err := reconciler .reconcileApply (ctx , & bScope )
458
458
Expect (err .Error ()).To (ContainSubstring ("api error" ))
459
- Expect (<- mck .Events ()).To (ContainSubstring ("api error" ))
459
+ Expect (mck .Events ()).To (ContainSubstring ("api error" ))
460
460
Expect (mck .Logs ()).To (ContainSubstring ("Failed to ensure access key secret exists" ))
461
461
}),
462
462
),
@@ -485,8 +485,8 @@ var _ = Describe("errors", Label("bucket", "errors"), func() {
485
485
bScope .Client = mck .K8sClient
486
486
err := reconciler .reconcileApply (ctx , & bScope )
487
487
Expect (err .Error ()).To (ContainSubstring ("secret creation error" ))
488
- Expect (<- mck .Events ()).To (ContainSubstring ("keys retrieved" ))
489
- Expect (<- mck .Events ()).To (ContainSubstring ("secret creation error" ))
488
+ Expect (mck .Events ()).To (ContainSubstring ("keys retrieved" ))
489
+ Expect (mck .Events ()).To (ContainSubstring ("secret creation error" ))
490
490
Expect (mck .Logs ()).To (ContainSubstring ("Failed to apply key secret" ))
491
491
}),
492
492
),
@@ -504,8 +504,8 @@ var _ = Describe("errors", Label("bucket", "errors"), func() {
504
504
bScope .Client = mck .K8sClient
505
505
err := reconciler .reconcileApply (ctx , & bScope )
506
506
Expect (err .Error ()).To (ContainSubstring ("no kind is registered" ))
507
- Expect (<- mck .Events ()).To (ContainSubstring ("keys retrieved" ))
508
- Expect (<- mck .Events ()).To (ContainSubstring ("no kind is registered" ))
507
+ Expect (mck .Events ()).To (ContainSubstring ("keys retrieved" ))
508
+ Expect (mck .Events ()).To (ContainSubstring ("no kind is registered" ))
509
509
Expect (mck .Logs ()).To (ContainSubstring ("Failed to generate key secret" ))
510
510
}),
511
511
),
@@ -522,7 +522,7 @@ var _ = Describe("errors", Label("bucket", "errors"), func() {
522
522
bScope .Client = mck .K8sClient
523
523
err := reconciler .reconcileDelete (ctx , & bScope )
524
524
Expect (err .Error ()).To (ContainSubstring ("failed to remove finalizer from bucket" ))
525
- Expect (<- mck .Events ()).To (ContainSubstring ("failed to remove finalizer from bucket" ))
525
+ Expect (mck .Events ()).To (ContainSubstring ("failed to remove finalizer from bucket" ))
526
526
}),
527
527
))
528
528
})
0 commit comments