Cover all condition cases, update tests

Author: keetonian

samtranslator/model/preferences/deployment_preference_collection.py

@@ -9,6 +9,9 @@
     is_intrinsic_if,
     is_intrinsic_no_value,
     validate_intrinsic_if_items,
+    make_combined_condition,
+    ref,
+    fnGetAtt
 )
 from samtranslator.model.update_policy import UpdatePolicy
 from samtranslator.translator.arn_generator import ArnGenerator
@@ -27,6 +30,7 @@
     "Linear10PercentEvery10Minutes",
     "AllAtOnce",
 ]
+CODE_DEPLOY_CONDITION_NAME = "ServerlessCodeDeployCondition"
 
 
 class DeploymentPreferenceCollection(object):
@@ -41,12 +45,10 @@ class DeploymentPreferenceCollection(object):
 
     def __init__(self):
         """
-        This collection stores an intenral dict of the deployment preferences for each function's
-            deployment preference in the SAM Template.
+        This collection stores an internal dict of the deployment preferences for each function's
+        deployment preference in the SAM Template.
         """
         self._resource_preferences = {}
-        self.codedeploy_application = self._codedeploy_application()
-        self.codedeploy_iam_role = self._codedeploy_iam_role()
 
     def add(self, logical_id, deployment_preference_dict, condition=None):
         """
@@ -93,20 +95,47 @@ def needs_resource_condition(self):
         If all preferences have a condition, all code deploy resources need to be conditionally created
         :return: True, if a condition needs to be created
         """
-        return all(preference.condition for preference in self._resource_preferences.values())
+        # If there are any enabled deployment preferences without conditions, return false
+        return self._resource_preferences and not any(
+            not preference.condition and preference.enabled for preference in self._resource_preferences.values()
+        )
+
+    def get_all_deployment_conditions(self):
+        """
+        Returns a list of all conditions associated with the deployment preference resources
+        :return: List of condition names
+        """
+        conditions_set = set([preference.condition for preference in self._resource_preferences.values()])
+        if None in conditions_set:
+            # None can exist if there are disabled deployment preference(s)
+            conditions_set.remove(None)
+        return list(conditions_set)
+
+    def create_aggregate_deployment_condition(self):
+        """
+        Creates an aggregate deployment condition if necessary
+        :return: None if <2 conditions are found, otherwise a dictionary of new conditions to add to template
+        """
+        return make_combined_condition(self.get_all_deployment_conditions(), CODE_DEPLOY_CONDITION_NAME)
 
     def enabled_logical_ids(self):
         """
         :return: only the logical id's for the deployment preferences in this collection which are enabled
         """
         return [logical_id for logical_id, preference in self._resource_preferences.items() if preference.enabled]
 
-    def _codedeploy_application(self):
+    def get_codedeploy_application(self):
         codedeploy_application_resource = CodeDeployApplication(CODEDEPLOY_APPLICATION_LOGICAL_ID)
         codedeploy_application_resource.ComputePlatform = "Lambda"
+        if self.needs_resource_condition():
+            conditions = self.get_all_deployment_conditions()
+            condition_name = CODE_DEPLOY_CONDITION_NAME
+            if len(conditions) <= 1:
+                condition_name = conditions.pop()
+            codedeploy_application_resource.set_resource_attribute("Condition", condition_name)
         return codedeploy_application_resource
 
-    def _codedeploy_iam_role(self):
+    def get_codedeploy_iam_role(self):
         iam_role = IAMRole(CODE_DEPLOY_SERVICE_ROLE_LOGICAL_ID)
         iam_role.AssumeRolePolicyDocument = {
             "Version": "2012-10-17",
@@ -130,6 +159,12 @@ def _codedeploy_iam_role(self):
                 ArnGenerator.generate_aws_managed_policy_arn("service-role/AWSCodeDeployRoleForLambda")
             ]
 
