From d9f5f24cb0ffc012fdef75f7516d075619c5d6b8 Mon Sep 17 00:00:00 2001 From: lirshindalman Date: Sun, 23 Jul 2023 12:08:09 +0300 Subject: [PATCH] . --- checkov/common/util/env_vars_config.py | 1 + checkov/terraform/graph_builder/graph_to_tf_definitions.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checkov/common/util/env_vars_config.py b/checkov/common/util/env_vars_config.py index 618f7b9cd7a..b49f19dddc2 100644 --- a/checkov/common/util/env_vars_config.py +++ b/checkov/common/util/env_vars_config.py @@ -77,6 +77,7 @@ def __init__(self) -> None: self.PRISMA_API_URL = os.getenv("PRISMA_API_URL") # need to fix usage, because the env var value is set inside the code self.GITHUB_CONF_DIR_PATH = os.getenv("CKV_GITHUB_CONF_DIR_PATH") + self.ENABLE_DEFINITION_KEY = os.getenv("ENABLE_DEFINITION_KEY", False) env_vars_config = EnvVarsConfig() diff --git a/checkov/terraform/graph_builder/graph_to_tf_definitions.py b/checkov/terraform/graph_builder/graph_to_tf_definitions.py index d4a772027ec..39d3f949dd3 100644 --- a/checkov/terraform/graph_builder/graph_to_tf_definitions.py +++ b/checkov/terraform/graph_builder/graph_to_tf_definitions.py @@ -32,8 +32,8 @@ def convert_graph_vertices_to_tf_definitions( if use_new_tf_parser: tf_path = TFDefinitionKey(file_path=block_path, tf_source_modules=vertex.source_module_object) else: - if isinstance(vertex.module_dependency, str) or not vertex.module_dependency: - tf_path = get_tf_definition_key_from_module_dependency(block_path, vertex.module_dependency, vertex.module_dependency_num) + module_dependency = str(vertex.module_dependency) if vertex.module_dependency else None + tf_path = get_tf_definition_key_from_module_dependency(block_path, module_dependency, vertex.module_dependency_num) tf_definitions.setdefault(tf_path, {}).setdefault(block_type, []).append(vertex.config) relative_block_path = f"/{os.path.relpath(block_path, root_folder)}" add_breadcrumbs(vertex, breadcrumbs, relative_block_path)