Merge pull request #236 from Peripli/visibility

continue to disable even if enable fail
Peripli · Mar 23, 2022 · 7516746 · 7516746
2 parents 9bd885f + c9b5975
commit 7516746
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/sbproxy/notifications/handlers/visibilities_handler.go b/pkg/sbproxy/notifications/handlers/visibilities_handler.go
@@ -179,12 +179,10 @@ func (vnh *VisibilityResourceNotificationsHandler) OnUpdate(ctx context.Context,
 
  if err := vnh.enableServiceAccess(ctx, labelsToAdd, newVisibilityPayload, platformBrokerName); err != nil {
  logger.Error(err)
- return
  }
 
  if err := vnh.disableServiceAccess(ctx, labelsToRemove, newVisibilityPayload, platformBrokerName); err != nil {
  logger.Error(err)
- return
  }
 }
 

diff --git a/pkg/sbproxy/notifications/handlers/visibility_handler_test.go b/pkg/sbproxy/notifications/handlers/visibility_handler_test.go
@@ -493,7 +493,18 @@ var _ = Describe("Visibility Handler", func() {
  })
  })
  })
+ Context("when an error occurs while enabling access it should continue to disable", func() {
+ BeforeEach(func() {
+ fakeVisibilityClient.EnableAccessForPlanReturns(fmt.Errorf("error"))
+ })
 
+ It("logs an error", func() {
+ VerifyErrorLogged(func() {
+ visibilityHandler.OnUpdate(ctx, &types.Notification{Payload: json.RawMessage(visibilityNotificationPayload)})
+ Expect(fakeVisibilityClient.DisableAccessForPlanCallCount()).To(Equal(1))
+ })
+ })
+ })
  Context("when an error occurs while disabling access", func() {
  BeforeEach(func() {
  fakeVisibilityClient.EnableAccessForPlanReturns(nil)