Skip to content

Commit 6e86002

Browse files
committed
Only create user limits when limits exist to create.
1 parent 1ca6565 commit 6e86002

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

controllers/user_controller.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,20 +228,24 @@ func (r *UserReconciler) DeclareFunc(ctx context.Context, client rabbitmqclient.
228228
}
229229

230230
newUserLimits := internal.GenerateUserLimits(user.Spec.UserLimits)
231+
logger.Info("Getting existing user limits", "user", user.Name)
231232
existingUserLimits, err := r.getUserLimits(client, string(credentials.Data["username"]))
232233
if err != nil {
233234
return err
234235
}
235-
logger.Info("Updating user limits", "user", user.Name, "existing limits", existingUserLimits, "new limits", newUserLimits)
236236
limitsToDelete := r.userLimitsToDelete(existingUserLimits, newUserLimits)
237237
if len(limitsToDelete) > 0 {
238+
logger.Info("Deleting outdated user limits", "user", user.Name, "limits", limitsToDelete)
238239
err = validateResponseForDeletion(client.DeleteUserLimits(string(credentials.Data["username"]), limitsToDelete))
239240
if err != nil && !errors.Is(err, NotFound) {
240241
return err
241242
}
242-
logger.Info("Deleted user limits", "user", user.Name, "limits", limitsToDelete)
243243
}
244-
return validateResponse(client.PutUserLimits(string(credentials.Data["username"]), newUserLimits))
244+
if len(newUserLimits) > 0 {
245+
logger.Info("Creating new user limits", "user", user.Name, "limits", newUserLimits)
246+
return validateResponse(client.PutUserLimits(string(credentials.Data["username"]), newUserLimits))
247+
}
248+
return nil
245249
}
246250

247251
func (r *UserReconciler) userLimitsToDelete(existingUserLimits, newUserLimits rabbithole.UserLimitsValues) (limitsToDelete rabbithole.UserLimits) {

0 commit comments

Comments
 (0)