add ability to exclude topic wildcards

Author: k-shlomi

Makefile

@@ -13,10 +13,12 @@ configure:
 	read -p "Enter JIT API client ID: " client_id; \
 	read -p "Enter JIT API client secret: " client_secret; \
 	read -p "Enter GitHub Personal token (PAT): " github_token; \
+	read -p "Enter topic wildcards to exclude(example: *dev*): " topics_to_exclude; \
 	echo "ORGANIZATION_NAME=$$org_name" > .env; \
 	echo "JIT_CLIENT_ID=$$client_id" >> .env; \
 	echo "JIT_CLIENT_SECRET=$$client_secret" >> .env; \
 	echo "GITHUB_API_TOKEN=$$github_token" >> .env
+	echo "TEAM_WILDCARD_TO_EXCLUDE=topics_to_exclude" >> .env
 
 create-teams:
 	source venv-jit/bin/activate && \

src/scripts/create_teams.py

@@ -57,7 +57,7 @@ def parse_input_file() -> Organization:
         sys.exit(1)
 
 
-def update_assets(token, assets, organization):
+def update_assets(token, assets: List[Asset], organization):
     """
     Update the assets with the teams specified in the organization.
 
@@ -71,11 +71,20 @@ def update_assets(token, assets, organization):
     logger.info("Updating assets.")
 
     asset_to_team_map = get_teams_for_assets(organization)
+    existing_teams: List[str] = [t.name for t in get_existing_teams(token)]
     for asset in assets:
         teams_to_update = asset_to_team_map.get(asset.asset_name, [])
         if teams_to_update:
+            excluded_teams = get_different_items_in_lists(teams_to_update, existing_teams)
+            if excluded_teams:
+                logger.info(f"Excluding team(s) {excluded_teams} for asset '{asset.asset_name}'")
+                teams_to_update = list(set(teams_to_update) - set(excluded_teams))
             logger.info(f"Syncing team(s) {teams_to_update} to asset '{asset.asset_name}'")
             add_teams_to_asset(token, asset, teams_to_update)
+        else:
+            if asset.tags and "team" in [t.name for t in asset.tags]:
+                logger.info(f"Removing all teams from asset '{asset.asset_name}'")
+                add_teams_to_asset(token, asset, teams_to_update)
 
 
 def get_teams_to_create(topic_names: List[str], existing_team_names: List[str]) -> List[str]:
@@ -132,6 +141,7 @@ def get_desired_teams(assets: List[Asset], organization: Organization) -> List[s
     for team_name in desired_teams:
         exclude_team = False
         for wildcard in wildcards_to_exclude:
+            wildcard = wildcard.strip().strip("*")
             if wildcard and wildcard in team_name:
                 exclude_team = True
                 break

src/shared/models.py

@@ -29,6 +29,11 @@ class TeamStructure(BaseModel):
     resources: List[Resource] = []
 
 
+class Tag(BaseModel):
+    name: str
+    value: str
+
+
 class Asset(BaseModel):
     asset_id: str
     tenant_id: str
@@ -41,6 +46,7 @@ class Asset(BaseModel):
     is_archived: Optional[bool] = False
     created_at: str
     modified_at: str
+    tags: Optional[List[Tag]] = []
 
 
 class Organization(BaseModel):

tests/scripts/test_create_teams.py

@@ -80,6 +80,7 @@ def test_parse_input_file__with_invalid_json(invalid_file, json_data, should_rai
 
 @pytest.fixture
 def data():
+    Faker.seed(10)
     num_objects = 10
     organization = Organization(teams=TeamStructureFactory.batch(num_objects))
     assets = AssetFactory.batch(num_objects, asset_name=fake.word())
@@ -95,7 +96,7 @@ def data():
 @pytest.mark.parametrize(
     "label, existing_teams_indexes, asset_indexes, len_expected_teams_to_delete",
     [
-        ("No teams to create and no teams to delete", [], [], 0),
+        ("No teams no assets", [], [], 0),
         ("No teams to create and no teams to delete", "all", "all", 0),
         ("No teams to create and teams to delete", "all", [0, 5], 8),
         ("Teams to create and no teams to delete", [0, 5], "all", 0),

tests/shared/test_clients.py

@@ -1,8 +1,11 @@
+import os
+
 import pytest
 
 from src.shared.clients.github import get_teams_from_github_topics
 from src.shared.clients.jit import list_assets, get_existing_teams, create_teams, add_teams_to_asset, delete_teams, \
-    get_jit_jwt_token, JIT_API_ENDPOINT
+    get_jit_jwt_token
+from src.shared.consts import JIT_DEFAULT_API_ENDPOINT
 from src.shared.models import TeamAttributes, Asset, Organization, TeamStructure, Resource
 
 
@@ -90,7 +93,7 @@ def test_get_jwt_token(status_code, expected_result, mocker):
     token = get_jit_jwt_token()
 
     requests_post_mock.assert_called_once_with(
-        f"{JIT_API_ENDPOINT}/authentication/login",
+        f"{os.getenv('JIT_API_ENDPOINT', JIT_DEFAULT_API_ENDPOINT)}/authentication/login",
         json={"clientId": None, "secret": None},
         headers={"accept": "application/json", "content-type": "application/json"}
     )