iam-policy-validator 1.14.7__py3-none-any.whl → 1.15.1__py3-none-any.whl

iam_validator/commands/query.py

@@ -13,8 +13,30 @@ Examples:
     # Query actions that support wildcard resource
     iam-validator query action --service s3 --resource-type "*"
 
-    # Query action details
+    # Query action details (two equivalent forms)
     iam-validator query action --service s3 --name GetObject
+    iam-validator query action --name s3:GetObject
+
+    # Query multiple actions at once
+    iam-validator query action --name dynamodb:Query dynamodb:Scan s3:GetObject
+    iam-validator query action --service dynamodb --name Query Scan GetItem
+
+    # Query with service prefix in --name (--service not required)
+    iam-validator query action --name iam:CreateRole
+    iam-validator query arn --name s3:bucket
+    iam-validator query condition --name s3:prefix
+
+    # Expand wildcard patterns to matching actions
+    iam-validator query action --name "iam:Get*" --output text
+    iam-validator query action --name "s3:*Object*" --output json
+
+    # Mix exact actions and wildcards
+    iam-validator query action --name dynamodb:Query dynamodb:Create* --output yaml
+
+    # Filter output to specific fields
+    iam-validator query action --name dynamodb:Query dynamodb:Scan --show-condition-keys
+    iam-validator query action --name "s3:Get*" --show-resource-types --output text
+    iam-validator query action --name iam:CreateRole --show-access-level --show-condition-keys
 
     # Query ARN formats for a service
     iam-validator query arn --service s3
@@ -28,15 +50,17 @@ Examples:
     # Query specific condition key
     iam-validator query condition --service s3 --name s3:prefix
 
-  # Text format for simple output (great for piping)
-  iam-validator query action --service s3 --output text | grep Delete
-  iam-validator query action --service iam --access-level write --output text
+    # Text format for simple output (great for piping)
+    iam-validator query action --service s3 --output text | grep Delete
+    iam-validator query action --service iam --access-level write --output text
 """
 
 import argparse
+import asyncio
 import json
 import logging
 import sys
+from collections import defaultdict
 from typing import Any
 
 import yaml
@@ -74,8 +98,32 @@ examples:
   # Query actions that support wildcard resource
   iam-validator query action --service s3 --resource-type "*"
 
-  # Query action details
+  # Query action details (two equivalent forms)
   iam-validator query action --service s3 --name GetObject
+  iam-validator query action --name s3:GetObject
+
+  # Query multiple actions at once
+  iam-validator query action --name dynamodb:Query dynamodb:Scan s3:GetObject
+  iam-validator query action --service dynamodb --name Query Scan GetItem
+
+  # Query with service prefix in --name (--service not required)
+  iam-validator query action --name iam:CreateRole
+  iam-validator query arn --name s3:bucket
+  iam-validator query condition --name s3:prefix
+
+  # Expand wildcard patterns to matching actions
+  iam-validator query action --name "iam:Get*" --output text
+  iam-validator query action --name "s3:*Object*" --output json
+  iam-validator query action --service ec2 --name "Describe*" --output text
+
+  # Mix exact actions and wildcards in one query
+  iam-validator query action --name dynamodb:Query dynamodb:Create* --output yaml
+  iam-validator query action --name s3:GetObject "s3:Put*" iam:GetRole --output json
+
+  # Filter output to specific fields
+  iam-validator query action --name dynamodb:Query dynamodb:Scan --show-condition-keys
+  iam-validator query action --name "s3:Get*" --show-resource-types --output text
+  iam-validator query action --name iam:CreateRole --show-access-level --show-condition-keys
 
   # Query ARN formats for a service
   iam-validator query arn --service s3
@@ -115,12 +163,13 @@ note:
         )
         action_parser.add_argument(
             "--service",
-            required=True,
-            help="AWS service prefix (e.g., s3, iam, ec2)",
+            help="AWS service prefix (e.g., s3, iam, ec2). Optional if --name includes service prefix.",
         )
         action_parser.add_argument(
             "--name",
-            help="Specific action name (e.g., GetObject, CreateUser)",
+            nargs="*",
+            help="Action name(s) - can specify multiple (e.g., GetObject PutObject or s3:GetObject dynamodb:Query). "
+            "Supports wildcards (e.g., 's3:Get*'). If service prefix included, --service is optional.",
         )
         action_parser.add_argument(
             "--access-level",
@@ -142,6 +191,23 @@ note:
             help="Output format (default: json)",
         )
 
+        # Output field filters - when specified, only show these fields
+        action_parser.add_argument(
+            "--show-condition-keys",
+            action="store_true",
+            help="Show only condition keys for each action",
+        )
+        action_parser.add_argument(
+            "--show-resource-types",
+            action="store_true",
+            help="Show only resource types for each action",
+        )
+        action_parser.add_argument(
+            "--show-access-level",
+            action="store_true",
+            help="Show only access level for each action",
+        )
+
         # ARN query
         arn_parser = subparsers.add_parser(
             "arn",
@@ -150,12 +216,11 @@ note:
         )
         arn_parser.add_argument(
             "--service",
-            required=True,
-            help="AWS service prefix (e.g., s3, iam, ec2)",
+            help="AWS service prefix (e.g., s3, iam, ec2). Optional if --name includes service prefix.",
         )
         arn_parser.add_argument(
             "--name",
-            help="Specific ARN resource type name (e.g., bucket, role)",
+            help="ARN resource type (e.g., bucket or s3:bucket). If service prefix included, --service is optional.",
         )
         arn_parser.add_argument(
             "--list-arn-types",
@@ -177,12 +242,11 @@ note:
         )
         condition_parser.add_argument(
             "--service",
-            required=True,
-            help="AWS service prefix (e.g., s3, iam, ec2)",
+            help="AWS service prefix (e.g., s3, iam, ec2). Optional if --name includes service prefix.",
         )
         condition_parser.add_argument(
             "--name",
-            help="Specific condition key name (e.g., s3:prefix, iam:PolicyArn)",
+            help="Condition key (e.g., prefix or s3:prefix). If service prefix included, --service is optional.",
         )
         condition_parser.add_argument(
             "--output",
@@ -191,15 +255,142 @@ note:
             help="Output format (default: json)",
         )
 
+    def _parse_service_and_name(
+        self, args: argparse.Namespace, query_type: str
+    ) -> tuple[str, str | None]:
+        """Parse service and name from arguments (single name - for ARN/condition queries).
+
+        Extracts service from --name if it contains a colon (e.g., 's3:GetObject').
+        If --name has a service prefix, it overrides --service.
+
+        Args:
+            args: Parsed arguments with optional service and name attributes.
+            query_type: Type of query ('action', 'arn', 'condition') for error messages.
+
+        Returns:
+            Tuple of (service, name) where name may be None.
+
+        Raises:
+            ValueError: If neither --service nor service prefix in --name is provided.
+        """
+        service = getattr(args, "service", None)
+        raw_name = getattr(args, "name", None)
+
+        # Handle list from nargs='*' - take first element for non-action queries
+        if isinstance(raw_name, list):
+            name = raw_name[0] if raw_name else None
+        else:
+            name = raw_name
+
+        # If name contains a colon, extract service from it
+        if name and ":" in name:
+            parts = name.split(":", 1)
+            extracted_service = parts[0]
+            extracted_name = parts[1] if len(parts) > 1 else None
+
+            # Use extracted service if --service wasn't provided
+            if not service:
+                service = extracted_service
+            # If both provided, prefer the one in --name for consistency
+            elif service != extracted_service:
+                logger.warning(
+                    f"Service from --name '{extracted_service}' differs from --service '{service}'. "
+                    f"Using '{extracted_service}' from --name."
+                )
+                service = extracted_service
+
+            name = extracted_name
+
+        # Validate that we have a service
+        if not service:
+            raise ValueError(
+                f"--service is required when --name doesn't include service prefix. "
+                f"Use '--service <service>' or '--name <service>:<{query_type}>'"
+            )
+
+        return service, name
+
+    def _parse_action_names(self, args: argparse.Namespace) -> list[tuple[str, str | None, bool]]:
+        """Parse multiple action names from arguments.
+
+        Handles the --name argument which can contain multiple action names,
+        each optionally with a service prefix. Detects wildcard patterns.
+
+        Args:
+            args: Parsed arguments with optional service and name attributes.
+
+        Returns:
+            List of (service, action_name, is_wildcard) tuples.
+            action_name is None when listing all actions for a service.
+
+        Raises:
+            ValueError: If service cannot be determined for an action.
+        """
+        default_service = getattr(args, "service", None)
+        raw_names = getattr(args, "name", None)
+
+        # Normalize names to a list (handles both string and list inputs)
+        if raw_names is None:
+            names: list[str] = []
+        elif isinstance(raw_names, str):
+            # Single string (backwards compatibility with tests)
+            names = [raw_names]
+        else:
+            # List from nargs='*'
+            names = list(raw_names)
+
+        # If no names provided, return service with None name (list all)
+        if not names:
+            if not default_service:
+                raise ValueError(
+                    "--service is required when --name is not provided. "
+                    "Use '--service <service>' to list all actions."
+                )
+            return [(default_service, None, False)]
+
+        results: list[tuple[str, str | None, bool]] = []
+        for name in names:
+            service = default_service
+            action_name: str | None = name
+
+            # If name contains a colon, extract service from it
+            if ":" in name:
+                parts = name.split(":", 1)
+                service = parts[0]
+                action_name = parts[1] if parts[1] else None
+
+            # Validate that we have a service
+            if not service:
+                raise ValueError(
+                    f"--service is required for '{name}' (no service prefix). "
+                    f"Use '--service <service>' or '<service>:{name}'"
+                )
+
+            # Detect if this is a wildcard pattern
+            is_wildcard = action_name is not None and ("*" in action_name or "?" in action_name)
+
+            results.append((service, action_name, is_wildcard))
+
+        return results
+
     async def execute(self, args: argparse.Namespace) -> int:
         """Execute query command."""
         try:
             async with AWSServiceFetcher(prefetch_common=False) as fetcher:
                 if args.query_type == "action":
+                    # Use new multi-action parsing for action queries
                     result = await self._query_action_table(fetcher, args)
                 elif args.query_type == "arn":
+                    # Parse service and name for ARN queries (single name)
+                    service, name = self._parse_service_and_name(args, args.query_type)
+                    args.service = service
+                    args.name = name
                     result = await self._query_arn_table(fetcher, args)
                 elif args.query_type == "condition":
+                    # Parse service and name for condition queries (single name)
+                    service, name = self._parse_service_and_name(args, args.query_type)
+                    args.service = service
+                    args.name = name
                     result = await self._query_condition_table(fetcher, args)
                 else:
                     logger.error(f"Unknown query type: {args.query_type}")
@@ -242,44 +433,253 @@ note:
         # Default to read if none of the above
         return "read"
 
+    def _get_field_filters(self, args: argparse.Namespace) -> set[str] | None:
+        """Extract field filters from arguments.
+
+        Returns:
+            Set of fields to include, or None if no filters specified (show all).
+            Valid fields: 'condition_keys', 'resource_types', 'access_level'
+        """
+        fields: set[str] = set()
+
+        if getattr(args, "show_condition_keys", False):
+            fields.add("condition_keys")
+        if getattr(args, "show_resource_types", False):
+            fields.add("resource_types")
+        if getattr(args, "show_access_level", False):
+            fields.add("access_level")
+
+        return fields if fields else None
+
     async def _query_action_table(
         self, fetcher: AWSServiceFetcher, args: argparse.Namespace
     ) -> dict[str, Any] | list[dict[str, Any]]:
-        """Query action table."""
-        service_detail = await fetcher.fetch_service_by_name(args.service)
+        """Query action table with support for multiple actions and wildcards.
 
-        # If specific action requested, return its details
-        if args.name:
-            action_name = args.name
-            # Try case-insensitive lookup
-            action_detail = None
-            for key, detail in service_detail.actions.items():
-                if key.lower() == action_name.lower():
-                    action_detail = detail
-                    break
+        Optimized for speed by:
+        - Grouping actions by service to minimize API calls
+        - Fetching service definitions in parallel
+        - Expanding wildcards in parallel
+        - Pre-building lowercase lookup dicts for O(1) case-insensitive matching
+        """
+        # Parse all action names
+        parsed_actions = self._parse_action_names(args)
+
+        # Get field filters if any
+        fields = self._get_field_filters(args)
+
+        # Check if this is a "list all" query (single service, no name)
+        if len(parsed_actions) == 1 and parsed_actions[0][1] is None:
+            service = parsed_actions[0][0]
+            return await self._query_all_actions_for_service(fetcher, service, args)
+
+        # Group actions by service for efficient batching
+        service_actions: dict[str, list[tuple[str | None, bool]]] = defaultdict(list)
+        for service, action_name, is_wildcard in parsed_actions:
+            service_actions[service].append((action_name, is_wildcard))
+
+        # Fetch all service definitions in parallel
+        services = list(service_actions.keys())
+        service_details = await asyncio.gather(
+            *[fetcher.fetch_service_by_name(s) for s in services],
+            return_exceptions=True,
+        )
 
-            if not action_detail:
-                raise ValueError(f"Action '{args.name}' not found in service '{args.service}'")
+        # Build service -> detail mapping with lowercase lookup dicts for O(1) matching
+        service_detail_map: dict[str, Any] = {}
+        service_lowercase_map: dict[str, dict[str, str]] = {}  # lowercase -> original key
+        for service, detail in zip(services, service_details):
+            if isinstance(detail, BaseException):
+                raise ValueError(f"Failed to fetch service '{service}': {detail}")
+            # detail is now narrowed to ServiceDetail
+            service_detail_map[service] = detail
+            # Pre-build lowercase lookup for O(1) case-insensitive matching
+            service_lowercase_map[service] = {k.lower(): k for k in detail.actions.keys()}
+
+        # Determine if this is a single exact action query (for backwards compatibility)
+        is_single_exact_query = (
+            len(parsed_actions) == 1 and not parsed_actions[0][2]  # Not a wildcard
+        )
 
-            access_level = self._get_access_level(action_detail)
-            description = (
-                action_detail.annotations.get("Description", "N/A")
-                if action_detail.annotations
-                else "N/A"
+        # Collect all wildcard patterns for parallel expansion
+        wildcard_patterns: list[tuple[str, str, str]] = []  # (service, action_name, pattern)
+        exact_actions: list[tuple[str, str]] = []  # (service, action_name)
+
+        for service, actions_list in service_actions.items():
+            for action_name, is_wildcard in actions_list:
+                if action_name is None:
+                    continue
+                if is_wildcard:
+                    wildcard_patterns.append((service, action_name, f"{service}:{action_name}"))
+                else:
+                    exact_actions.append((service, action_name))
+
+        # Expand all wildcards in parallel
+        wildcard_results: dict[str, list[str]] = {}
+        errors: list[str] = []
+
+        if wildcard_patterns:
+            expansions = await asyncio.gather(
+                *[fetcher.expand_wildcard_action(p[2]) for p in wildcard_patterns],
+                return_exceptions=True,
             )
+            for (_svc, _action, pattern), expansion in zip(wildcard_patterns, expansions):
+                if isinstance(expansion, BaseException):
+                    errors.append(f"Failed to expand '{pattern}': {expansion}")
+                    continue
+                # expansion is now narrowed to list[str]
+                wildcard_results[pattern] = sorted(expansion)
+
+        # Process results with deduplication
+        results: list[dict[str, Any]] = []
+        seen_actions: set[str] = set()  # Track seen action names to prevent duplicates
+
+        # Process wildcard expansions
+        for service, action_name, pattern in wildcard_patterns:
+            if pattern not in wildcard_results:
+                continue  # Error was logged above
+            service_detail = service_detail_map[service]
+            for full_action in wildcard_results[pattern]:
+                # Skip duplicates (e.g., s3:Get* s3:Get* or overlapping patterns)
+                if full_action in seen_actions:
+                    continue
+                seen_actions.add(full_action)
+
+                action_part = full_action.split(":")[1] if ":" in full_action else full_action
+                action_detail = service_detail.actions.get(action_part)
+                if action_detail:
+                    results.append(
+                        self._format_action_detail(
+                            service,
+                            action_detail,
+                            simple=args.output == "text" and not fields,
+                            include_service_prefix=True,  # Always include for wildcards
+                            fields=fields,
+                        )
+                    )
+                else:
+                    results.append(
+                        {
+                            "action": full_action,
+                            "access_level": "Unknown",
+                            "description": "N/A",
+                        }
+                    )
+
+        # Process exact actions with O(1) case-insensitive lookup
+        for service, action_name in exact_actions:
+            service_detail = service_detail_map[service]
+            lowercase_map = service_lowercase_map[service]
+
+            # O(1) case-insensitive lookup
+            original_key = lowercase_map.get(action_name.lower())
+            if original_key:
+                # Build full action name for deduplication check
+                full_action = f"{service}:{original_key}"
+                # Skip if already seen (e.g., s3:GetObject with s3:Get* in same query)
+                if full_action in seen_actions:
+                    continue
+                seen_actions.add(full_action)
+
+                action_detail = service_detail.actions[original_key]
+                results.append(
+                    self._format_action_detail(
+                        service,
+                        action_detail,
+                        # Simple mode only for lists without field filters, not single queries
+                        simple=args.output == "text" and not is_single_exact_query and not fields,
+                        # Backwards compat: single exact query returns action without service prefix
+                        include_service_prefix=not is_single_exact_query,
+                        fields=fields,
+                    )
+                )
+            else:
+                errors.append(f"Action '{action_name}' not found in service '{service}'")
+
+        # If there were errors and no results, raise
+        if errors and not results:
+            raise ValueError("\n".join(errors))
+
+        # If there were some errors but also results, log warnings
+        if errors:
+            for error in errors:
+                logger.warning(error)
+
+        # Return single dict if only one result, otherwise list
+        if len(results) == 1:
+            return results[0]
+        return results
+
+    def _format_action_detail(
+        self,
+        service: str,
+        action_detail: Any,
+        simple: bool = False,
+        include_service_prefix: bool = True,
+        fields: set[str] | None = None,
+    ) -> dict[str, Any]:
+        """Format action detail for output.
+
+        Args:
+            service: Service prefix
+            action_detail: Action detail from service definition
+            simple: If True, return minimal format (for text output lists)
+            include_service_prefix: If True, include service prefix in action name
+            fields: Set of fields to include. If None, include all fields.
+                    Valid values: 'condition_keys', 'resource_types', 'access_level'
+
+        Returns:
+            Formatted action dictionary
+        """
+        access_level = self._get_access_level(action_detail)
+        action_name = (
+            f"{service}:{action_detail.name}" if include_service_prefix else action_detail.name
+        )
 
-            return {
-                "service": args.service,
-                "action": action_detail.name,
-                "description": description,
-                "access_level": access_level,
-                "resource_types": [r.get("Name", "*") for r in (action_detail.resources or [])],
-                "condition_keys": action_detail.action_condition_keys or [],
-            }
+        # Simple mode: just action name (for text output of action lists)
+        if simple and not fields:
+            return {"action": f"{service}:{action_detail.name}"}  # Always full name for text output
+
+        # Field filtering mode: action + only requested fields
+        if fields:
+            result: dict[str, Any] = {"action": f"{service}:{action_detail.name}"}
+            if "condition_keys" in fields:
+                result["condition_keys"] = action_detail.action_condition_keys or []
+            if "resource_types" in fields:
+                result["resource_types"] = [
+                    r.get("Name", "*") for r in (action_detail.resources or [])
+                ]
+            if "access_level" in fields:
+                result["access_level"] = access_level
+            return result
+
+        # Full output mode
+        description = (
+            action_detail.annotations.get("Description", "N/A")
+            if action_detail.annotations
+            else "N/A"
+        )
+
+        return {
+            "service": service,
+            "action": action_name,
+            "description": description,
+            "access_level": access_level,
+            "resource_types": [r.get("Name", "*") for r in (action_detail.resources or [])],
+            "condition_keys": action_detail.action_condition_keys or [],
+        }
+
+    async def _query_all_actions_for_service(
+        self, fetcher: AWSServiceFetcher, service: str, args: argparse.Namespace
+    ) -> list[dict[str, Any]]:
+        """Query all actions for a service with optional filters."""
+        service_detail = await fetcher.fetch_service_by_name(service)
+
+        # Get field filters if any
+        fields = self._get_field_filters(args)
 
-        # Filter actions based on criteria
         filtered_actions = []
-        for action_name, action_detail in service_detail.actions.items():
+        for _action_name, action_detail in service_detail.actions.items():
             access_level = self._get_access_level(action_detail)
 
             # Apply filters
@@ -306,19 +706,15 @@ note:
                 if args.condition not in condition_keys:
                     continue
 
-            description = (
-                action_detail.annotations.get("Description", "N/A")
-                if action_detail.annotations
-                else "N/A"
-            )
-
-            # Add to filtered list
+            # Add to filtered list using _format_action_detail for consistency
             filtered_actions.append(
-                {
-                    "action": f"{args.service}:{action_name}",
-                    "access_level": access_level,
-                    "description": description,
-                }
+                self._format_action_detail(
+                    service,
+                    action_detail,
+                    simple=args.output == "text" and not fields,
+                    include_service_prefix=True,
+                    fields=fields,
+                )
             )
 
         return filtered_actions
@@ -376,11 +772,23 @@ note:
         # If specific condition key requested
         if args.name:
             condition_key = None
+            search_name = args.name
+
+            # First try exact match
             for key, ck in service_detail.condition_keys.items():
-                if key.lower() == args.name.lower():
+                if key.lower() == search_name.lower():
                     condition_key = ck
                     break
 
+            # If not found, try with service prefix (condition keys often include it)
+            # e.g., searching for "prefix" in s3 should find "s3:prefix"
+            if not condition_key and ":" not in search_name:
+                full_name = f"{args.service}:{search_name}"
+                for key, ck in service_detail.condition_keys.items():
+                    if key.lower() == full_name.lower():
+                        condition_key = ck
+                        break
+
             if not condition_key:
                 raise ValueError(
                     f"Condition key '{args.name}' not found in service '{args.service}'"
@@ -418,6 +826,7 @@ note:
         Text format outputs only the essential information:
         - For lists of actions: one action per line (service:action format)
         - For specific action: action name followed by key details
+        - For filtered output: action name with only the requested fields
         - For ARNs: one ARN format per line
         - For condition keys: one condition key per line
         """
