cycode 1.10.8.dev2__tar.gz → 1.10.8.dev4__tar.gz

{cycode-1.10.8.dev2 → cycode-1.10.8.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.10.8.dev2
+Version: 1.10.8.dev4
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

cycode-1.10.8.dev4/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.10.8.dev4'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.10.8.dev2 → cycode-1.10.8.dev4}/cycode/cli/files_collector/iac/tf_content_generator.py

@@ -1,6 +1,5 @@
 import json
 import time
-import uuid
 from typing import List
 
 from cycode.cli import consts
@@ -44,7 +43,7 @@ def _generate_tf_content(resource_changes: List[ResourceChange]) -> str:
 
 
 def _generate_resource_content(resource_change: ResourceChange) -> str:
-    resource_content = f'resource "{resource_change.resource_type}" "{resource_change.name}-{uuid.uuid4()}" {{\n'
+    resource_content = f'resource "{resource_change.resource_type}" "{_get_resource_name(resource_change)}" {{\n'
     if resource_change.values is not None:
         for key, value in resource_change.values.items():
             resource_content += f'  {key} = {json.dumps(value)}\n'
@@ -52,6 +51,17 @@ def _generate_resource_content(resource_change: ResourceChange) -> str:
     return resource_content
 
 
+def _get_resource_name(resource_change: ResourceChange) -> str:
+    parts = [resource_change.module_address, resource_change.name]
+
+    if resource_change.index is not None:
+        parts.append(str(resource_change.index))
+
+    valid_parts = [part for part in parts if part]
+
+    return '.'.join(valid_parts)
+
+
 def _extract_resources(tfplan: str, filename: str) -> List[ResourceChange]:
     tfplan_json = load_json(tfplan)
     resources: List[ResourceChange] = []
@@ -60,8 +70,10 @@ def _extract_resources(tfplan: str, filename: str) -> List[ResourceChange]:
         for resource_change in resource_changes:
             resources.append(
                 ResourceChange(
+                    module_address=resource_change.get('module_address'),
                     resource_type=resource_change['type'],
                     name=resource_change['name'],
+                    index=resource_change.get('index'),
                     actions=resource_change['change']['actions'],
                     values=resource_change['change']['after'],
                 )

{cycode-1.10.8.dev2 → cycode-1.10.8.dev4}/cycode/cli/models.py

@@ -76,8 +76,10 @@ class LocalScanResult(NamedTuple):
 
 @dataclass
 class ResourceChange:
+    module_address: Optional[str]
     resource_type: str
     name: str
+    index: Optional[int]
     actions: List[str]
     values: Dict[str, str]
 

{cycode-1.10.8.dev2 → cycode-1.10.8.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.10.8.dev2" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.10.8.dev4" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]

cycode-1.10.8.dev2/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.10.8.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag