Merge branch 'morosi-feat' into 'master'

Improve the BlueGreen API

See merge request it/e3-aws!66

Author: adanaja

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

@@ -574,7 +574,7 @@ def __init__(
         name: str,
         description: str,
         lambda_arn: str | GetAtt | Ref,
-        lambda_version: str,
+        lambda_version: str | GetAtt | Version,
         alias_name: str | None = None,
         provisioned_concurrency_config: (
             awslambda.ProvisionedConcurrencyConfiguration | None
@@ -610,11 +610,17 @@ def ref(self) -> Ref:
 
     def resources(self, stack: Stack) -> list[AWSObject]:
         """Return list of AWSObject associated with the construct."""
+        lambda_version = (
+            self.lambda_version.version
+            if isinstance(self.lambda_version, Version)
+            else self.lambda_version
+        )
+
         params = {
             "Name": self.alias_name if self.alias_name is not None else self.name,
             "Description": self.description,
             "FunctionName": self.lambda_arn,
-            "FunctionVersion": self.lambda_version,
+            "FunctionVersion": lambda_version,
         }
 
         if self.provisioned_concurrency_config is not None:
@@ -780,12 +786,69 @@ def resources(self, stack: Stack) -> list[AWSObject]:
         return self.versions
 
 
+class BlueGreenVersions(AutoVersion):
+    """Automatic blue/green lambda versions."""
+
+    def __init__(
+        self,
+        blue_version: int,
+        green_version: int,
+        min_version: int | None = None,
+        lambda_name: str | None = None,
+        lambda_arn: str | GetAtt | Ref | None = None,
+        lambda_function: Function | None = None,
+        provisioned_concurrency_config: (
+            awslambda.ProvisionedConcurrencyConfiguration | None
+        ) = None,
+        code_sha256: str | None = None,
+    ) -> None:
+        """Create lambda versions from min_version to blue/green versions included.
+
+        See AutoVersion.
+
+        :param blue_version: number of the blue version
+        :param green_version: number of the green version
+        :param min_version: minimum deployed version (default 1)
+        :param lambda_name: the name of the Lambda function
+        :param lambda_arn: the arn of the Lambda function
+        :param lambda_function: the Lambda function
+        :param provisioned_concurrency_config: specifies a provisioned concurrency
+            configuration for a function's version. Updates are not supported for this
+            property.
+        :param code_sha256: only publish a version if the hash value matches the value
+            that's specified. Use this option to avoid publishing a version if the
+            function code has changed since you last updated it. Updates are not
+            supported for this property
+        """
+        super().__init__(
+            version=max(blue_version, green_version),
+            min_version=min_version,
+            lambda_name=lambda_name,
+            lambda_arn=lambda_arn,
+            lambda_function=lambda_function,
+            provisioned_concurrency_config=provisioned_concurrency_config,
+            code_sha256=code_sha256,
+        )
+        self.blue_version = blue_version
+        self.green_version = green_version
+
+    @property
+    def blue(self) -> Version:
+        """Return the blue version."""
+        return self.get_version(self.blue_version)
+
+    @property
+    def green(self) -> Version:
+        """Return the green version."""
+        return self.get_version(self.green_version)
+
+
 class BlueGreenAliasConfiguration(object):
     """Blue/Green alias configuration."""
 
     def __init__(
         self,
-        version: str,
+        version: str | GetAtt | Version,
         name: str | None = None,
         provisioned_concurrency_config: (
             awslambda.ProvisionedConcurrencyConfiguration | None

tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py

@@ -29,6 +29,7 @@
     Alias,
     Version,
     AutoVersion,
+    BlueGreenVersions,
     BlueGreenAliases,
     BlueGreenAliasConfiguration,
 )
@@ -370,13 +371,37 @@
     },
 }
 
+EXPECTED_BLUEGREENVERSIONS_TEMPLATE = {
+    "MypylambdaVersion1": {
+        "Properties": {
+            "Description": "version 1 of mypylambda lambda",
+            "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
+        },
+        "Type": "AWS::Lambda::Version",
+    },
+    "MypylambdaVersion2": {
+        "Properties": {
+            "Description": "version 2 of mypylambda lambda",
+            "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
+        },
+        "Type": "AWS::Lambda::Version",
+    },
+    "MypylambdaVersion3": {
+        "Properties": {
+            "Description": "version 3 of mypylambda lambda",
+            "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
+        },
+        "Type": "AWS::Lambda::Version",
+    },
+}
+
 EXPECTED_BLUEGREENALIASES_DEFAULT_TEMPLATE = {
     "MypylambdaBlueAlias": {
         "Properties": {
             "Name": "MypylambdaBlueAlias",
             "Description": "blue alias for mypylambda lambda",
             "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
-            "FunctionVersion": {"Ref": "MypylambdaVersion1"},
+            "FunctionVersion": {"Fn::GetAtt": ["MypylambdaVersion1", "Version"]},
         },
         "Type": "AWS::Lambda::Alias",
     },
@@ -385,7 +410,7 @@
             "Name": "MypylambdaGreenAlias",
             "Description": "green alias for mypylambda lambda",
             "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
-            "FunctionVersion": {"Ref": "MypylambdaVersion2"},
+            "FunctionVersion": {"Fn::GetAtt": ["MypylambdaVersion2", "Version"]},
         },
         "Type": "AWS::Lambda::Alias",
     },
