try passing params to cdk deploy

Author: jtherrmann

.github/actions/deploy-hyp3/action.yml

@@ -117,4 +117,8 @@ runs:
             DISTRIBUTION_URL='${{ inputs.DISTRIBUTION_URL}}'
 
           cdk diff
-          cdk deploy --require-approval=never
+          cdk deploy \
+            --require-approval=never \
+            --parameters \
+            AmiId='${{ inputs.AMI_ID }}' \
+            DefaultMaxvCpus='${{ inputs.DEFAULT_MAX_VCPUS }}'

apps/main-cf.yml.j2

@@ -52,10 +52,8 @@ Parameters:
       - true
 
   AmiId:
-    # FIXME: retrieve AmiId from ssm parameter store
-    #Type: AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
-    #Default: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
-    Type: AWS::EC2::Image::Id
+    Type: AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
+    Default: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
 
   DefaultMaxvCpus:
     Description: Default maximum size for the AWS Batch compute environment

cdk_app/hyp3_stack.py

@@ -2,7 +2,6 @@
 
 import aws_cdk as cdk
 from aws_cdk import cloudformation_include as cfn_inc
-from aws_cdk import aws_ssm as ssm
 from constructs import Construct
 
 
@@ -20,11 +19,9 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             'AuthPublicKey': os.environ['AUTH_PUBLIC_KEY'],
             'DefaultCreditsPerUser': os.environ['DEFAULT_CREDITS_PER_USER'],
             'DefaultApplicationStatus': os.environ['DEFAULT_APPLICATION_STATUS'],
-            'DefaultMaxvCpus': os.environ['DEFAULT_MAX_VCPUS'],
             'ExpandedMaxvCpus': os.environ['EXPANDED_MAX_VCPUS'],
             'MonthlyBudget': os.environ['MONTHLY_BUDGET'],
             'RequiredSurplus': os.environ['REQUIRED_SURPLUS'],
-            'AmiId': ssm.StringParameter.from_string_parameter_name(self, 'AmiId', os.environ['AMI_ID']).string_value,
             'InstanceTypes': os.environ['INSTANCE_TYPES'].split(','),
         }
         if os.environ['SECURITY_ENVIRONMENT'] != 'EDC':