cloudconsolelink 1.0.25__tar.gz → 2.0.0__tar.gz

{cloudconsolelink-1.0.25 → cloudconsolelink-2.0.0}/PKG-INFO

@@ -1,18 +1,24 @@
 Metadata-Version: 2.4
 Name: cloudconsolelink
-Version: 1.0.25
+Version: 2.0.0
 Summary: Generate console links for cloud resources
 Home-page: https://github.com/Cloudanix/cloud-console-links
 Maintainer: Cloudanix
-Maintainer-email: ganesh@cloudanix.com
-License: apache2
+Maintainer-email: support@cloudanix.com
+License: Apache-2.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: pre-commit~=4.2; extra == "dev"
+Requires-Dist: pytest~=8.3; extra == "dev"
+Requires-Dist: pytest-cov==2.11; extra == "dev"
+Requires-Dist: pytest-mock~=3.14; extra == "dev"
+Requires-Dist: types-PyYAML~=6.0; extra == "dev"
+Requires-Dist: types-requests~=2.32; extra == "dev"
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
@@ -21,6 +27,7 @@ Dynamic: license
 Dynamic: license-file
 Dynamic: maintainer
 Dynamic: maintainer-email
+Dynamic: provides-extra
 Dynamic: summary
 
 # What is cloudconsolelink?
@@ -29,6 +36,22 @@ This project for generate console links for AWS, GCP and Azure cloud resources
 # Install
 Run ```pip install cloudconsolelink``` to install our code
 
+For local development, install the package with dev extras:
+
+```bash
+pip install -e '.[dev]'
+```
+
+Verification shortcuts:
+
+```bash
+make test
+make coverage
+make test-arn
+make test-aws-links
+make check
+```
+
 # Usage
 
 ### Import Package

{cloudconsolelink-1.0.25 → cloudconsolelink-2.0.0}/README.md

@@ -4,6 +4,22 @@ This project for generate console links for AWS, GCP and Azure cloud resources
 # Install
 Run ```pip install cloudconsolelink``` to install our code
 
+For local development, install the package with dev extras:
+
+```bash
+pip install -e '.[dev]'
+```
+
+Verification shortcuts:
+
+```bash
+make test
+make coverage
+make test-arn
+make test-aws-links
+make check
+```
+
 # Usage
 
 ### Import Package

{cloudconsolelink-1.0.25 → cloudconsolelink-2.0.0}/cloudconsolelink/__init__.py

@@ -1,2 +1,2 @@
 # version of the module
-__version__ = "1.0.25"
+__version__ = "2.0.0"

{cloudconsolelink-1.0.25 → cloudconsolelink-2.0.0}/cloudconsolelink/clouds/aws/__init__.py

@@ -18,18 +18,24 @@ def get_console(partition: str) -> str:
 
 def get_arn_string(data: Dict) -> str:
     if not data.get("resourceType", ""):
-        return f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:\
-            {data.get('region', '')}:{data.get('account', '')}:{data.get('resource', '')}"
+        return (
+            f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:"
+            f"{data.get('region', '')}:{data.get('account', '')}:{data.get('resource', '')}"
+        )
 
     elif data.get("hasPath", ""):
-        return f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:\
-            {data.get('region', '')}:{data.get('account', '')}:{data.get('resource_type', '')}\
-                /{data.get('resource', '')}"
+        return (
+            f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:"
+            f"{data.get('region', '')}:{data.get('account', '')}:{data.get('resourceType', '')}"
+            f"/{data.get('resource', '')}"
+        )
 
     else:
-        return f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:\
-            {data.get('region', '')}:{data.get('account', '')}:{data.get('resource_type', '')}:\
-                {data.get('resource', '')}"
+        return (
+            f"{data.get('prefix', '')}:{data.get('partition', '')}:{data.get('service', '')}:"
+            f"{data.get('region', '')}:{data.get('account', '')}:{data.get('resourceType', '')}:"
+            f"{data.get('resource', '')}"
+        )
 
 
 def get_qualifiers(resource: str) -> list[str]:
@@ -60,8 +66,8 @@ class AWSLinker:
             }
 
         except IndexError:
-            logger.error(f"AWS ARN {arn} is to short")
-            raise ValueError(f"AWS ARN {arn} is to short")
+            logger.error(f"AWS ARN {arn} is too short")
+            raise ValueError(f"AWS ARN {arn} is too short")
 
         if len(tokens) > 6:
             data["resourceType"] = tokens[5]
@@ -113,8 +119,19 @@ class AWSLinker:
             # raise ValueError(f"AWS service {data['service']} resource type {data['resourceType']} not supported")
 
         else:
+            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']]}'").replace(
+            return eval(
+                f"f'{links[data['service']][data['resourceType']]}'",
+                {"__builtins__": {}},
+                template_context,
+            ).replace(
                 " ",
                 "",
             )