@@ -397,7 +422,7 @@
             "Name": "prod",
             "Description": "prod alias for mypylambda lambda",
             "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
-            "FunctionVersion": {"Ref": "MypylambdaVersion1"},
+            "FunctionVersion": {"Fn::GetAtt": ["MypylambdaVersion1", "Version"]},
             "ProvisionedConcurrencyConfig": {"ProvisionedConcurrentExecutions": 1},
             "RoutingConfig": {
                 "AdditionalVersionWeights": [
@@ -417,7 +442,7 @@
             "Name": "beta",
             "Description": "beta alias for mypylambda lambda",
             "FunctionName": {"Fn::GetAtt": ["Mypylambda", "Arn"]},
-            "FunctionVersion": {"Ref": "MypylambdaVersion2"},
+            "FunctionVersion": {"Fn::GetAtt": ["MypylambdaVersion2", "Version"]},
             "ProvisionedConcurrencyConfig": {"ProvisionedConcurrentExecutions": 1},
             "RoutingConfig": {
                 "AdditionalVersionWeights": [
@@ -837,6 +862,20 @@ def test_autoversion(stack: Stack, simple_lambda_function: PyFunction) -> None:
     assert auto_version.latest.name == "mypylambdaVersion3"
 
 
+def test_bluegreenversions(stack: Stack, simple_lambda_function: PyFunction) -> None:
+    """Test BlueGreenVersions creation."""
+    versions = BlueGreenVersions(
+        blue_version=2,
+        green_version=3,
+        lambda_function=simple_lambda_function,
+    )
+    stack.add(versions)
+    print(stack.export()["Resources"])
+    assert stack.export()["Resources"] == EXPECTED_BLUEGREENVERSIONS_TEMPLATE
+    assert versions.blue.name == "mypylambdaVersion2"
+    assert versions.green.name == "mypylambdaVersion3"
+
+
 def test_bluegreenaliases_default(
     stack: Stack, simple_lambda_function: PyFunction
 ) -> None:
@@ -846,8 +885,8 @@ def test_bluegreenaliases_default(
         lambda_function=simple_lambda_function,
     )
     aliases = BlueGreenAliases(
-        blue_config=BlueGreenAliasConfiguration(version=auto_version.previous.ref),
-        green_config=BlueGreenAliasConfiguration(version=auto_version.latest.ref),
+        blue_config=BlueGreenAliasConfiguration(version=auto_version.previous),
+        green_config=BlueGreenAliasConfiguration(version=auto_version.latest),
         lambda_function=simple_lambda_function,
     )
     stack.add(aliases)
@@ -865,7 +904,7 @@ def test_bluegreenaliases(stack: Stack, simple_lambda_function: PyFunction) -> N
     )
     aliases = BlueGreenAliases(
         blue_config=BlueGreenAliasConfiguration(
-            version=auto_version.previous.ref,
+            version=auto_version.previous,
             name="prod",
             provisioned_concurrency_config=ProvisionedConcurrencyConfiguration(
                 ProvisionedConcurrentExecutions=1
@@ -879,7 +918,7 @@ def test_bluegreenaliases(stack: Stack, simple_lambda_function: PyFunction) -> N
             ),
         ),
         green_config=BlueGreenAliasConfiguration(
-            version=auto_version.latest.ref,
+            version=auto_version.latest,
             name="beta",
             provisioned_concurrency_config=ProvisionedConcurrencyConfiguration(
                 ProvisionedConcurrentExecutions=1