+        if self.needs_resource_condition():
+            conditions = self.get_all_deployment_conditions()
+            condition_name = CODE_DEPLOY_CONDITION_NAME
+            if len(conditions) <= 1:
+                condition_name = conditions.pop()
+            iam_role.set_resource_attribute("Condition", condition_name)
         return iam_role
 
     def deployment_group(self, function_logical_id):
@@ -147,7 +182,7 @@ def deployment_group(self, function_logical_id):
         except ValueError as e:
             raise InvalidResourceException(function_logical_id, str(e))
 
-        deployment_group.ApplicationName = self.codedeploy_application.get_runtime_attr("name")
+        deployment_group.ApplicationName = ref(CODEDEPLOY_APPLICATION_LOGICAL_ID)
         deployment_group.AutoRollbackConfiguration = {
             "Enabled": True,
             "Events": ["DEPLOYMENT_FAILURE", "DEPLOYMENT_STOP_ON_ALARM", "DEPLOYMENT_STOP_ON_REQUEST"],
@@ -159,7 +194,7 @@ def deployment_group(self, function_logical_id):
 
         deployment_group.DeploymentStyle = {"DeploymentType": "BLUE_GREEN", "DeploymentOption": "WITH_TRAFFIC_CONTROL"}
 
-        deployment_group.ServiceRoleArn = self.codedeploy_iam_role.get_runtime_attr("arn")
+        deployment_group.ServiceRoleArn = fnGetAtt(CODE_DEPLOY_SERVICE_ROLE_LOGICAL_ID, "Arn")
         if deployment_preference.role:
             deployment_group.ServiceRoleArn = deployment_preference.role
 
@@ -253,7 +288,7 @@ def update_policy(self, function_logical_id):
         deployment_preference = self.get(function_logical_id)
 
         return UpdatePolicy(
-            self.codedeploy_application.get_runtime_attr("name"),
+            ref(CODEDEPLOY_APPLICATION_LOGICAL_ID),
             self.deployment_group(function_logical_id).get_runtime_attr("name"),
             deployment_preference.pre_traffic_hook,
             deployment_preference.post_traffic_hook,

samtranslator/translator/translator.py

@@ -167,10 +167,14 @@ def translate(self, sam_template, parameter_values, feature_toggle=None, passthr
                 document_errors.append(e)
 
         if deployment_preference_collection.any_enabled():
-            template["Resources"].update(deployment_preference_collection.codedeploy_application.to_dict())
+            template["Resources"].update(deployment_preference_collection.get_codedeploy_application().to_dict())
+            if deployment_preference_collection.needs_resource_condition():
+                new_conditions = deployment_preference_collection.create_aggregate_deployment_condition()
+                if new_conditions:
+                    template.get("Conditions").update(new_conditions)
 
             if not deployment_preference_collection.can_skip_service_role():
-                template["Resources"].update(deployment_preference_collection.codedeploy_iam_role.to_dict())
+                template["Resources"].update(deployment_preference_collection.get_codedeploy_iam_role().to_dict())
 
             for logical_id in deployment_preference_collection.enabled_logical_ids():
                 try:

tests/translator/input/function_with_deployment_no_service_role.yaml

@@ -1,3 +1,9 @@
+Conditions:
+  Condition1:
+    Fn::Equals:
+      - true
+      - true
+
 Globals:
   Function:
     AutoPublishAlias: live
@@ -15,6 +21,7 @@ Resources:
       Runtime: python2.7
 
   OtherFunction:
+    Condition: Condition1
     Type: 'AWS::Serverless::Function'
     Properties:
       CodeUri: s3://sam-demo-bucket/hello.zip

tests/translator/input/function_with_deployment_preference_condition.yaml

@@ -0,0 +1,30 @@
+Parameters:
+  FnName:
+    Type: String
+  ProvisionedConcurrency:
+    Type: String
+    Default: 10
+  EnableAliasProvisionedConcurrency:
+    Type: String
+    AllowedValues:
+      - true
+      - false
+    Default: true
+Conditions:
+  AliasProvisionedConcurrencyEnabled: !Equals [!Ref EnableAliasProvisionedConcurrency, true]
+  FunctionCondition: !Equals [true, true]
+Resources:
+  MinimalFunction:
+    Type: 'AWS::Serverless::Function'
+    Condition: FunctionCondition
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: Linear10PercentEvery3Minutes
+      ProvisionedConcurrencyConfig: !If
+        - AliasProvisionedConcurrencyEnabled
+        - ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
+        - !Ref 'AWS::NoValue'

tests/translator/input/function_with_deployment_preference_multiple_combinations_conditions.yaml

@@ -0,0 +1,86 @@
+Conditions:
+  Condition1:
+    Fn::Equals:
+      - true
+      - true
+  Condition2:
+    Fn::Equals:
+      - true
+      - false
+  Condition3:
+    Fn::Equals:
+      - true
+      - false
+
+Parameters:
+  MyFalseParameter:
+    Type: String
+    Default: False
+
+Resources:
+  MinimalFunction:
+    Condition: Condition1
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: Linear10PercentEvery2Minutes
+
+  MinimalFunctionWithMinimalDeploymentPreference:
+    Type: 'AWS::Serverless::Function'
+    Condition: Condition2
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: livewithdeployment
+      DeploymentPreference:
+        Type: Canary10Percent5Minutes
+
+  MinimalFunctionWithDeploymentPreferenceWithHooksAndAlarms:
+    Type: 'AWS::Serverless::Function'
+    Condition: Condition2
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: livewithdeploymentwithhooksandalarms
+      DeploymentPreference:
+        Type: Linear10PercentEvery2Minutes
+        Hooks:
+          PreTraffic: !Ref MySanityTestFunction
+          PostTraffic: !Ref MyValidationTestFunction
+        Alarms:
+          - !Ref MyCloudWatchAlarm
+
+  MySanityTestFunction:
+    Type: 'AWS::Serverless::Function'
+    Condition: Condition3
+    Properties:
+      Handler: hello.handler
+      Runtime: python2.7
+      CodeUri: s3://my-bucket/mySanityTestFunction.zip
+      DeploymentPreference:
+        Enabled: False
+
+  MyValidationTestFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: hello.handler
+      Runtime: python2.7
+      CodeUri: s3://my-bucket/myValidationTestFunction.zip
+      DeploymentPreference:
+        Enabled: !Ref MyFalseParameter
+
+  MyCloudWatchAlarm:
+    Type: AWS::CloudWatch::Alarm
+    Properties:
+     ComparisonOperator: GreaterThanThreshold
+     EvaluationPeriods: 1
+     MetricName: MyMetric
+     Namespace: AWS/EC2
+     Period: 300
+     Threshold: 10

tests/translator/model/preferences/test_deployment_preference_collection.py

@@ -18,6 +18,7 @@ def setup_method(self, method):
         self.post_traffic_host_global = "post_traffic_function_ref"
         self.pre_traffic_hook_global = "pre_traffic_function_ref"
         self.function_logical_id = "FunctionLogicalId"
+        self.condition = "CodeDeployCondition"
 
     @patch("boto3.session.Session.region_name", "ap-southeast-1")
     def test_when_no_global_dict_each_local_deployment_preference_requires_parameters(self):
@@ -37,7 +38,7 @@ def test_codedeploy_application(self):
         expected_codedeploy_application_resource.ComputePlatform = "Lambda"
 
         self.assertEqual(
-            DeploymentPreferenceCollection().codedeploy_application.to_dict(),
+            DeploymentPreferenceCollection().get_codedeploy_application().to_dict(),
             expected_codedeploy_application_resource.to_dict(),
         )
 
@@ -59,7 +60,7 @@ def test_codedeploy_iam_role(self):
         ]
 
         self.assertEqual(
-            DeploymentPreferenceCollection().codedeploy_iam_role.to_dict(), expected_codedeploy_iam_role.to_dict()
+            DeploymentPreferenceCollection().get_codedeploy_iam_role().to_dict(), expected_codedeploy_iam_role.to_dict()
         )
 
     @patch("boto3.session.Session.region_name", "ap-southeast-1")