Merge branch 'morosi-feat' into 'master'

Don't make AutoVersion.get_version return None

See merge request it/e3-aws!65

Author: adanaja

src/e3/aws/troposphere/awslambda/__init__.py

@@ -746,18 +746,18 @@ def __init__(
         self.latest.provisioned_concurrency_config = provisioned_concurrency_config
         self.latest.code_sha256 = code_sha256
 
-    def get_version(self, number: int) -> Version | None:
+    def get_version(self, number: int) -> Version:
         """Return a version.
 
         :param number: version number
+        :raises ValueError: if number is out of range
         """
-        number = number - self.min_version
+        index = number - self.min_version
 
-        return (
-            self.versions[number]
-            if number >= 0 and number < len(self.versions)
-            else None
-        )
+        if index >= 0 and index < len(self.versions):
+            return self.versions[index]
+
+        raise ValueError(f"version {number} if out of range")
 
     @property
     def previous(self) -> Version:

tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py

@@ -794,14 +794,13 @@ def test_autoversion_default(stack: Stack, simple_lambda_function: PyFunction) -
     stack.add(auto_version)
     print(stack.export()["Resources"])
     assert stack.export()["Resources"] == EXPECTED_AUTOVERSION_DEFAULT_TEMPLATE
-    assert (
-        version := auto_version.get_version(1)
-    ) and version.name == "mypylambdaVersion1"
-    assert (
-        version := auto_version.get_version(2)
-    ) and version.name == "mypylambdaVersion2"
-    assert (version := auto_version.previous) and version.name == "mypylambdaVersion1"
-    assert (version := auto_version.latest) and version.name == "mypylambdaVersion2"
+    assert auto_version.get_version(1).name == "mypylambdaVersion1"
+    assert auto_version.get_version(2).name == "mypylambdaVersion2"
+    assert auto_version.previous.name == "mypylambdaVersion1"
+    assert auto_version.latest.name == "mypylambdaVersion2"
+
+    with pytest.raises(ValueError):
+        auto_version.get_version(3)
 
 
 def test_autoversion_single(stack: Stack, simple_lambda_function: PyFunction) -> None:
@@ -832,14 +831,10 @@ def test_autoversion(stack: Stack, simple_lambda_function: PyFunction) -> None:
     stack.add(auto_version)
     print(stack.export()["Resources"])
     assert stack.export()["Resources"] == EXPECTED_AUTOVERSION_TEMPLATE
-    assert (
-        version := auto_version.get_version(2)
-    ) and version.name == "mypylambdaVersion2"
-    assert (
-        version := auto_version.get_version(3)
-    ) and version.name == "mypylambdaVersion3"
-    assert (version := auto_version.previous) and version.name == "mypylambdaVersion2"
-    assert (version := auto_version.latest) and version.name == "mypylambdaVersion3"
+    assert auto_version.get_version(2).name == "mypylambdaVersion2"
+    assert auto_version.get_version(3).name == "mypylambdaVersion3"
+    assert auto_version.previous.name == "mypylambdaVersion2"
+    assert auto_version.latest.name == "mypylambdaVersion3"
 
 
 def test_bluegreenaliases_default(