Fixup region mode

PRX · Sep 19, 2023 · d74d23d · d74d23d
1 parent 9cc9d28
commit d74d23d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/spire/templates/apps-300A.yml b/spire/templates/apps-300A.yml
@@ -77,7 +77,6 @@ Resources:
         EnvironmentType: !Ref EnvironmentType
         EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation
         EnvironmentTypeLowercase: !Ref EnvironmentTypeLowercase
-        RegionMode: !Ref RegionMode
         RootStackName: !Ref RootStackName
         RootStackId: !Ref RootStackId
         EchoServiceToken: !Ref EchoServiceToken

diff --git a/spire/templates/apps/augury.yml b/spire/templates/apps/augury.yml
@@ -31,7 +31,6 @@ Parameters:
   EnvironmentType: { Type: String }
   EnvironmentTypeAbbreviation: { Type: String }
   EnvironmentTypeLowercase: { Type: String }
-  RegionMode: { Type: String }
   RootStackName: { Type: String }
   RootStackId: { Type: String }
   EchoServiceToken: { Type: String }
@@ -64,7 +63,6 @@ Parameters:
 
 Conditions:
   IsProduction: !Equals [!Ref EnvironmentType, Production]
-  IsPrimaryRegion: !Equals [!Ref RegionMode, Primary]
   HasAuroraEndpoint: !Not [!Equals [!Ref SharedAuroraPostgresqlEndpoint, ""]]
   EnableWorkers: !And [!Condition HasAuroraEndpoint, !Condition IsPrimaryRegion]
 

diff --git a/spire/templates/root.yml b/spire/templates/root.yml
@@ -472,6 +472,7 @@ Resources:
     Properties:
       Parameters:
         EnvironmentType: !Ref EnvironmentType
+        RegionMode: !FindInMap [RegionModeMap, !Ref "AWS::Region", !Ref EnvironmentType]
         RootStackId: !Ref AWS::StackId
         RootStackName: !Ref AWS::StackName
         SourceSecurityGroupId1: !GetAtt SharedEcsAsgSecurityGroupStack.Outputs.InstanceSecurityGroupId

diff --git a/spire/templates/shared-app-redis.yml b/spire/templates/shared-app-redis.yml
@@ -10,21 +10,23 @@ Description: >-
 
 Parameters:
   EnvironmentType: { Type: String }
+  RegionMode: { Type: String }
   RootStackName: { Type: String }
   RootStackId: { Type: String }
   SourceSecurityGroupId1: { Type: AWS::EC2::SecurityGroup::Id }
+  VpcId: { Type: AWS::EC2::VPC::Id }
+  VpcPrivateSubnet1Id: { Type: AWS::EC2::Subnet::Id }
+  VpcPrivateSubnet2Id: { Type: AWS::EC2::Subnet::Id }
+  VpcPrivateSubnet3Id: { Type: AWS::EC2::Subnet::Id }
   StagingInstanceType:
     Type: String
     Default: cache.t4g.micro
   ProductionInstanceType:
     Type: String
     Default: cache.t4g.small
-  VpcId: { Type: AWS::EC2::VPC::Id }
-  VpcPrivateSubnet1Id: { Type: AWS::EC2::Subnet::Id }
-  VpcPrivateSubnet2Id: { Type: AWS::EC2::Subnet::Id }
-  VpcPrivateSubnet3Id: { Type: AWS::EC2::Subnet::Id }
 
 Conditions:
+  IsPrimaryRegion: !Equals [!Ref RegionMode, Primary]
   IsProduction: !Equals [!Ref EnvironmentType, Production]
 
 Resources: