fix: fix bug in custom DeploymentPreference feature (#966)

Author: keetonian

samtranslator/model/preferences/deployment_preference_collection.py

@@ -134,17 +134,19 @@ def deployment_group(self, function_logical_id):
 
         return deployment_group
 
-    def _replace_deployment_types(self, value):
+    def _replace_deployment_types(self, value, key=None):
         if isinstance(value, list):
             for i in range(len(value)):
                 value[i] = self._replace_deployment_types(value[i])
             return value
         elif is_instrinsic(value):
             for (k, v) in value.items():
-                value[k] = self._replace_deployment_types(v)
+                value[k] = self._replace_deployment_types(v, k)
             return value
         else:
             if value in CODEDEPLOY_PREDEFINED_CONFIGURATIONS_LIST:
+                if key == "Fn::Sub":  # Don't nest a "Sub" in a "Sub"
+                    return ["CodeDeployDefault.Lambda${ConfigName}", {"ConfigName": value}]
                 return fnSub("CodeDeployDefault.Lambda${ConfigName}", {"ConfigName": value})
             return value
 

samtranslator/model/sam_resources.py

@@ -87,6 +87,7 @@ def to_cloudformation(self, **kwargs):
         """
         resources = []
         intrinsics_resolver = kwargs["intrinsics_resolver"]
+        mappings_resolver = kwargs.get("mappings_resolver", None)
 
         if self.DeadLetterQueue:
             self._validate_dlq()
@@ -105,7 +106,8 @@ def to_cloudformation(self, **kwargs):
         if self.DeploymentPreference:
             self._validate_deployment_preference_and_add_update_policy(kwargs.get('deployment_preference_collection',
                                                                                   None),
-                                                                       lambda_alias, intrinsics_resolver)
+                                                                       lambda_alias, intrinsics_resolver,
+                                                                       mappings_resolver)
 
         managed_policy_map = kwargs.get('managed_policy_map', {})
         if not managed_policy_map:
@@ -392,13 +394,20 @@ def _construct_alias(self, name, function, version):
         return alias
 
     def _validate_deployment_preference_and_add_update_policy(self, deployment_preference_collection, lambda_alias,
-                                                              intrinsics_resolver):
+                                                              intrinsics_resolver, mappings_resolver):
         if 'Enabled' in self.DeploymentPreference:
             self.DeploymentPreference['Enabled'] = intrinsics_resolver.resolve_parameter_refs(
                 self.DeploymentPreference['Enabled'])
             if isinstance(self.DeploymentPreference['Enabled'], dict):
                 raise InvalidResourceException(self.logical_id, "'Enabled' must be a boolean value")
 
+        if 'Type' in self.DeploymentPreference:
+            # resolve intrinsics and mappings for Type
+            preference_type = self.DeploymentPreference['Type']
+            preference_type = intrinsics_resolver.resolve_parameter_refs(preference_type)
+            preference_type = mappings_resolver.resolve_parameter_refs(preference_type)
+            self.DeploymentPreference['Type'] = preference_type
+
         if deployment_preference_collection is None:
             raise ValueError('deployment_preference_collection required for parsing the deployment preference')
 

samtranslator/translator/translator.py

@@ -6,6 +6,7 @@
 from samtranslator.model.exceptions import (InvalidDocumentException, InvalidResourceException,
                                             DuplicateLogicalIdException, InvalidEventException)
 from samtranslator.intrinsics.resolver import IntrinsicsResolver
+from samtranslator.intrinsics.actions import FindInMapAction
 from samtranslator.intrinsics.resource_refs import SupportedResourceReferences
 from samtranslator.plugins.api.default_definition_body_plugin import DefaultDefinitionBodyPlugin
 from samtranslator.plugins.application.serverless_app_plugin import ServerlessAppPlugin
@@ -62,6 +63,8 @@ def translate(self, sam_template, parameter_values):
         template = copy.deepcopy(sam_template)
         macro_resolver = ResourceTypeResolver(sam_resources)
         intrinsics_resolver = IntrinsicsResolver(parameter_values)
+        mappings_resolver = IntrinsicsResolver(template.get('Mappings', {}),
+                                               {FindInMapAction.intrinsic_name: FindInMapAction()})
         deployment_preference_collection = DeploymentPreferenceCollection()
         supported_resource_refs = SupportedResourceReferences()
         document_errors = []
@@ -76,6 +79,7 @@ def translate(self, sam_template, parameter_values):
                 kwargs = macro.resources_to_link(sam_template['Resources'])
                 kwargs['managed_policy_map'] = self.managed_policy_map
                 kwargs['intrinsics_resolver'] = intrinsics_resolver
+                kwargs['mappings_resolver'] = mappings_resolver
                 kwargs['deployment_preference_collection'] = deployment_preference_collection
                 translated = macro.to_cloudformation(**kwargs)
 

tests/translator/input/function_with_custom_codedeploy_deployment_preference.yaml

@@ -1,3 +1,29 @@
+Mappings:
+  DeploymentPreferenceMap:
+    prod:
+      DeploymentPreference:
+        AllAtOnce
+    beta:
+      DeploymentPreference:
+        CustomDeployment
+
+Parameters:
+  Stage:
+    Type: String
+    Default: 'beta'
+  Deployment:
+    Type: String
+    Default: 'AllAtOnce'
+  Custom:
+    Type: String
+    Default: 'CustomDeployment'
+
+Conditions:
+  MyCondition:
+    Fn::Equals:
+      - true
+      - false
+
 Resources:
   MinimalFunction:
     Type: 'AWS::Serverless::Function'
@@ -7,4 +33,64 @@ Resources:
       Runtime: python2.7
       AutoPublishAlias: live
       DeploymentPreference:
-        Type: TestDeploymentConfiguration
+        Type: TestDeploymentConfiguration
+
+  CustomWithFindInMap: # Doesn't work
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !FindInMap [DeploymentPreferenceMap, !Ref Stage, DeploymentPreference]
+
+  CustomWithCondition: # Works
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !If [MyCondition, TestDeploymentConfiguration, AllAtOnce]
+
+  CustomWithCondition2:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !If [MyCondition, !Sub "${Deployment}", !Ref Custom]
+
+  NormalWithSub:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !Sub ${Deployment}
+
+  CustomWithSub:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !Sub ${Custom}
+
+  NormalWithRef:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: !Ref Deployment