Merge "identity: Add missing user argument"

Zuul · openstack-gerrit · commit 79de13715217 · 2025-05-16T02:50:39.000Z
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
@@ -659,6 +659,8 @@ def get_parser(self, prog_name):
 
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.sdk_connection.identity
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         # FIXME(gyee): there are two scenarios:
         #
@@ -701,7 +703,9 @@ def take_action(self, parsed_args):
             )
 
         identity_client.update_user(
-            current_password=current_password, password=password
+            user=user_id,
+            current_password=current_password,
+            password=password,
         )
 
 
diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py
@@ -1686,11 +1686,14 @@ def test_user_password_change(self):
         # Mock getting user current password.
         with self._mock_get_password(current_pass):
             result = self.cmd.take_action(parsed_args)
+        self.assertIsNone(result)
+
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         self.identity_sdk_client.update_user.assert_called_with(
-            current_password=current_pass, password=new_pass
+            user=user_id, current_password=current_pass, password=new_pass
         )
-        self.assertIsNone(result)
 
     def test_user_create_password_prompt(self):
         current_pass = 'old_pass'
@@ -1700,11 +1703,14 @@ def test_user_create_password_prompt(self):
         # Mock getting user current and new password.
         with self._mock_get_password(current_pass, new_pass):
             result = self.cmd.take_action(parsed_args)
+        self.assertIsNone(result)
+
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         self.identity_sdk_client.update_user.assert_called_with(
-            current_password=current_pass, password=new_pass
+            user=user_id, current_password=current_pass, password=new_pass
         )
-        self.assertIsNone(result)
 
     def test_user_password_change_no_prompt(self):
         current_pass = 'old_pass'
@@ -1722,11 +1728,14 @@ def test_user_password_change_no_prompt(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
+        self.assertIsNone(result)
+
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         self.identity_sdk_client.update_user.assert_called_with(
-            current_password=current_pass, password=new_pass
+            user=user_id, current_password=current_pass, password=new_pass
         )
-        self.assertIsNone(result)
 
 
 class TestUserShow(identity_fakes.TestIdentityv3):

Original file line number	Diff line number	Diff line change
`@@ -659,6 +659,8 @@ def get_parser(self, prog_name):`
`659`	`659`
`660`	`660`	`def take_action(self, parsed_args):`
`661`	`661`	`identity_client = self.app.client_manager.sdk_connection.identity`
	`662`	`+ conn = self.app.client_manager.sdk_connection`
	`663`	`+ user_id = conn.config.get_auth().get_user_id(conn.identity)`
`662`	`664`
`663`	`665`	`# FIXME(gyee): there are two scenarios:`
`664`	`666`	`#`
`@@ -701,7 +703,9 @@ def take_action(self, parsed_args):`
`701`	`703`	`)`
`702`	`704`
`703`	`705`	`identity_client.update_user(`
`704`		`- current_password=current_password, password=password`
	`706`	`+ user=user_id,`
	`707`	`+ current_password=current_password,`
	`708`	`+ password=password,`
`705`	`709`	`)`
`706`	`710`
`707`	`711`