Update function_with_custom_code_deploy integration test case (#2320)

* Update function_with_custom_code_deploy integration test case * Remove unused methods
aws · Feb 28, 2022 · d42d64b · d42d64b
1 parent dfb1307
commit d42d64b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/integration/combination/test_function_with_deployment_preference.py b/integration/combination/test_function_with_deployment_preference.py
@@ -1,7 +1,7 @@
 from unittest.case import skipIf
 
 from integration.helpers.base_test import BaseTest
-from integration.helpers.resource import current_region_does_not_support
+from integration.helpers.resource import current_region_does_not_support, generate_suffix
 from integration.config.service_names import CODE_DEPLOY
 
 CODEDEPLOY_APPLICATION_LOGICAL_ID = "ServerlessDeploymentApplication"
@@ -16,15 +16,11 @@ def test_lambda_function_with_deployment_preference_uses_code_deploy(self):
         self._verify_no_deployment_then_update_and_verify_deployment()
 
     def test_lambda_function_with_custom_deployment_preference(self):
-        custom_deployment_config_name = "CustomLambdaDeploymentConfiguration"
-        # Want to delete / recreate custom deployment resource to make sure it exists and hasn't changed
-        if self._has_custom_deployment_configuration(custom_deployment_config_name):
-            self._delete_deployment_configuration(custom_deployment_config_name)
+        custom_deployment_config_name = "CustomLambdaDeploymentConfiguration" + generate_suffix()
+        parameters = [self.generate_parameter("DeployConfigName", custom_deployment_config_name)]
 
-        self._create_deployment_configuration(custom_deployment_config_name)
-
-        self.create_and_verify_stack("combination/function_with_custom_code_deploy")
-        self._verify_no_deployment_then_update_and_verify_deployment()
+        self.create_and_verify_stack("combination/function_with_custom_code_deploy", parameters)
+        self._verify_no_deployment_then_update_and_verify_deployment(parameters)
 
     def test_use_default_manage_policy(self):
         self.create_and_verify_stack("combination/function_with_deployment_default_role_managed_policy")
@@ -140,23 +136,6 @@ def _get_physical_resource_id(self, resource_type, logical_id):
         )
         return resources_with_this_id["PhysicalResourceId"]
 
-    def _has_custom_deployment_configuration(self, deployment_name):
-        result = self.client_provider.code_deploy_client.list_deployment_configs()["deploymentConfigsList"]
-        return deployment_name in result
-
-    def _delete_deployment_configuration(self, deployment_name):
-        self.client_provider.code_deploy_client.delete_deployment_config(deploymentConfigName=deployment_name)
-
-    def _create_deployment_configuration(self, deployment_name):
-        client = self.client_provider.code_deploy_client
-        traffic_routing_config = {
-            "type": "TimeBasedLinear",
-            "timeBasedLinear": {"linearPercentage": 50, "linearInterval": 1},
-        }
-        client.create_deployment_config(
-            deploymentConfigName=deployment_name, computePlatform="Lambda", trafficRoutingConfig=traffic_routing_config
-        )
-
     def _get_deployment_group_configuration_name(self, deployment_group_name, application_name):
         deployment_group = self.client_provider.code_deploy_client.get_deployment_group(
             applicationName=application_name, deploymentGroupName=deployment_group_name

diff --git a/integration/resources/expected/combination/function_with_custom_code_deploy.json b/integration/resources/expected/combination/function_with_custom_code_deploy.json
@@ -5,5 +5,6 @@
   { "LogicalResourceId":"MyLambdaFunctionVersion", "ResourceType":"AWS::Lambda::Version" },
   { "LogicalResourceId":"ServerlessDeploymentApplication", "ResourceType":"AWS::CodeDeploy::Application" },
   { "LogicalResourceId":"MyLambdaFunctionDeploymentGroup", "ResourceType":"AWS::CodeDeploy::DeploymentGroup" },
-  { "LogicalResourceId":"DeploymentRole", "ResourceType":"AWS::IAM::Role" }
+  { "LogicalResourceId":"DeploymentRole", "ResourceType":"AWS::IAM::Role" },
+  { "LogicalResourceId":"CustomDeploymentConfig", "ResourceType":"AWS::CodeDeploy::DeploymentConfig" }
 ]
diff --git a/integration/resources/templates/combination/function_with_custom_code_deploy.yaml b/integration/resources/templates/combination/function_with_custom_code_deploy.yaml
@@ -1,6 +1,11 @@
+Parameters:
+  DeployConfigName:
+    Type: String
+
 # Just one function with a deployment preference
 Resources:
   MyLambdaFunction:
+    DependsOn: CustomDeploymentConfig
     Type: 'AWS::Serverless::Function'
     Properties:
       CodeUri: ${codeuri}
@@ -10,7 +15,8 @@ Resources:
       AutoPublishAlias: Live
 
       DeploymentPreference:
-        Type: CustomLambdaDeploymentConfiguration
+        Type:
+          Ref: CustomDeploymentConfig
         Role:
           Fn::GetAtt: [ DeploymentRole, Arn ]
 
@@ -43,3 +49,15 @@ Resources:
                   - "lambda:InvokeFunction"
                   - "s3:Get*"
                   - "sns:Publish"
+
+  CustomDeploymentConfig:
+    Type: AWS::CodeDeploy::DeploymentConfig
+    Properties:
+      DeploymentConfigName:
+        Ref: DeployConfigName
+      ComputePlatform: Lambda
+      TrafficRoutingConfig:
+        Type: TimeBasedLinear
+        TimeBasedLinear:
+          LinearInterval: 1
+          LinearPercentage: 50