Update Cartridge to 2.3.0 in tests (#116)

Co-authored-by: Oleg Babin <[email protected]>

Author: dokshina

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 ---
 variables:
-  BUNDLE_VERSION: 2.3.1-13-g882baf7
-  CARTRIDGE_CLI_VERSION: 2.0.0
+  BUNDLE_VERSION: 2.4.2-17-g5c752b1
+  CARTRIDGE_CLI_VERSION: 2.3.0
 
 stages:
   - prebuild

library/cartridge_auth.py

@@ -157,6 +157,27 @@ def user_is_deleted(user):
     return 'deleted' in user and user['deleted'] is True
 
 
+def users_are_equal(user1, user2):
+    for key in user1:
+        if key == 'version':
+            continue
+
+        if key not in user2:
+            return False
+
+        if user1[key] != user2[key]:
+            return False
+
+    for key in user2:
+        if key == 'version':
+            continue
+
+        if key not in user1:
+            return False
+
+    return True
+
+
 def manage_auth(params):
     auth_params = params['auth']
     control_console = get_control_console(params['control_sock'])
@@ -236,7 +257,7 @@ def manage_auth(params):
         if not ok:
             return ModuleRes(success=False, msg=edited_user)
 
-        users_changed = users_changed or cluster_user != edited_user
+        users_changed = users_changed or not users_are_equal(cluster_user, edited_user)
 
     for user in users_to_delete:
         ok, err = delete_cluster_user(control_console, user)

unit/mock/cartridge.lua

@@ -63,6 +63,7 @@ local vars = {
     membership_members = {},
     known_servers = {},
     become_unhealthy_after_edit = false,
+    user_has_version = true,
 }
 
 local topology = {
@@ -523,6 +524,10 @@ function cartridge_auth.add_user(username, password, fullname, email)
         email = email,
     }
 
+    if vars.user_has_version then
+        user.version = 1
+    end
+
     table.insert(vars.users, user)
     return user
 end
@@ -575,6 +580,10 @@ function cartridge_auth.edit_user(username, password, fullname, email)
         user.email = email
     end
 
+    if user.version ~= nil then
+        user.version = user.version + 1
+    end
+
     return user
 end
 

unit/test_auth.py

@@ -249,6 +249,65 @@ def test_edit_user(self):
         self.assertFalse(res.success)
         self.assertIn('cartridge err', res.msg)
 
+    def test_edit_user_no_version(self):
+        # all required operations are implemented
+        set_user_functions_implemented(self.instance)
+        self.instance.set_variable('user_has_version', False)
+
+        USER = {
+            'username': 'dokshina',
+            'email': '[email protected]',
+            'fullname': 'Elizaveta Dokshina',
+        }
+
+        new_params = {
+            'password': 'new-password',
+            'email': '[email protected]_a_bit_more',
+            'fullname': 'The Princess',
+        }
+
+        for param, value in new_params.items():
+            self.instance.set_variable('users', [USER])
+
+            self.instance.clear_calls('auth_add_user')
+            self.instance.clear_calls('auth_edit_user')
+            self.instance.clear_calls('auth_remove_user')
+
+            user_patch = {
+                'username': USER['username'],
+                param: value,
+            }
+
+            res = call_manage_auth(self.console_sock, users=[user_patch])
+            self.assertTrue(res.success, msg=res.msg)
+            if param != 'password':
+                self.assertTrue(res.changed)
+            else:
+                self.assertFalse(res.changed)
+
+            calls = self.instance.get_calls('auth_add_user')
+            self.assertEqual(len(calls), 0)
+
+            calls = self.instance.get_calls('auth_edit_user')
+            self.assertEqual(len(calls), 1)
+            self.assertEqual(calls[0], user_patch)
+
+            calls = self.instance.get_calls('auth_remove_user')
+            self.assertEqual(len(calls), 0)
+
+        # fail on auth_edit_user
+        self.instance.set_fail_on('auth_edit_user')
+        self.instance.set_variable('users', [USER])
+
+        user_patch = {
+            'username': USER['username'],
+            'password': 'new-password',
+        }
+
+        res = call_manage_auth(self.console_sock, users=[user_patch])
+        self.assertFalse(res.success)
+        self.assertIn('cartridge err', res.msg)
+
     def test_delete_user(self):
         # all required operations are implemented
         set_user_functions_implemented(self.instance)