feat(terraform): Add provider address to resources #6266
Merged
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
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
lirshindalman
approved these changes
May 7, 2024
ChanochShayner
temporarily deployed
to
scan-security
GitHub Actions
Inactive
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
requested a deployment
to
scan-security
GitHub Actions
Waiting
ChanochShayner
temporarily deployed
to
scan-security
GitHub Actions
Inactive
bo156
reviewed
May 26, 2024
| @@ -139,6 +145,85 @@ def _add_block_data_to_graph(self, idx: int, block: TerraformBlock) -> None: | |||
| self.in_edges[idx] = [] | |||
| self.out_edges[idx] = [] | |||
|
|
|||
| def _add_provider_attr_to_resources(self) -> None: | |||
There was a problem hiding this comment.
can you add documentation to this function? looks rather complex...
bo156
reviewed
May 26, 2024
| return cast(str, module_providers[list(module_providers.keys())[0]].replace("$", "").replace("{", "").replace("}", "")) | ||
| else: | ||
| for p_address in provider_address: | ||
| if m_alias.replace("$", "").replace("{", "").replace("}", "") == self.vertices[p_address].name: |
There was a problem hiding this comment.
can you extract those strings to consts? you use them multiple times
| def _get_resource_name_and_type_from_name(name: str) -> tuple[str, str]: | ||
| resource_name, resource_type = '', '' | ||
| split_name = name.split('.') | ||
| if len(split_name) >= 2: |
There was a problem hiding this comment.
this will not work if you have for example . inside a foreach key.
Instead you can use this function get_sanitized_terraform_resource_id (or a variation of it) from here
There was a problem hiding this comment.
Remove, already implemented logic in another func
| @@ -461,6 +462,7 @@ def parse_hcl_module_from_tf_definitions( | |||
| ) | |||
| self.add_tfvars(module, source) | |||
| copy_of_tf_definitions = pickle_deepcopy(tf_definitions) | |||
| module.temp_tf_definition = tf_definitions # type:ignore # will be TFDefinitionKey and not string | |||
There was a problem hiding this comment.
why ignore instead of changing the type in line 51?
There was a problem hiding this comment.
Already tried to play with it a couple of times and it didn't work, (u can see at the first couple of commits).
| provider_address_with_alias = local_graph.vertices[4].attributes.get('__address__') | ||
| assert resource_provider_address_with_alias == provider_address_with_alias | ||
|
|
||
| def test_provider_edge_cases(self): |
ChanochShayner
temporarily deployed
to
scan-security
GitHub Actions
Inactive
bo156
approved these changes
May 27, 2024
ChanochShayner
temporarily deployed
to
scan-security
GitHub Actions
Inactive
pull bot
pushed a commit
to tooniez/checkov
that referenced
this pull request
May 29, 2024
* Add provider address to resources * remove unrelated change * Fix UTs and mypy issues * Fix tf definition type * Fix tf definition type * Fix tf definition type * remove unused import * add edge cases and UTs * remove unrelated changes * flake8 and UTs * mypy * mypy * Fix UT + add env var with default true * remove un needed code + func doc + CR fixes * UT fix
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.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Description
Checklist: