Linting

Signed-off-by: rsuplina <rsuplina@cloudera.com>

Author: rsuplina

plugins/module_utils/cdp_client.py

@@ -660,7 +660,11 @@ def _post(
     ) -> Dict[str, Any]:
         """Execute HTTP POST request."""
         return self._make_request(
-            "POST", path, data=data, json_data=json_data, squelch=squelch
+            "POST",
+            path,
+            data=data,
+            json_data=json_data,
+            squelch=squelch,
         )
 
     def _put(
@@ -672,7 +676,11 @@ def _put(
     ) -> Dict[str, Any]:
         """Execute HTTP PUT request."""
         return self._make_request(
-            "PUT", path, data=data, json_data=json_data, squelch=squelch
+            "PUT",
+            path,
+            data=data,
+            json_data=json_data,
+            squelch=squelch,
         )
 
     def _delete(self, path: str, squelch: Dict[int, Any] = {}) -> Dict[str, Any]:

plugins/module_utils/cdp_iam.py

@@ -75,7 +75,7 @@ def get_group_details(self, group_name: str) -> Optional[Dict[str, Any]]:
 
         # Get assigned resource roles
         resource_roles_response = self.list_group_assigned_resource_roles(
-            group_name=group_name
+            group_name=group_name,
         )
         resource_assignments = resource_roles_response.get("resourceAssignments", [])
 
@@ -119,7 +119,8 @@ def manage_group_users(
             for user_crn in users_to_remove:
                 if self._is_machine_user(user_crn):
                     self.remove_machine_user_from_group(
-                        machine_user_name=user_crn, group_name=group_name
+                        machine_user_name=user_crn,
+                        group_name=group_name,
                     )
                 else:
                     self.remove_user_from_group(user_id=user_crn, group_name=group_name)
@@ -130,7 +131,8 @@ def manage_group_users(
         for user_crn in users_to_add:
             if self._is_machine_user(user_crn):
                 self.add_machine_user_to_group(
-                    machine_user_name=user_crn, group_name=group_name
+                    machine_user_name=user_crn,
+                    group_name=group_name,
                 )
             else:
                 self.add_user_to_group(user_id=user_crn, group_name=group_name)
@@ -837,7 +839,9 @@ def add_user_to_group(self, group_name: str, user_id: str) -> Dict[str, Any]:
         )
 
     def add_machine_user_to_group(
-        self, group_name: str, machine_user_name: str
+        self,
+        group_name: str,
+        machine_user_name: str,
     ) -> Dict[str, Any]:
         """
         Add a machine user to a group.
@@ -881,7 +885,9 @@ def remove_user_from_group(self, group_name: str, user_id: str) -> Dict[str, Any
         )
 
     def remove_machine_user_from_group(
-        self, group_name: str, machine_user_name: str
+        self,
+        group_name: str,
+        machine_user_name: str,
     ) -> Dict[str, Any]:
         """
         Remove a machine user from a group.
@@ -927,7 +933,10 @@ def assign_group_role(self, group_name: str, role: str) -> Dict[str, Any]:
         )
 
     def assign_group_resource_role(
-        self, group_name: str, resource_crn: str, resource_role_crn: str
+        self,
+        group_name: str,
+        resource_crn: str,
+        resource_role_crn: str,
     ) -> Dict[str, Any]:
         """
         Assign a resource role to a group.
@@ -973,7 +982,10 @@ def unassign_group_role(self, group_name: str, role: str) -> Dict[str, Any]:
         )
 
     def unassign_group_resource_role(
-        self, group_name: str, resource_crn: str, resource_role_crn: str
+        self,
+        group_name: str,
+        resource_crn: str,
+        resource_role_crn: str,
     ) -> Dict[str, Any]:
         """
         Unassign a resource role from a group.

plugins/modules/iam_group.py

@@ -246,10 +246,14 @@ def __init__(self):
                     elements="dict",
                     options=dict(
                         resource=dict(
-                            required=True, type="str", aliases=["resource_crn"]
+                            required=True,
+                            type="str",
+                            aliases=["resource_crn"],
                         ),
                         role=dict(
-                            required=True, type="str", aliases=["resource_role_crn"]
+                            required=True,
+                            type="str",
+                            aliases=["resource_role_crn"],
                         ),
                     ),
                 ),
@@ -289,7 +293,8 @@ def process(self):
                 self.group = {"groupName": self.name}
             else:
                 response = self.client.create_group(
-                    group_name=self.name, sync_membership_on_user_login=self.sync
+                    group_name=self.name,
+                    sync_membership_on_user_login=self.sync,
                 )
                 self.group = response.get("group", {})
             self.changed = True
@@ -299,7 +304,8 @@ def process(self):
 
             if self.sync != current_group.get("syncMembershipOnUserLogin"):
                 self.client.update_group(
-                    group_name=self.name, sync_membership_on_user_login=self.sync
+                    group_name=self.name,
+                    sync_membership_on_user_login=self.sync,
                 )
                 self.changed = True
 

tests/unit/plugins/modules/iam_group/test_iam_group.py

@@ -244,13 +244,14 @@ def test_create_group(self, mock_api_client, iam_client):
                 "crn": "crn:cdp:iam:us-west-1:altus:group:new-team",
                 "creationDate": "2024-02-01T09:00:00.000Z",
                 "syncMembershipOnUserLogin": True,
-            }
+            },
         }
 
         mock_api_client._post.return_value = mock_response
 
         response = iam_client.create_group(
-            group_name="new-team", sync_membership_on_user_login=True
+            group_name="new-team",
+            sync_membership_on_user_login=True,
         )
 
         assert "group" in response
@@ -296,7 +297,8 @@ def test_update_group(self, mock_api_client, iam_client):
         mock_api_client._post.return_value = mock_response
 
         response = iam_client.update_group(
-            group_name="existing-team", sync_membership_on_user_login=False
+            group_name="existing-team",
+            sync_membership_on_user_login=False,
         )
 
         assert isinstance(response, dict)
@@ -313,7 +315,11 @@ def test_update_group(self, mock_api_client, iam_client):
         )
 
     def test_list_group_members(
-        self, mock_api_client, iam_client, sample_users, sample_machine_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_users,
+        sample_machine_users,
     ):
         """Test listing group members."""
 
@@ -393,7 +399,10 @@ def test_remove_user_from_group(self, mock_api_client, iam_client, sample_users)
         )
 
     def test_add_machine_user_to_group(
-        self, mock_api_client, iam_client, sample_machine_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_machine_users,
     ):
         """Test adding a machine user to a group."""
 
@@ -421,7 +430,10 @@ def test_add_machine_user_to_group(
         )
 
     def test_remove_machine_user_from_group(
-        self, mock_api_client, iam_client, sample_machine_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_machine_users,
     ):
         """Test removing a machine user from a group."""
 
@@ -520,7 +532,7 @@ def test_list_group_assigned_resource_roles(self, mock_api_client, iam_client):
         mock_api_client._post.return_value = mock_response
 
         response = iam_client.list_group_assigned_resource_roles(
-            group_name="data-engineers"
+            group_name="data-engineers",
         )
 
         assert "resourceAssignments" in response
@@ -538,7 +550,10 @@ def test_list_group_assigned_resource_roles(self, mock_api_client, iam_client):
         )
 
     def test_assign_group_resource_role(
-        self, mock_api_client, iam_client, sample_resource_roles
+        self,
+        mock_api_client,
+        iam_client,
+        sample_resource_roles,
     ):
         """Test assigning a resource role to a group."""
 
@@ -568,7 +583,10 @@ def test_assign_group_resource_role(
         )
 
     def test_unassign_group_resource_role(
-        self, mock_api_client, iam_client, sample_resource_roles
+        self,
+        mock_api_client,
+        iam_client,
+        sample_resource_roles,
     ):
         """Test unassigning a resource role from a group."""
 
@@ -602,7 +620,10 @@ def test_unassign_group_resource_role(
     # ============================================================================
 
     def test_manage_group_users_add_only(
-        self, mock_api_client, iam_client, sample_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_users,
     ):
         """Test adding users to a group without removing any."""
         mock_api_client._post.return_value = {}
@@ -637,7 +658,10 @@ def test_manage_group_users_purge(self, mock_api_client, iam_client, sample_user
         assert changed is True
 
     def test_manage_group_users_no_changes(
-        self, mock_api_client, iam_client, sample_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_users,
     ):
         """Test when no user changes are needed."""
         current_members = sample_users
@@ -654,7 +678,10 @@ def test_manage_group_users_no_changes(
         mock_api_client._post.assert_not_called()
 
     def test_manage_group_users_machine_user(
-        self, mock_api_client, iam_client, sample_machine_users
+        self,
+        mock_api_client,
+        iam_client,
+        sample_machine_users,
     ):
         """Test adding machine users to a group."""
         mock_api_client._post.return_value = {}
@@ -686,7 +713,8 @@ def test_create_update_delete_group_lifecycle(self, api_client):
         try:
             # 1. Create a new group
             create_response = client.create_group(
-                group_name=test_group_name, sync_membership_on_user_login=True
+                group_name=test_group_name,
+                sync_membership_on_user_login=True,
             )
 
             assert "group" in create_response
@@ -701,7 +729,8 @@ def test_create_update_delete_group_lifecycle(self, api_client):
 
             # 3. Update the group (change sync setting)
             update_response = client.update_group(
-                group_name=test_group_name, sync_membership_on_user_login=False
+                group_name=test_group_name,
+                sync_membership_on_user_login=False,
             )
             assert isinstance(update_response, dict)
 
@@ -731,7 +760,8 @@ def test_group_membership_management(self, api_client):
         try:
             # 1. Create a test group
             client.create_group(
-                group_name=test_group_name, sync_membership_on_user_login=True
+                group_name=test_group_name,
+                sync_membership_on_user_login=True,
             )
 
             # 2. Get current user to add to group
@@ -741,7 +771,8 @@ def test_group_membership_management(self, api_client):
             if user_crn:
                 # 3. Add user to group
                 add_response = client.add_user_to_group(
-                    group_name=test_group_name, user_id=user_crn
+                    group_name=test_group_name,
+                    user_id=user_crn,
                 )
                 assert isinstance(add_response, dict)
 
@@ -752,7 +783,8 @@ def test_group_membership_management(self, api_client):
 
                 # 5. Remove user from group
                 remove_response = client.remove_user_from_group(
-                    group_name=test_group_name, user_id=user_crn
+                    group_name=test_group_name,
+                    user_id=user_crn,
                 )
                 assert isinstance(remove_response, dict)
 
@@ -777,7 +809,8 @@ def test_group_role_assignment(self, api_client):
         try:
             # 1. Create a test group
             client.create_group(
-                group_name=test_group_name, sync_membership_on_user_login=True
+                group_name=test_group_name,
+                sync_membership_on_user_login=True,
             )
 
             # 2. Get available roles
@@ -788,26 +821,28 @@ def test_group_role_assignment(self, api_client):
 
                 # 3. Assign role to group
                 assign_response = client.assign_group_role(
-                    group_name=test_group_name, role=test_role_crn
+                    group_name=test_group_name,
+                    role=test_role_crn,
                 )
                 assert isinstance(assign_response, dict)
 
                 # 4. Verify role was assigned
                 assigned_roles = client.list_group_assigned_roles(
-                    group_name=test_group_name
+                    group_name=test_group_name,
                 )
                 assert "roleCrns" in assigned_roles
                 assert test_role_crn in assigned_roles["roleCrns"]
 
                 # 5. Unassign role from group
                 unassign_response = client.unassign_group_role(
-                    group_name=test_group_name, role=test_role_crn
+                    group_name=test_group_name,
+                    role=test_role_crn,
                 )
                 assert isinstance(unassign_response, dict)
 
                 # 6. Verify role was unassigned
                 roles_after = client.list_group_assigned_roles(
-                    group_name=test_group_name
+                    group_name=test_group_name,
                 )
                 assert test_role_crn not in roles_after.get("roleCrns", [])
 
@@ -828,7 +863,8 @@ def test_machine_user_group_membership(self, api_client):
         try:
             # 1. Create a test group
             client.create_group(
-                group_name=test_group_name, sync_membership_on_user_login=True
+                group_name=test_group_name,
+                sync_membership_on_user_login=True,
             )
 
             # 2. Get list of machine users
@@ -845,7 +881,8 @@ def test_machine_user_group_membership(self, api_client):
 
                 # 3. Add machine user to group
                 add_response = client.add_machine_user_to_group(
-                    group_name=test_group_name, machine_user_name=machine_user_name
+                    group_name=test_group_name,
+                    machine_user_name=machine_user_name,
                 )
                 assert isinstance(add_response, dict)
 
@@ -855,7 +892,8 @@ def test_machine_user_group_membership(self, api_client):
 
                 # 5. Remove machine user from group
                 remove_response = client.remove_machine_user_from_group(
-                    group_name=test_group_name, machine_user_name=machine_user_name
+                    group_name=test_group_name,
+                    machine_user_name=machine_user_name,
                 )
                 assert isinstance(remove_response, dict)