change default value

rotem-avni · Feb 8, 2023 · f28539f · f28539f
1 parent 7d3b1da
commit f28539f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/checkov/terraform/checks/utils/dependency_path_handler.py b/checkov/terraform/checks/utils/dependency_path_handler.py
@@ -8,6 +8,6 @@
 def unify_dependency_path(dependency_path: List[str]) -> str:
     if not dependency_path:
         return ''
-    if strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False')):
+    if strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True')):
         return dependency_path[-1]
     return PATH_SEPARATOR.join(dependency_path)
diff --git a/checkov/terraform/graph_builder/graph_components/blocks.py b/checkov/terraform/graph_builder/graph_components/blocks.py
@@ -36,7 +36,7 @@ def __init__(self, name: str, config: Dict[str, Any], path: str, block_type: Blo
         self.module_dependency = ""
         self.module_dependency_num = ""
         if path:
-            if strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False')):
+            if strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True')):
                 self.path = path
             else:
                 self.path, module_dependency, num = remove_module_dependency_in_path(path)

diff --git a/checkov/terraform/graph_builder/graph_components/module.py b/checkov/terraform/graph_builder/graph_components/module.py
@@ -40,7 +40,7 @@ def __init__(
         self.resources_types: Set[str] = set()
         self.source_dir = source_dir
         self.render_dynamic_blocks_env_var = os.getenv('CHECKOV_RENDER_DYNAMIC_MODULES', 'True')
-        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False'))
+        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True'))
 
     def add_blocks(
         self, block_type: BlockType, blocks: List[Dict[str, Dict[str, Any]]], path: str, source: str

diff --git a/checkov/terraform/graph_builder/graph_to_tf_definitions.py b/checkov/terraform/graph_builder/graph_to_tf_definitions.py
@@ -34,5 +34,5 @@ def convert_graph_vertices_to_tf_definitions(
 def add_breadcrumbs(vertex: TerraformBlock, breadcrumbs: Dict[str, Dict[str, Any]], relative_block_path: str) -> None:
     vertex_breadcrumbs = vertex.breadcrumbs
     if vertex_breadcrumbs:
-        vertex_key = vertex.name if not strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False')) else vertex.attributes.get(CustomAttributes.TF_RESOURCE_ADDRESS, vertex.name)
+        vertex_key = vertex.name if not strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True')) else vertex.attributes.get(CustomAttributes.TF_RESOURCE_ADDRESS, vertex.name)
         breadcrumbs.setdefault(relative_block_path, {})[vertex_key] = vertex_breadcrumbs
diff --git a/checkov/terraform/graph_builder/local_graph.py b/checkov/terraform/graph_builder/local_graph.py
@@ -647,6 +647,6 @@ def update_list_attribute(
 def get_path_with_nested_modules(block: TerraformBlock) -> str:
     if not block.module_dependency:
         return block.path
-    if not strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False')):
+    if not strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True')):
         return unify_dependency_path([block.module_dependency, block.path])
     return get_tf_definition_key_from_module_dependency(block.path, block.module_dependency, block.module_dependency_num)
diff --git a/checkov/terraform/parser.py b/checkov/terraform/parser.py
@@ -65,7 +65,7 @@ def __init__(self, module_class: type[Module] = Module) -> None:
         # Tuple is <file>, <module_index>, <name> (see _load_modules)
         self._loaded_modules: Set[Tuple[str, int, str]] = set()
         self.external_variables_data = []
-        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False'))
+        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True'))
 
     def _init(self, directory: str, out_definitions: Optional[Dict],
               out_evaluations_context: Dict[str, Dict[str, EvaluationContext]],

diff --git a/checkov/terraform/runner.py b/checkov/terraform/runner.py
@@ -87,7 +87,7 @@ def __init__(
         self.definitions_with_modules: dict[str, dict[str, Any]] = {}
         self.referrer_cache: Dict[str, str] = {}
         self.non_referred_cache: Set[str] = set()
-        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'False'))
+        self.enable_nested_modules = strtobool(os.getenv('CHECKOV_ENABLE_NESTED_MODULES', 'True'))
 
     block_type_registries = {  # noqa: CCE003  # a static attribute
         'resource': resource_registry,