Skip to content

Respond to github issue 777 #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eerkunt wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Respond to github issue 777 #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions terraform_compliance/extensions/terraform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,21 +151,30 @@ def _parse_resources(self):
else:
self.resources[resource['address']] = resource

delete_only_addresses = set()

# Resource Changes ( exists in Plan )
for finding in self.raw.get('resource_changes', {}):
for finding in self.raw.get('resource_changes', []):
resource = deepcopy(finding)
change = resource.get('change', {})
actions = change.get('actions', [])
if actions != ['delete']:
resource['values'] = change.get('after', {}) # dict_merge(change.get('after', {}), change.get('after_unknown', {}))
self.remember_after_unknown(resource, change.get('after_unknown', {}))
if 'change' in resource:
del resource['change']
if actions == ['delete']:
delete_only_addresses.add(resource.get('address'))
continue

if self.is_type(resource, 'data'):
self.data[resource['address']] = resource
else:
self.resources[resource['address']] = resource
resource['values'] = change.get('after', {})
self.remember_after_unknown(resource, change.get('after_unknown', {}))
if 'change' in resource:
del resource['change']

if self.is_type(resource, 'data'):
self.data[resource['address']] = resource
else:
self.resources[resource['address']] = resource

for address in delete_only_addresses:
self.resources.pop(address, None)
self.data.pop(address, None)

if self.parse_it:
self.cache.set('resources', self.resources)
Expand Down
47 changes: 47 additions & 0 deletions tests/terraform_compliance/extensions/test_terraform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,53 @@ def test_parse_resources_resources_exists_in_the_resource_changes_deleted(self,
obj._parse_resources()
self.assertEqual(obj.resources, {})

@patch.object(TerraformParser, '_read_file', return_value={})
def test_parse_resources_deleted_state_resources_removed(self, *args):
obj = TerraformParser('somefile', parse_it=False)
obj.raw['values'] = {
'root_module': {
'resources': [
{
'address': 'something'
}
]
}
}
obj.raw['resource_changes'] = [
{
'address': 'something',
'change': {
'actions': ['delete']
}
}
]
obj._parse_resources()
self.assertEqual(obj.resources, {})

@patch.object(TerraformParser, '_read_file', return_value={})
def test_parse_resources_deleted_state_data_removed(self, *args):
obj = TerraformParser('somefile', parse_it=False)
obj.raw['values'] = {
'root_module': {
'resources': [
{
'address': 'data.something',
'mode': 'data'
}
]
}
}
obj.raw['resource_changes'] = [
{
'address': 'data.something',
'change': {
'actions': ['delete']
}
}
]
obj._parse_resources()
self.assertEqual(obj.data, {})

@patch.object(TerraformParser, '_read_file', return_value={})
def test_parse_configurations_resources(self, *args):
obj = TerraformParser('somefile', parse_it=False)
Expand Down
Loading