address comment

Author: vicheey

integration/combination/test_function_with_capacity_provider.py

@@ -40,9 +40,6 @@ def test_function_with_capacity_provider_custom_role(self):
 
     def test_function_with_capacity_provider_default_role(self):
         """Test Lambda function with CapacityProviderConfig using default operator role.
-
-        Note: This test is skipped until 12/01/2024 because the managed policy required for
-        the default operator role is not available until then.
         """
         # Phase 1: Prepare parameters from companion stack
         parameters = [
@@ -59,7 +56,7 @@ def test_function_with_capacity_provider_default_role(self):
         self.assertEqual(len(lambda_resources), 1, "Should create exactly one Lambda function")
 
         capacity_provider_resources = self.get_stack_resources("AWS::Lambda::CapacityProvider")
-        self.assertEqual(len(capacity_provider_resources), 1, "Should create exactly one CapacityProvider")
+        self.assertEqual(len(capacity_provider_resources), 2, "Should create exactly two CapacityProviders")
 
         iam_role_resources = self.get_stack_resources("AWS::IAM::Role")
-        self.assertEqual(len(iam_role_resources), 2, "Should create exactly two IAM roles")
+        self.assertEqual(len(iam_role_resources), 3, "Should create exactly three IAM roles")

integration/resources/expected/combination/function_lmi_default.json

@@ -1,10 +1,18 @@
 [
   {
-    "LogicalResourceId": "MyCapacityProvider",
+    "LogicalResourceId": "SimpleCapacityProvider",
     "ResourceType": "AWS::Lambda::CapacityProvider"
   },
   {
-    "LogicalResourceId": "MyCapacityProviderOperatorRole",
+    "LogicalResourceId": "SimpleCapacityProviderOperatorRole",
+    "ResourceType": "AWS::IAM::Role"
+  },
+  {
+    "LogicalResourceId": "AdvancedCapacityProvider",
+    "ResourceType": "AWS::Lambda::CapacityProvider"
+  },
+  {
+    "LogicalResourceId": "AdvancedCapacityProviderOperatorRole",
     "ResourceType": "AWS::IAM::Role"
   },
   {

integration/resources/templates/combination/function_lmi_custom.yaml

@@ -24,10 +24,9 @@ Resources:
           Statement:
           - Effect: Allow
             Action:
-            - ec2:TerminateInstances
             - ec2:AttachNetworkInterface
-            - ec2:RunInstances
             - ec2:CreateTags
+            - ec2:RunInstances
             Resource:
             - !Sub arn:${AWS::Partition}:ec2:*:*:instance/*
             - !Sub arn:${AWS::Partition}:ec2:*:*:network-interface/*
@@ -39,12 +38,12 @@ Resources:
             Action:
             - ec2:DescribeAvailabilityZones
             - ec2:DescribeCapacityReservations
-            - ec2:DescribeInstanceTypes
+            - ec2:DescribeInstances
+            - ec2:DescribeInstanceStatus
             - ec2:DescribeInstanceTypeOfferings
+            - ec2:DescribeInstanceTypes
             - ec2:DescribeSecurityGroups
             - ec2:DescribeSubnets
-            - ec2:DescribeInstances
-            - ec2:DescribeInstanceStatus
             Resource: '*'
           - Effect: Allow
             Action:
@@ -72,7 +71,6 @@ Resources:
         SecurityGroupIds:
         - !Ref SecurityGroup
       OperatorRole: !GetAtt MyCapacityProviderCustomRole.Arn
-      KmsKeyArn: !Ref KMSKeyArn
 
   MyFunction:
     Type: AWS::Serverless::Function

integration/resources/templates/combination/function_lmi_default.yaml

@@ -7,16 +7,14 @@ Parameters:
     Type: String
 
 Resources:
-  MyCapacityProvider:
+  SimpleCapacityProvider:
     Type: AWS::Serverless::CapacityProvider
     Properties:
-      CapacityProviderName: !Sub "${AWS::StackName}-cp"
       VpcConfig:
         SubnetIds:
         - !Ref SubnetId
         SecurityGroupIds:
         - !Ref SecurityGroup
-      KmsKeyArn: !Ref KMSKeyArn
 
   MyFunction:
     Type: AWS::Serverless::Function
@@ -25,7 +23,30 @@ Resources:
       Handler: index.handler
       CodeUri: ${codeuri}
       CapacityProviderConfig:
-        Arn: !GetAtt MyCapacityProvider.Arn
+        Arn: !GetAtt SimpleCapacityProvider.Arn
+  
+  AdvancedCapacityProvider:
+    Type: AWS::Serverless::CapacityProvider
+    Properties:
+      CapacityProviderName: !Sub "${AWS::StackName}-cp"
+      VpcConfig:
+        SubnetIds:
+        - !Ref SubnetId
+        SecurityGroupIds:
+        - !Ref SecurityGroup
+      InstanceRequirements:
+        Architectures:
+          - x86_64
+        AllowedTypes:
+          - m5.large
+          - m5.xlarge
+          - m5.2xlarge
+      ScalingConfig:
+        MaxVCpuCount: 64
+        AverageCPUUtilization: 70
+      KmsKeyArn: !Ref KMSKeyArn
+      Tags:
+        Environment: Test
 
 Metadata:
   SamTransformTest: true