cloudconsolelink 3.0.2__tar.gz → 4.0.0__tar.gz

{cloudconsolelink-3.0.2/cloudconsolelink.egg-info → cloudconsolelink-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudconsolelink
-Version: 3.0.2
+Version: 4.0.0
 Summary: Generate console links for cloud resources
 Home-page: https://github.com/Cloudanix/cloud-console-links
 Maintainer: Cloudanix

{cloudconsolelink-3.0.2 → cloudconsolelink-4.0.0}/cloudconsolelink/__init__.py

@@ -1,2 +1,2 @@
 # version of the module
-__version__ = "3.0.2"
+__version__ = "4.0.0"

{cloudconsolelink-3.0.2 → cloudconsolelink-4.0.0}/cloudconsolelink/clouds/aws/__init__.py

@@ -1,18 +1,48 @@
 import logging
+import re
 import urllib.parse
 from typing import Dict
 
 from .errors import ARNTooShortError, InvalidARNError, InvalidPartitionError, InvalidServiceError
-from .links import get_links
+from .links import HOME_URLS, get_links
 
 logger = logging.getLogger(__name__)
 
-SERVICE_HOME_OVERRIDES = {
-    "elasticloadbalancing": "https://{region}.{console}/ec2/home?region={region}#LoadBalancers:",
-    "logs": "https://{region}.{console}/cloudwatch/home?region={region}#logsV2:log-groups",
-    "sns": "https://{region}.{console}/sns/v3/home?region={region}",
-    "sqs": "https://{region}.{console}/sqs/v2/home?region={region}",
-}
+_EXPR_RE = re.compile(r"\{([^}]+)\}")
+
+
+def _render(template: str, data: Dict, arn: str = "") -> str:
+    """Render a link template without eval.
+
+    Templates in links.py use patterns like {data.get("region", "")} and {arn}.
+    We substitute each {expr} by looking it up in a pre-built context dict after
+    stripping all internal whitespace (backslash-continuation lines in the source
+    produce spaces inside expressions). Unknown expressions render as empty string.
+    """
+    resource = str(data.get("resource", ""))
+    ctx: Dict[str, str] = {
+        'data.get("region","")': str(data.get("region", "")),
+        'data.get("console","")': str(data.get("console", "")),
+        'data.get("resource","")': resource,
+        'data.get("account","")': str(data.get("account", "")),
+        'data.get("service","")': str(data.get("service", "")),
+        'get_arn_string(data)': get_arn_string(data),
+        'get_resource_path(data.get("resource",""))': get_resource_path(resource),
+        "arn": arn,
+        "region": str(data.get("region", "")),
+        "console": str(data.get("console", "")),
+        "resource": resource,
+        "account": str(data.get("account", "")),
+        "service": str(data.get("service", "")),
+    }
+
+    def _sub(m: re.Match) -> str:
+        expr = re.sub(r"\s+", "", m.group(1))  # collapse whitespace from line continuations
+        if expr not in ctx:
+            logger.debug("Unknown template expression %r", expr)
+        return ctx.get(expr, "")
+
+    return _EXPR_RE.sub(_sub, template).replace(" ", "")
 
 
 def get_console(partition: str) -> str:
@@ -62,11 +92,9 @@ def get_service_home_link(data: Dict) -> str:
     if not service or not console:
         return ""
 
-    if region and service in SERVICE_HOME_OVERRIDES:
-        return SERVICE_HOME_OVERRIDES[service].format(
-            console=console,
-            region=urllib.parse.quote(region),
-        )
+    home_template = HOME_URLS.get(service)
+    if region and home_template:
+        return _render(home_template, data)
 
     host = f"{region}.{console}" if region else console
     path = f"/{service}/home" if region else f"/{service}"
@@ -83,7 +111,7 @@ class AWSLinker:
         tokens = arn.split(":")
 
         if len(tokens) < 5:
-            logger.error(f"AWS ARN {arn} is too short")
+            logger.debug(f"AWS ARN {arn} is too short")
             raise ARNTooShortError(f"AWS ARN {arn} is too short")
 
         data: dict[str, str | bool] = {
@@ -101,7 +129,7 @@ class AWSLinker:
 
         console = get_console(str(data.get("partition", "")))
         if not console:
-            logger.error(
+            logger.debug(
                 f"AWS ARN {arn} has invalid partition (Valid Partitions: aws, aws-us-gov, aws-cn)",
             )
             raise InvalidPartitionError(
@@ -112,17 +140,17 @@ class AWSLinker:
         links = get_links()
 
         if data["prefix"] != "arn":
-            logger.error(f"Invalid AWS ARN {arn}")
+            logger.debug(f"Invalid AWS ARN {arn}")
             raise InvalidARNError(f"Invalid AWS ARN {arn}")
 
         if data["service"] not in links:
-            logger.error(f"AWS service {data['service']} unknown")
+            logger.debug(f"AWS service {data['service']} unknown")
             raise InvalidServiceError(f"AWS service {data['service']} unknown")
 
         if not resource_tokens or resource_tokens == [""]:
             return get_service_home_link(data)
 
-        if len(resource_tokens) > 1:
+        if len(resource_tokens) > 1 and "/" not in resource_tokens[0]:
             data["resourceType"] = resource_tokens[0]
             data["resource"] = ":".join(resource_tokens[1:])
             data["hasPath"] = False
@@ -138,40 +166,26 @@ class AWSLinker:
             data["hasPath"] = False
 
         else:  # pragma: no cover – defensive; unreachable via str.split
-            logger.error(f"Invalid AWS ARN {arn}")
+            logger.debug(f"Invalid AWS ARN {arn}")
             raise InvalidARNError(f"Invalid AWS ARN {arn}")
 
         if not links.get(data["service"], {}).get(data["resourceType"], None):
-            logger.error(
+            logger.debug(
                 f"AWS service {data['service']} resource type {data['resourceType']} not supported",
             )
             return get_service_home_link(data)
 
-        template_context = {
-            "arn": arn,
-            "data": data,
-            "get_arn_string": get_arn_string,
-            "get_qualifiers": get_qualifiers,
-            "get_resource_path": get_resource_path,
-        }
         data["resource"] = urllib.parse.quote(str(data["resource"]))
-        return eval(
-            f"f'{links[data['service']][data['resourceType']]}'",
-            {"__builtins__": {}},
-            template_context,
-        ).replace(
-            " ",
-            "",
-        )
+        return _render(links[data["service"]][data["resourceType"]], data, arn)
 
 
 __all__ = [
     "ARNTooShortError",
     "AWSLinker",
+    "HOME_URLS",
     "InvalidARNError",
     "InvalidPartitionError",
     "InvalidServiceError",
-    "SERVICE_HOME_OVERRIDES",
     "get_arn_string",
     "get_console",
     "get_qualifiers",

{cloudconsolelink-3.0.2 → cloudconsolelink-4.0.0}/cloudconsolelink/clouds/aws/links.py

@@ -1,5 +1,16 @@
 from typing import Dict
 
+# Explicit home page URL for each service where the computed default is wrong.
+# Template syntax matches links below: eval'd as an f-string with {"data": data}.
+# Add an entry here whenever a service's console home does not follow the pattern
+# https://{region}.console.aws.amazon.com/{service}/home?region={region}.
+HOME_URLS: Dict[str, str] = {
+    "elasticloadbalancing": 'https://{data.get("region", "")}.{data.get("console", "")}/ec2/home?region={data.get("region", "")}#LoadBalancers:',
+    "logs": 'https://{data.get("region", "")}.{data.get("console", "")}/cloudwatch/home?region={data.get("region", "")}#logsV2:log-groups',
+    "sns": 'https://{data.get("region", "")}.{data.get("console", "")}/sns/v3/home?region={data.get("region", "")}',
+    "sqs": 'https://{data.get("region", "")}.{data.get("console", "")}/sqs/v2/home?region={data.get("region", "")}',
+}
+
 
 def get_links() -> Dict:
     links = {

{cloudconsolelink-3.0.2 → cloudconsolelink-4.0.0}/cloudconsolelink/clouds/azure/__init__.py

@@ -13,7 +13,7 @@ class AzureLinker:
         iam_entity_type: str = "",
     ) -> str:
         if not primary_ad_domain_name and not iam_entity_type:
-            logger.error(
+            logger.debug(
                 "For IAM entity required `iam_entity_type` and for other entity required `primary_ad_domain_name`",
             )
             raise ValueError("Invalid parameters provided")
@@ -29,12 +29,11 @@ class AzureLinker:
         }
 
         if iam_entity_type and id and iam_entities.get(iam_entity_type):
-            if iam_entity_type == "role" and primary_ad_domain_name:
-                return eval(f"f'{iam_entities[iam_entity_type]}'").replace(" ", "")
-            elif iam_entity_type == "service_principal" and app_id:
-                return eval(f"f'{iam_entities[iam_entity_type]}'").replace(" ", "")
-            else:
-                return eval(f"f'{iam_entities[iam_entity_type]}'").replace(" ", "")
+            return (
+                iam_entities[iam_entity_type]
+                .format(id=id, primary_ad_domain_name=primary_ad_domain_name, app_id=app_id)
+                .replace(" ", "")
+            )
 
         elif primary_ad_domain_name and id:
             if id.startswith("https"):
@@ -48,5 +47,5 @@ class AzureLinker:
             return f"https://portal.azure.com/#@{primary_ad_domain_name}/resource{id}/overview"
 
         else:
-            logger.error("entity id required")
+            logger.debug("entity id required")
             raise ValueError("Invalid parameters provided")

{cloudconsolelink-3.0.2 → cloudconsolelink-4.0.0}/cloudconsolelink/clouds/gcp/__init__.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict
 
-from .links import Resource
+from .links import Resource, SERVICE_HOME_MAP
 
 logger = logging.getLogger(__name__)
 
@@ -212,6 +212,38 @@ class GCPLinker:
             "vpc_home": resource.vpc_home,
             "apigateway_home": resource.apigateway_home,
             "cloudrun_home": resource.cloudrun_home,
+            "compute_home": resource.compute_home,
+            "storage_home": resource.storage_home,
+            "bigtable_home": resource.bigtable_home,
+            "cloudfunction_home": resource.cloudfunction_home,
+            "kms_home": resource.kms_home,
+            "gke_home": resource.gke_home,
+            "sql_home": resource.sql_home,
+            "iam_home": resource.iam_home,
+            "firestore_home": resource.firestore_home,
+            "pubsub_home": resource.pubsub_home,
+            "logging_home": resource.logging_home,
+            "dataproc_home": resource.dataproc_home,
+            "monitoring_home": resource.monitoring_home,
+            "cloud_armor_home": resource.cloud_armor_home,
+            "cloud_build_home": resource.cloud_build_home,
+            "cloud_composer_home": resource.cloud_composer_home,
+            "cloud_scheduler_home": resource.cloud_scheduler_home,
+            "cloud_tasks_home": resource.cloud_tasks_home,
+            "spanner_home": resource.spanner_home,
+            "artifact_registry_home": resource.artifact_registry_home,
+            "secret_manager_home": resource.secret_manager_home,
+            "memorystore_home": resource.memorystore_home,
+            "vpn_home": resource.vpn_home,
+            "vertex_ai_home": resource.vertex_ai_home,
+            "workflows_home": resource.workflows_home,
+            "eventarc_home": resource.eventarc_home,
+            "alloydb_home": resource.alloydb_home,
+            "filestore_home": resource.filestore_home,
+            "cloud_deploy_home": resource.cloud_deploy_home,
+            "cloud_ids_home": resource.cloud_ids_home,
+            "dialogflow_home": resource.dialogflow_home,
+            "cloud_endpoints_home": resource.cloud_endpoints_home,
             "cloud_armor_policy": resource.cloud_armor_policy,
             "cloud_build_trigger": resource.cloud_build_trigger,
             "cloud_composer_environment": resource.cloud_composer_environment,
@@ -299,5 +331,10 @@ class GCPLinker:
         if resource_name in resources_list:
             return resources[resource_name](**param).replace(" ", "")  # type: ignore
 
-        logger.error(f"Invalid resource_name - {resource_name}")
+        home_name = SERVICE_HOME_MAP.get(resource_name)
+        if home_name and home_name in resources:
+            logger.debug(f"resource_name {resource_name!r} not found, falling back to {home_name!r}")
+            return resources[home_name](**param).replace(" ", "")  # type: ignore
+
+        logger.debug(f"Invalid resource_name - {resource_name}")
         raise ValueError("Invalid parameters provided")