gcp-platforms-auto 0.8.1__tar.gz → 0.8.3__tar.gz

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gcp_platforms_auto
-Version: 0.8.1
+Version: 0.8.3
 Summary: A brief description of your package
 Author-email: ofir4858 <ofirshasha10@gmail.com>
 License: MIT
@@ -13,7 +13,6 @@ Requires-Dist: requests
 Requires-Dist: pyjwt
 Requires-Dist: google-cloud-logging
 Requires-Dist: google-cloud-asset
-Requires-Dist: google-cloud-resource-manager
 Requires-Dist: gitpython
 Requires-Dist: sqlalchemy
 Requires-Dist: pg8000

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/gcp_platforms_auto/iam.py

@@ -1,8 +1,9 @@
 """IAM access management utilities for GCP."""
 
 import logging
+import os
 import google.cloud.logging
-from google.cloud import asset_v1, resourcemanager_v3
+from google.cloud import asset_v1
 from typing import Optional
 
 # Initialize Google Cloud Logging
@@ -106,47 +107,39 @@ def check_user_has_role_in_project(
         raise
 
 
-def _get_all_folders_recursive(parent: str, folders_client) -> list:
-    """
-    Recursively get all folders under a parent (organization or folder).
-    
-    Args:
-        parent: Parent resource (e.g., 'organizations/123' or 'folders/456')
-        folders_client: FoldersClient instance
-        
-    Returns:
-        list: List of all folder resource names
-    """
-    all_folders = []
-    
-    try:
-        request = resourcemanager_v3.ListFoldersRequest(parent=parent)
-        folders = folders_client.list_folders(request=request)
-        
-        for folder in folders:
-            folder_name = folder.name  # Format: folders/123
-            all_folders.append(folder_name)
-            logger.info(f"Found folder: {folder_name}")
-            
-            # Recursively get subfolders
-            subfolders = _get_all_folders_recursive(folder_name, folders_client)
-            all_folders.extend(subfolders)
-            
-    except Exception as e:
-        logger.warning(f"Error listing folders under {parent}: {e}")
-    
-    return all_folders
+def _get_all_service_projects(base_paths, prefix):
+    service_projects = []
+
+    for path in base_paths:
+        logger.info(f"[INFO] Searching for projects under: {path}")
+
+        for root, _, _ in os.walk(path):
+            if root == path:
+                continue
+
+            for _, _, projects in os.walk(root):
+                for project in projects:
+                    if not project.endswith(".yaml"):
+                        continue
+                    if project.startswith(prefix):
+                        service_projects.append(project.split('.')[0])
+                    else:
+                        service_projects.append(f"{prefix}-{project.split('.')[0]}")
+
+    return list(set(service_projects))
 
 
 def get_projects_with_role(
     user_email: str,
     organization_id: str,
     role: str = "roles/owner",
-    expand_groups: bool = True
+    expand_groups: bool = True,
+    project_prefix: Optional[str] = None,
+    projects_base_paths: Optional[list] = []
 ) -> list:
     """
     Get all projects where a user or service account has a specific role.
-    Searches recursively through all folders in the organization.
+    Searches for all service projects in the organization.
     
     Args:
         user_email: Email of the user or service account to check
@@ -168,27 +161,12 @@ def get_projects_with_role(
     logger.info(f"Fetching all projects in organization {organization_id} (including folders)")
     
     try:
-        # Initialize clients
-        projects_client = resourcemanager_v3.ProjectsClient()
-        folders_client = resourcemanager_v3.FoldersClient()
-        
-        # Get all folders recursively
-        org_parent = f"organizations/{organization_id}"
-        all_folders = _get_all_folders_recursive(org_parent, folders_client)
-        logger.info(f"Found {len(all_folders)} folder(s) in organization")
-        
-        # Create list of all parents to search (organization + all folders)
-        parents_to_search = [org_parent] + all_folders
-        
-        # Collect all projects from all parents
-        all_projects = []
-        for parent in parents_to_search:
-            request = resourcemanager_v3.ListProjectsRequest(parent=parent)
-            projects = projects_client.list_projects(request=request)
-            for project in projects:
-                all_projects.append(project.project_id)
+        all_projects = _get_all_service_projects(
+            base_paths=projects_base_paths, 
+            prefix=project_prefix
+        )
         
-        logger.info(f"Found {len(all_projects)} total project(s) across organization and folders")
+        logger.info(f"Found {len(all_projects)} total service project(s) across organization {organization_id}")
         
         # Filter projects where user has the specified role
         matching_projects = []

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/gcp_platforms_auto/models.py

@@ -1,7 +1,6 @@
 import logging
 from pydantic import (
     BaseModel,
-    ValueError,
     field_validator,
 )
 from google.cloud import logging as cloud_logging

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/gcp_platforms_auto.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gcp_platforms_auto
-Version: 0.8.1
+Version: 0.8.3
 Summary: A brief description of your package
 Author-email: ofir4858 <ofirshasha10@gmail.com>
 License: MIT
@@ -13,7 +13,6 @@ Requires-Dist: requests
 Requires-Dist: pyjwt
 Requires-Dist: google-cloud-logging
 Requires-Dist: google-cloud-asset
-Requires-Dist: google-cloud-resource-manager
 Requires-Dist: gitpython
 Requires-Dist: sqlalchemy
 Requires-Dist: pg8000

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/gcp_platforms_auto.egg-info/requires.txt

@@ -2,7 +2,6 @@ requests
 pyjwt
 google-cloud-logging
 google-cloud-asset
-google-cloud-resource-manager
 gitpython
 sqlalchemy
 pg8000

{gcp_platforms_auto-0.8.1 → gcp_platforms_auto-0.8.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gcp_platforms_auto"
-version = "0.8.1"
+version = "0.8.3"
 description = "A brief description of your package"
 readme = "README.md"
 authors = [
@@ -16,7 +16,6 @@ dependencies = [
     "pyjwt",
     "google-cloud-logging",
     "google-cloud-asset",
-    "google-cloud-resource-manager",
     "gitpython",
     "sqlalchemy",
     "pg8000",