feat(terraform): add new function to create module and definitions with tests #5362
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bo156
reviewed
Jul 20, 2023
maxamel
changed the title
added 2 commits
July 20, 2023 13:07
bo156
reviewed
Jul 20, 2023
omryMen
reviewed
Jul 20, 2023
omryMen
reviewed
Jul 20, 2023
gruebel
reviewed
Jul 20, 2023
bo156
reviewed
Jul 20, 2023
| @@ -369,25 +370,19 @@ def parse_multi_graph_hcl_module( | |||
|
|
|||
| def create_definition_by_dirs(self, tf_definitions: dict[TFDefinitionKey, dict[str, list[dict[str, Any]]]] | |||
| ) -> dict[str, list[dict[TFDefinitionKey, dict[str, Any]]]]: | |||
| dirs_to_definitions: dict[str, list[dict[TFDefinitionKey, dict[str, Any]]]] = {} | |||
| dirs_to_definitions: dict[str, list[dict[TFDefinitionKey, dict[str, Any]]]] = defaultdict(list) | |||
| @@ -108,6 +109,39 @@ def test_set_variables_values_from_modules(self): | |||
| else: | |||
| self.assertEqual(var_value, default_val) | |||
|
|
|||
| def test_definition_creation_by_dirs(self): | |||
There was a problem hiding this comment.
nice test!
However, I still think we need some more for the logic - maybe add 1 with more than 1 created module.
you can find a good example under tests/terraform/graph/resources/modules.
This one even utilizes different modules with a reference to other directories, so I feel it will be a very strong test.
(You don't have to take the whole folder as it might be also too big, maybe just one sub directory like stacks)
bo156
approved these changes
Jul 23, 2023
gruebel
pushed a commit
to gruebel/checkov
that referenced
this pull request
Jul 23, 2023
…th tests (bridgecrewio#5362) * add new function to create module and definitions with tests * fix according to comments * rename the modules to modules_and_definitions_tuple * fix mypy issue * fix more mypy issue * fix false over identation (according to mypy) * fix more flake8 issues * fix even more mypy issues that appeared due to lint fixes * add new UT and fix according to comments * change regular dict to defaultdict * change tests import * add new test with two modules --------- Co-authored-by: Max Amelchenko <mamelchenko@paloaltonetworks.com>
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces a new function in order to create a multi graph hcl module, instead of the previous single graph hcl module.
At the moment it is not called from anywhere and will be used in subsequent PRs.
The old function will not be removed and it will stay and be called depending on env var.
Checklist: