Skip to content
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.

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

feat: Clean Terraform References List #4252

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 39 additions & 0 deletions samcli/hook_packages/terraform/hooks/prepare/layer_linking.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"""
Use Terraform plan to link resources together
e.g. linking layers to functions
"""

from typing import List


def _clean_references_list(references: List[str]) -> List[str]:
"""
Return a new copy of the complete references list.

e.g. given a list of references like
[
'aws_lambda_layer_version.layer1[0].arn',
'aws_lambda_layer_version.layer1[0]',
'aws_lambda_layer_version.layer1',
]
We want only the first complete reference ('aws_lambda_layer_version.layer1[0].arn')

Parameters
----------
references: List[str]
A list of reference strings

Returns
-------
List[str]
A copy of a cleaned list of reference strings
"""
cleaned_references = []
copied_references = sorted(references, reverse=True)
if not references:
return []
cleaned_references.append(copied_references[0])
for i in range(1, len(copied_references)):
if not cleaned_references[-1].startswith(copied_references[i]):
cleaned_references.append(copied_references[i])
return cleaned_references
67 changes: 67 additions & 0 deletions tests/unit/hook_packages/terraform/test_layer_linking.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from copy import deepcopy
from unittest import TestCase

from parameterized import parameterized

from samcli.hook_packages.terraform.hooks.prepare.layer_linking import _clean_references_list


class TestLayerLinking(TestCase):
@parameterized.expand(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a case that contain an instance for a block defined with for_each. https://www.terraform.io/language/meta-arguments/for_each#referring-to-instances
something like ([aws_lambda_layer_version.layer1["key1"].arn, aws_lambda_layer_version.layer1["key1"], aws_lambda_layer_version.layer1)

[
([], []),
(["aws_lambda_layer_version.layer1[0].arn"], ["aws_lambda_layer_version.layer1[0].arn"]),
(["aws_lambda_layer_version.layer1[0]"], ["aws_lambda_layer_version.layer1[0]"]),
(["aws_lambda_layer_version.layer1"], ["aws_lambda_layer_version.layer1"]),
(
[
"aws_lambda_layer_version.layer1[0].arn",
"aws_lambda_layer_version.layer1[0]",
"aws_lambda_layer_version.layer1",
],
["aws_lambda_layer_version.layer1[0].arn"],
),
(
[
"aws_lambda_layer_version.layer1[0].arn",
"aws_lambda_layer_version.layer1[0]",
"aws_lambda_layer_version.layer1",
"module.const_layer1.layer_arn",
"module.const_layer1",
"module.const_layer2.layer_arn",
"module.const_layer2",
],
[
"module.const_layer2.layer_arn",
"module.const_layer1.layer_arn",
"aws_lambda_layer_version.layer1[0].arn",
],
),
(
[
'aws_lambda_layer_version.layer1["key1"].arn',
'aws_lambda_layer_version.layer1["key1"]',
"aws_lambda_layer_version.layer1",
],
['aws_lambda_layer_version.layer1["key1"].arn'],
),
]
)
def test_clean_references_list(self, references, expected):
cleaned_references = _clean_references_list(references)
self.assertEqual(cleaned_references, expected)

def test_ensure_original_references_not_mutated(self):
references = [
"aws_lambda_layer_version.layer1[0].arn",
"aws_lambda_layer_version.layer1[0]",
"aws_lambda_layer_version.layer1",
"module.const_layer1.layer_arn",
"module.const_layer1",
"module.const_layer2.layer_arn",
"module.const_layer2",
]
original_references = deepcopy(references)
cleaned_references_list = _clean_references_list(references)
self.assertEqual(references, original_references)
self.assertNotEqual(references, cleaned_references_list)