From 4472194e1385b75c46086519a3d7f42c23c403e4 Mon Sep 17 00:00:00 2001
From: Xu Yang <xu.yang@thetradedesk.com>
Date: Fri, 21 Mar 2025 15:53:26 -0700
Subject: [PATCH 1/2] xuy-UID2-5201-Update-CFT

---
 scripts/aws/EUID_CloudFormation.template.yml | 19 ++------
 scripts/aws/UID_CloudFormation.template.yml  | 47 ++------------------
 2 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/scripts/aws/EUID_CloudFormation.template.yml b/scripts/aws/EUID_CloudFormation.template.yml
index 72dd5141c..a9b67635a 100644
--- a/scripts/aws/EUID_CloudFormation.template.yml
+++ b/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
diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml
index e2422c1fe..b1b6e0a4c 100644
--- a/scripts/aws/UID_CloudFormation.template.yml
+++ b/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

From 0c140427cb46c77f70c0704cfb5f4f709577a22f Mon Sep 17 00:00:00 2001
From: Xu Yang <xu.yang@thetradedesk.com>
Date: Tue, 25 Mar 2025 09:58:32 -0700
Subject: [PATCH 2/2] Update UID_CloudFormation.template.yml

---
 scripts/aws/UID_CloudFormation.template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml
index b1b6e0a4c..422246dda 100644
--- a/scripts/aws/UID_CloudFormation.template.yml
+++ b/scripts/aws/UID_CloudFormation.template.yml
@@ -151,9 +151,9 @@ Resources:
         - ''
         - - '{'
           - '"core_base_url": "'
-          - !If [IsIntegEnvironment, 'https://core-integ.uidapi.com', 'https://core.uidapi.com']
+          - !If [IsIntegEnvironment, 'https://core-integ.uidapi.com', 'https://core-prod.uidapi.com']
           - '", "optout_base_url": "'
-          - !If [IsIntegEnvironment, 'https://optout-integ.uidapi.com', 'https://optout.uidapi.com']
+          - !If [IsIntegEnvironment, 'https://optout-integ.uidapi.com', 'https://optout-prod.uidapi.com']
           - '", "operator_key": "'
           - Ref: APIToken
           - '"'