arnmatch 2026.1.3__py3-none-any.whl → 2026.2.0__py3-none-any.whl

arnmatch/__init__.py

@@ -1,17 +1,12 @@
 """ARN pattern matching using regex patterns."""
 
-__version__ = "2026.01.3"
+__version__ = "2026.02.0"
 
 import sys
 from dataclasses import dataclass
 from functools import cached_property
 
-from .arn_patterns import (
-    ARN_PATTERNS,
-    AWS_SDK_SERVICES,
-    AWS_SDK_SERVICES_DEFAULT,
-    AWS_SDK_SERVICES_OVERRIDE,
-)
+from .arn_patterns import ARN_PATTERNS, AWS_SDK_SERVICES
 
 # Standard groups that are not resource-specific
 STANDARD_GROUPS = {"Partition", "Region", "Account"}
@@ -34,6 +29,8 @@ class ARN:
     resource_type: str  # canonical type (from AWS docs)
     resource_types: list[str]  # all known names including Resource Explorer
     attributes: dict[str, str]
+    aws_sdk_service: str | None = None
+    cloudformation_resource: str | None = None
 
     @cached_property
     def resource_id(self) -> str:
@@ -93,26 +90,6 @@ class ARN:
         """
         return AWS_SDK_SERVICES.get(self.aws_service, [])
 
-    @cached_property
-    def aws_sdk_service(self) -> str | None:
-        """Get the AWS SDK (boto3) client name for this resource.
-
-        Returns single client name. Checks resource-level overrides first,
-        then falls back to service default. Returns None if no SDK exists.
-        """
-        # Check resource-level override
-        overrides = AWS_SDK_SERVICES_OVERRIDE.get(self.aws_service)
-        if overrides and self.resource_type in overrides:
-            return overrides[self.resource_type]
-
-        # Fall back to service-level
-        sdks = self.aws_sdk_services
-        if len(sdks) == 1:
-            return sdks[0]
-        if len(sdks) > 1:
-            return AWS_SDK_SERVICES_DEFAULT.get(self.aws_service)
-        return None
-
 
 def arnmatch(arn: str) -> ARN:
     """Match ARN against patterns.
@@ -131,17 +108,19 @@ def arnmatch(arn: str) -> ARN:
     if service not in ARN_PATTERNS:
         raise ARNError(f"Unknown service: {service}")
 
-    for regex, type_names in ARN_PATTERNS[service]:
-        match = regex.match(arn)
+    for pattern in ARN_PATTERNS[service]:
+        match = pattern['regex'].match(arn)
         if match:
             return ARN(
                 aws_partition=partition,
                 aws_service=service,
                 aws_region=region,
                 aws_account=account,
-                resource_type=type_names[0],  # canonical
-                resource_types=type_names,  # all known names
+                resource_type=pattern['names'][0],  # canonical
+                resource_types=pattern['names'],  # all known names
                 attributes=match.groupdict(),
+                aws_sdk_service=pattern['sdk'],
+                cloudformation_resource=pattern['cfn'],
             )
 
     raise ARNError(f"No pattern matched ARN: {arn}")
@@ -164,6 +143,7 @@ def main() -> None:
         print(f"resource_type: {result.resource_type}")
         print(f"resource_id: {result.resource_id}")
         print(f"resource_name: {result.resource_name}")
+        print(f"cloudformation_resource: {result.cloudformation_resource}")
     except ARNError as e:
         print(f"Error: {e}", file=sys.stderr)
         sys.exit(1)