@@ -428,9 +837,17 @@ note:
 
             first_item = result[0]
             if "action" in first_item:
-                # Action list
+                # Action list - check if we have filtered fields to show
+                has_filtered_fields = any(
+                    k in first_item for k in ("condition_keys", "resource_types", "access_level")
+                )
                 for item in result:
-                    print(item["action"])
+                    if has_filtered_fields:
+                        # Print action with filtered fields
+                        self._print_action_with_fields(item)
+                    else:
+                        # Simple list: just action name
+                        print(item["action"])
             elif "condition_key" in first_item:
                 # Condition key list
                 for item in result:
@@ -447,14 +864,7 @@ note:
         elif isinstance(result, dict):
             # Single item details
             if "action" in result:
-                # Action details
-                print(result["action"])
-                if result.get("resource_types"):
-                    print(f"  Resource types: {', '.join(result['resource_types'])}")
-                if result.get("condition_keys"):
-                    print(f"  Condition keys: {', '.join(result['condition_keys'])}")
-                if result.get("access_level"):
-                    print(f"  Access level: {result['access_level']}")
+                self._print_action_with_fields(result)
 
             elif "resource_type" in result:
                 # ARN details
@@ -473,6 +883,20 @@ note:
                 if result.get("description") and result["description"] != "N/A":
                     print(f"  Description: {result['description']}")
 
+    def _print_action_with_fields(self, item: dict[str, Any]) -> None:
+        """Print action with any available fields.
+
+        Args:
+            item: Action dict with 'action' key and optionally filtered fields.
+        """
+        print(item["action"])
+        if item.get("resource_types"):
+            print(f"  Resource types: {', '.join(item['resource_types'])}")
+        if item.get("condition_keys"):
+            print(f"  Condition keys: {', '.join(item['condition_keys'])}")
+        if item.get("access_level"):
+            print(f"  Access level: {item['access_level']}")
+
 
 # For testing
 if __name__ == "__main__":