Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions scripts/aws/EUID_CloudFormation.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
51 changes: 6 additions & 45 deletions scripts/aws/UID_CloudFormation.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -190,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
- '"'
Expand Down Expand Up @@ -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
Expand Down