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.

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

Adds missing unit tests for LayerBuildDefinition in build_graph #2883

Merged
merged 6 commits into from
May 25, 2021
Merged

Adds missing unit tests for LayerBuildDefinition in build_graph #2883

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
393d449
Adds missing unit tests for LayerBuildDefinition in build_graph
May 15, 2021
964e520
fix black formatting
May 15, 2021
4b6901a
Merge branch 'develop' into layer-build-unit-tests
aahung May 17, 2021
0baa853
Merge branch 'develop' into layer-build-unit-tests
aahung May 24, 2021
950d9fd
Merge branch 'develop' into layer-build-unit-tests
aahung May 24, 2021
c3b3982
Merge branch 'develop' into layer-build-unit-tests
aahung May 25, 2021
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
117 changes: 102 additions & 15 deletions tests/unit/lib/build_module/test_build_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
InvalidBuildGraphException,
LayerBuildDefinition,
)
from samcli.lib.providers.provider import Function
from samcli.lib.providers.provider import Function, LayerVersion
from samcli.lib.utils import osutils
from samcli.lib.utils.packagetype import ZIP

Expand Down Expand Up @@ -73,6 +73,16 @@ def generate_function(
)


def generate_layer(
arn="arn:aws:lambda:region:account-id:layer:layer-name:1",
codeuri="codeuri",
compatible_runtimes=["runtime"],
metadata={},
stack_path="",
):
return LayerVersion(arn, codeuri, compatible_runtimes, metadata, stack_path)


