CR fixes

Author: k-shlomi

src/scripts/create_teams.py

@@ -120,7 +120,7 @@ def process_teams(token, organization):
     Returns:
         List[str]: The names of the teams to delete.
     """
-    logger.info("Processing teams.")
+    logger.info("Determining required changes in teams.")
     desired_teams = [t.name for t in organization.teams]
     existing_teams: List[TeamObject] = get_existing_teams(token)
     existing_team_names = [team.name for team in existing_teams]
@@ -170,7 +170,9 @@ def main():
 
     update_assets(jit_token, organization)
 
-    delete_teams(jit_token, teams_to_delete)
+    if teams_to_delete:
+        logger.info(f"Deleting {len(teams_to_delete)} teams: {teams_to_delete}")
+        delete_teams(jit_token, teams_to_delete)
 
 
 if __name__ == '__main__':

src/shared/clients/github.py

@@ -15,6 +15,7 @@
 
 def get_teams_from_github_topics() -> Organization:
     try:
+        logger.info(f"Trying to communicate with Github to get information from Org: {ORGANIZATION_NAME}")
         # Create a GitHub instance using the token
         github = Github(GITHUB_TOKEN)
 
@@ -48,7 +49,8 @@ def get_teams_from_github_topics() -> Organization:
                     # Add the team template to the teams dictionary
                     teams[topic] = team_template
 
+        logger.info(f"Retrieved ({len(teams.keys())}) teams {list(teams.keys())} from GitHub successfully.")
         return Organization(teams=list(teams.values()))
     except Exception as e:
-        logger.error(f"Failed to retrieve teams: {str(e)}")
+        logger.error(f"Failed to retrieve teams from GitHub: {str(e)}")
         return Organization(teams=[])

src/shared/clients/jit.py

@@ -27,6 +27,7 @@ def list_assets(token: str) -> List[Asset]:
             # Parse the response JSON
             assets = response.json()
 
+            logger.info("Retrieved assets successfully.")
             return [Asset(**asset) for asset in assets]
         else:
             logger.error(f"Failed to retrieve assets. Status code: {response.status_code}")
@@ -64,6 +65,7 @@ def _handle_resoponse(response, existing_teams):
                     logger.error(f"Failed to retrieve teams. Status code: {response.status_code}, {response.text}")
                     return []
 
+            logger.info("Retrieved existing teams successfully.")
             return [TeamObject(**team) for team in existing_teams]
         else:
             logger.error(f"Failed to retrieve teams. Status code: {response.status_code}, {response.text}")
@@ -101,9 +103,7 @@ def delete_teams(token, team_names):
 def create_teams(token, teams_to_create):
     try:
         url = f"{JIT_API_ENDPOINT}/teams/"
-        headers = {
-            "Authorization": f"Bearer {token}",
-        }
+        headers = get_request_headers(token)
         for team_name in teams_to_create:
             payload = {
                 "name": team_name
@@ -118,12 +118,17 @@ def create_teams(token, teams_to_create):
         logger.error(f"Failed to create teams: {str(e)}")
 
 
+def get_request_headers(token):
+    headers = {
+        "Authorization": f"Bearer {token}",
+    }
+    return headers
+
+
 def add_teams_to_asset(token, asset: Asset, teams: List[str]):
     try:
         url = f"{JIT_API_ENDPOINT}/assets/{asset.asset_id}"
-        headers = {
-            "Authorization": f"Bearer {token}",
-        }
+        headers = get_request_headers(token)
         payload = {
             "teams": teams
         }