xuy-UID2-5201-Update-CFT for aws market place (#1590)

* xuy-UID2-5201-Update-CFT

* Update UID_CloudFormation.template.yml

Author: clarkxuyang

scripts/aws/EUID_CloudFormation.template.yml

@@ -12,6 +12,9 @@ Parameters:
     AllowedValues:
       - prod
       - integ
+  ImageId:
+    Type: AWS::EC2::Image::Id
+    Default: ami-example1234567890
   TrustNetworkCidr:
     Description: The IP address range that can be used to SSH and HTTPS to the EC2 instances
     Type: String
@@ -104,20 +107,6 @@ Metadata:
         default: If choose to false for CustomizeEnclaceResource, enter memory for Enclave in MB
       EnclaveCPUCount:
         default: If choose to false for CustomizeEnclaceResource, enter CPU count for Enclave
-Mappings:
-  RegionMap:
-    eu-central-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-3:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-south-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-north-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
 Conditions:
   IsIntegEnvironment: !Equals
     - !Ref DeployToEnvironment
@@ -253,7 +242,7 @@ Resources:
               VolumeType: gp3
         IamInstanceProfile:
           Name: !Ref WorkerInstanceProfile
-        ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
+        ImageId: !Ref ImageId
         InstanceType: !Ref InstanceType
         EnclaveOptions:
           Enabled: true

scripts/aws/UID_CloudFormation.template.yml

@@ -12,6 +12,9 @@ Parameters:
     AllowedValues:
       - prod
       - integ
+  ImageId:
+    Type: AWS::EC2::Image::Id
+    Default: ami-example1234567890
   TrustNetworkCidr:
     Description: The IP address range that can be used to SSH and HTTPS to the EC2 instances
     Type: String
@@ -104,48 +107,6 @@ Metadata:
         default: If choose to false for CustomizeEnclaceResource, enter memory for Enclave in MB
       EnclaveCPUCount:
         default: If choose to false for CustomizeEnclaceResource, enter CPU count for Enclave
-Mappings:
-  RegionMap:
-    us-east-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    us-east-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    us-west-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    us-west-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-central-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-west-3:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-south-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    eu-north-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    me-south-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-east-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-south-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-northeast-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-northeast-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-southeast-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ap-southeast-2:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    sa-east-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    ca-central-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
-    af-south-1:
-      AMI: ami-xxxxxxxxxxxxxxxxx
 Conditions:
   IsIntegEnvironment: !Equals
     - !Ref DeployToEnvironment
@@ -281,7 +242,7 @@ Resources:
             VolumeType: gp3
         IamInstanceProfile:
           Name: !Ref WorkerInstanceProfile
-        ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
+        ImageId: !Ref ImageId
         InstanceType: !Ref InstanceType
         EnclaveOptions:
           Enabled: true