class TestConversionFunctions(TestCase):
def test_function_build_definition_to_toml_table(self):
build_definition = FunctionBuildDefinition(
Expand Down Expand Up @@ -151,8 +161,11 @@ def test_toml_table_to_layer_build_definition(self):

class TestBuildGraph(TestCase):
CODEURI = "hello_world_python/"
LAYER_CODEURI = "sum_layer/"
LAYER_NAME = "SumLayer"
ZIP = ZIP
RUNTIME = "python3.8"
LAYER_RUNTIME = "nodejs12.x"
METADATA = {"Test": "hello", "Test2": "world"}
UUID = "3c1c254e-cd4b-4d94-8c74-7ab870b36063"
LAYER_UUID = "7dnc257e-cd4b-4d94-8c74-7ab870b3abc3"
Expand All @@ -175,10 +188,10 @@ class TestBuildGraph(TestCase):

[layer_build_definitions]
[layer_build_definitions.{LAYER_UUID}]
layer_name = "SumLayer"
codeuri = "sum_layer/"
build_method = "nodejs12.x"
compatible_runtimes = ["nodejs12.x"]
layer_name = "{LAYER_NAME}"
codeuri = "{LAYER_CODEURI}"
build_method = "{LAYER_RUNTIME}"
compatible_runtimes = ["{LAYER_RUNTIME}"]
source_md5 = "{SOURCE_MD5}"
layer = "SumLayer"
[layer_build_definitions.{LAYER_UUID}.env_vars]
Expand All @@ -197,6 +210,7 @@ def test_should_instantiate_first_time(self):
self.assertEqual(
build_graph1.get_function_build_definitions(), build_graph2.get_function_build_definitions()
)
self.assertEqual(build_graph1.get_layer_build_definitions(), build_graph2.get_layer_build_definitions())

def test_should_instantiate_first_time_and_update(self):
with osutils.mkdir_temp() as temp_base_dir:
Expand All @@ -205,7 +219,7 @@ def test_should_instantiate_first_time_and_update(self):

# create a build graph and persist it
build_graph1 = BuildGraph(str(build_dir))
build_definition1 = FunctionBuildDefinition(
function_build_definition1 = FunctionBuildDefinition(
TestBuildGraph.RUNTIME,
TestBuildGraph.CODEURI,
TestBuildGraph.ZIP,
Expand All @@ -216,18 +230,40 @@ def test_should_instantiate_first_time_and_update(self):
function1 = generate_function(
runtime=TestBuildGraph.RUNTIME, codeuri=TestBuildGraph.CODEURI, metadata=TestBuildGraph.METADATA
)
build_graph1.put_function_build_definition(build_definition1, function1)
build_graph1.put_function_build_definition(function_build_definition1, function1)
layer_build_definition1 = LayerBuildDefinition(
TestBuildGraph.LAYER_NAME,
TestBuildGraph.LAYER_CODEURI,
TestBuildGraph.LAYER_RUNTIME,
[TestBuildGraph.LAYER_RUNTIME],
TestBuildGraph.SOURCE_MD5,
TestBuildGraph.ENV_VARS,
)
layer1 = generate_layer(
compatible_runtimes=[TestBuildGraph.RUNTIME],
codeuri=TestBuildGraph.LAYER_CODEURI,
metadata=TestBuildGraph.METADATA,
)
build_graph1.put_layer_build_definition(layer_build_definition1, layer1)

build_graph1.clean_redundant_definitions_and_update(True)

# read previously persisted graph and compare
build_graph2 = BuildGraph(str(build_dir))
self.assertEqual(
len(build_graph1.get_function_build_definitions()), len(build_graph2.get_function_build_definitions())
)
self.assertEqual(
len(build_graph1.get_layer_build_definitions()), len(build_graph2.get_layer_build_definitions())
)
self.assertEqual(
list(build_graph1.get_function_build_definitions())[0],
list(build_graph2.get_function_build_definitions())[0],
)
self.assertEqual(
list(build_graph1.get_layer_build_definitions())[0],
list(build_graph2.get_layer_build_definitions())[0],
)

def test_should_read_existing_build_graph(self):
with osutils.mkdir_temp() as temp_base_dir:
Expand All @@ -238,13 +274,20 @@ def test_should_read_existing_build_graph(self):
build_graph_path.write_text(TestBuildGraph.BUILD_GRAPH_CONTENTS)

build_graph = BuildGraph(str(build_dir))
for build_definition in build_graph.get_function_build_definitions():
self.assertEqual(build_definition.codeuri, TestBuildGraph.CODEURI)
self.assertEqual(build_definition.runtime, TestBuildGraph.RUNTIME)
self.assertEqual(build_definition.packagetype, TestBuildGraph.ZIP)
self.assertEqual(build_definition.metadata, TestBuildGraph.METADATA)
self.assertEqual(build_definition.source_md5, TestBuildGraph.SOURCE_MD5)
self.assertEqual(build_definition.env_vars, TestBuildGraph.ENV_VARS)
for function_build_definition in build_graph.get_function_build_definitions():
self.assertEqual(function_build_definition.codeuri, TestBuildGraph.CODEURI)
self.assertEqual(function_build_definition.runtime, TestBuildGraph.RUNTIME)
self.assertEqual(function_build_definition.packagetype, TestBuildGraph.ZIP)
self.assertEqual(function_build_definition.metadata, TestBuildGraph.METADATA)
self.assertEqual(function_build_definition.source_md5, TestBuildGraph.SOURCE_MD5)
self.assertEqual(function_build_definition.env_vars, TestBuildGraph.ENV_VARS)

for layer_build_definition in build_graph.get_layer_build_definitions():
self.assertEqual(layer_build_definition.name, TestBuildGraph.LAYER_NAME)
self.assertEqual(layer_build_definition.codeuri, TestBuildGraph.LAYER_CODEURI)
self.assertEqual(layer_build_definition.build_method, TestBuildGraph.LAYER_RUNTIME)
self.assertEqual(layer_build_definition.compatible_runtimes, [TestBuildGraph.LAYER_RUNTIME])
self.assertEqual(layer_build_definition.env_vars, TestBuildGraph.ENV_VARS)

def test_functions_should_be_added_existing_build_graph(self):
with osutils.mkdir_temp() as temp_base_dir:
Expand All @@ -265,7 +308,9 @@ def test_functions_should_be_added_existing_build_graph(self):
TestBuildGraph.ENV_VARS,
)
function1 = generate_function(
runtime=TestBuildGraph.RUNTIME, codeuri=TestBuildGraph.CODEURI, metadata=TestBuildGraph.METADATA
runtime=TestBuildGraph.RUNTIME,
codeuri=TestBuildGraph.CODEURI,
metadata=TestBuildGraph.METADATA,
)
build_graph.put_function_build_definition(build_definition1, function1)

Expand All @@ -287,6 +332,48 @@ def test_functions_should_be_added_existing_build_graph(self):
build_graph.put_function_build_definition(build_definition2, function2)
self.assertTrue(len(build_graph.get_function_build_definitions()), 2)

def test_layers_should_be_added_existing_build_graph(self):
with osutils.mkdir_temp() as temp_base_dir:
build_dir = Path(temp_base_dir, ".aws-sam", "build")
build_dir.mkdir(parents=True)

build_graph_path = Path(build_dir.parent, "build.toml")
build_graph_path.write_text(TestBuildGraph.BUILD_GRAPH_CONTENTS)

build_graph = BuildGraph(str(build_dir))

build_definition1 = LayerBuildDefinition(
TestBuildGraph.LAYER_NAME,
TestBuildGraph.LAYER_CODEURI,
TestBuildGraph.LAYER_RUNTIME,
[TestBuildGraph.LAYER_RUNTIME],
TestBuildGraph.SOURCE_MD5,
TestBuildGraph.ENV_VARS,
)
layer1 = generate_layer(
compatible_runtimes=[TestBuildGraph.RUNTIME],
codeuri=TestBuildGraph.LAYER_CODEURI,
metadata=TestBuildGraph.METADATA,
)
build_graph.put_layer_build_definition(build_definition1, layer1)

self.assertTrue(len(build_graph.get_layer_build_definitions()), 1)
for build_definition in build_graph.get_layer_build_definitions():
self.assertTrue(build_definition.layer, layer1)
self.assertEqual(build_definition.uuid, TestBuildGraph.LAYER_UUID)

build_definition2 = LayerBuildDefinition(
"another_layername",
"another_codeuri",
"another_runtime",
["another_runtime"],
"another_source_md5",
{"env_vars": "value2"},
)
layer2 = generate_layer(arn="arn:aws:lambda:region:account-id:layer:another-layer-name:1")
build_graph.put_layer_build_definition(build_definition2, layer2)
self.assertTrue(len(build_graph.get_layer_build_definitions()), 2)


class TestBuildDefinition(TestCase):
def test_single_function_should_return_function_and_handler_name(self):
Expand Down