Start all deployments in us-east-2 now

devksingh4 · devksingh4 · commit d0e1553a288d · 2025-10-20T17:29:04.000-05:00
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -125,7 +125,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::298118738376:role/GitHubActionsRole
           role-session-name: Core_Prod_Deployment_${{ github.run_id }}
-          aws-region: us-east-1
+          aws-region: us-east-2
       - name: Publish to AWS
         run: make deploy_prod
         env:
diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml
@@ -135,7 +135,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::427040638965:role/GitHubActionsRole
           role-session-name: Core_QA_Deployment_${{ github.run_id }}
-          aws-region: us-east-1
+          aws-region: us-east-2
 
       - name: Publish to AWS
         run: make deploy_qa
diff --git a/.github/workflows/manual-prod.yml b/.github/workflows/manual-prod.yml
@@ -123,7 +123,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::298118738376:role/GitHubActionsRole
           role-session-name: Manual_Core_Prod_Deployment_${{ github.run_id }}
-          aws-region: us-east-1
+          aws-region: us-east-2
       - name: Publish to AWS
         run: make deploy_prod
         env:
diff --git a/src/api/functions/auditLog.ts b/src/api/functions/auditLog.ts
@@ -39,7 +39,7 @@ export async function createAuditLogEntry({
   const safeDynamoClient =
     dynamoClient ||
     new DynamoDBClient({
-      region: genericConfig.AwsOhioRegion,
+      region: genericConfig.AwsRegion,
     });
 
   const item = buildMarshalledAuditLogItem(entry);
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -289,10 +289,10 @@ Otherwise, email [infra@acm.illinois.edu](mailto:infra@acm.illinois.edu) for sup
   app.nodeCache = new NodeCache({ checkperiod: 30 });
   if (initClients) {
     app.dynamoClient = new DynamoDBClient({
-      region: genericConfig.AwsOhioRegion,
+      region: genericConfig.AwsRegion,
     });
     app.secretsManagerClient = new SecretsManagerClient({
-      region: genericConfig.AwsOhioRegion,
+      region: genericConfig.AwsRegion,
     });
     app.refreshSecretConfig = async () => {
       app.log.debug(
diff --git a/src/api/routes/iam.ts b/src/api/routes/iam.ts
@@ -60,11 +60,11 @@ const iamRoutes: FastifyPluginAsync = async (fastify, _options) => {
       const credentials = await getRoleCredentials(roleArns.Entra);
       const clients = {
         smClient: new SecretsManagerClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         dynamoClient: new DynamoDBClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         redisClient: fastify.redisClient,
diff --git a/src/api/routes/mobileWallet.ts b/src/api/routes/mobileWallet.ts
@@ -33,7 +33,7 @@ const mobileWalletRoute: FastifyPluginAsync = async (fastify, _options) => {
         // response: { 202: queuedResponseJsonSchema },
         querystring: z
           .object({
-            email: z.string().email(),
+            email: z.email(),
           })
           .refine((data) => data.email.endsWith("@illinois.edu"), {
             message: "Email must be on the illinois.edu domain.",
diff --git a/src/api/routes/organizations.ts b/src/api/routes/organizations.ts
@@ -86,11 +86,11 @@ const organizationsPlugin: FastifyPluginAsync = async (fastify, _options) => {
       const credentials = await getRoleCredentials(roleArns.Entra);
       const clients = {
         smClient: new SecretsManagerClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         dynamoClient: new DynamoDBClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         redisClient: fastify.redisClient,
diff --git a/src/api/routes/syncIdentity.ts b/src/api/routes/syncIdentity.ts
@@ -29,11 +29,11 @@ const syncIdentityPlugin: FastifyPluginAsync = async (fastify, _options) => {
       const credentials = await getRoleCredentials(roleArns.Entra);
       const clients = {
         smClient: new SecretsManagerClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         dynamoClient: new DynamoDBClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         redisClient: fastify.redisClient,
diff --git a/src/api/routes/v2/membership.ts b/src/api/routes/v2/membership.ts
@@ -41,11 +41,11 @@ const membershipV2Plugin: FastifyPluginAsync = async (fastify, _options) => {
       const credentials = await getRoleCredentials(roleArns.Entra);
       const clients = {
         smClient: new SecretsManagerClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         dynamoClient: new DynamoDBClient({
-          region: genericConfig.AwsOhioRegion,
+          region: genericConfig.AwsRegion,
           credentials,
         }),
         redisClient: fastify.redisClient,
diff --git a/src/api/sqs/utils.ts b/src/api/sqs/utils.ts
@@ -17,11 +17,11 @@ export const getAuthorizedClients = async (
     const credentials = await getRoleCredentials(roleArns.Entra);
     const clients = {
       smClient: new SecretsManagerClient({
-        region: genericConfig.AwsOhioRegion,
+        region: genericConfig.AwsRegion,
         credentials,
       }),
       dynamoClient: new DynamoDBClient({
-        region: genericConfig.AwsOhioRegion,
+        region: genericConfig.AwsRegion,
         credentials,
       }),
     };
diff --git a/src/common/config.ts b/src/common/config.ts
@@ -65,7 +65,6 @@ export type GenericConfigType = {
   SigInfoTableName: string;
   EntraHostedDomainName: string;
   StoreInventoryTableName: string;
-  AwsOhioRegion: string;
   // TODO: (store) add other tables
 };
 
@@ -89,8 +88,7 @@ const genericConfig: GenericConfigType = {
   EntraSecretName: "infra-core-api-entra",
   EntraReadOnlySecretName: "infra-core-api-ro-entra",
   UpcomingEventThresholdSeconds: 1800, // 30 mins
-  AwsRegion: "us-east-1",
-  AwsOhioRegion: "us-east-2",
+  AwsRegion: "us-east-2",
   EntraTenantId: "c8d9148f-9a59-4db3-827d-42ea0c2b6e2e",
   MerchStorePurchasesTableName: "infra-merchstore-purchase-history",
   MerchStoreMetadataTableName: "infra-merchstore-metadata",
diff --git a/terraform/envs/prod/main.tf b/terraform/envs/prod/main.tf
@@ -18,18 +18,6 @@ terraform {
 
 
 provider "aws" {
-  allowed_account_ids = ["298118738376"]
-  region              = "us-east-1"
-  default_tags {
-    tags = {
-      project           = var.ProjectId
-      terraform_managed = true
-    }
-  }
-}
-
-provider "aws" {
-  alias               = "ohio"
   allowed_account_ids = ["298118738376"]
   region              = "us-east-2"
   default_tags {
@@ -55,9 +43,6 @@ module "sqs_queues" {
   source                        = "../../modules/sqs"
   resource_prefix               = var.ProjectId
   core_sqs_consumer_lambda_name = module.lambdas.core_sqs_consumer_lambda_name
-  providers = {
-    aws = aws.ohio
-  }
 }
 
 module "dynamo" {
@@ -102,9 +87,6 @@ module "archival" {
     "${var.ProjectId}-room-requests" : 730
     # events are held forever as a cool historical archive - if no one reads them it shouldn't cost us much.
   })
-  providers = {
-    aws = aws.ohio
-  }
 }
 
 module "lambdas" {
@@ -117,9 +99,6 @@ module "lambdas" {
   PreviousOriginVerifyKeyExpiresAt = module.origin_verify.previous_invalid_time
   LogRetentionDays                 = var.LogRetentionDays
   EmailDomain                      = var.EmailDomain
-  providers = {
-    aws = aws.ohio
-  }
 }
 
 module "frontend" {
@@ -145,7 +124,6 @@ module "assets" {
 }
 
 resource "aws_lambda_event_source_mapping" "queue_consumer" {
-  provider                = aws.ohio
   region                  = "us-east-2"
   depends_on              = [module.lambdas, module.sqs_queues]
   for_each                = local.queue_arns
diff --git a/terraform/envs/qa/main.tf b/terraform/envs/qa/main.tf
@@ -19,18 +19,6 @@ terraform {
 
 provider "aws" {
   allowed_account_ids = ["427040638965"]
-  region              = "us-east-1"
-  default_tags {
-    tags = {
-      project           = var.ProjectId
-      terraform_managed = true
-    }
-  }
-}
-
-provider "aws" {
-  allowed_account_ids = ["427040638965"]
-  alias               = "ohio"
   region              = "us-east-2"
   default_tags {
     tags = {
@@ -49,9 +37,6 @@ module "sqs_queues" {
   source                        = "../../modules/sqs"
   resource_prefix               = var.ProjectId
   core_sqs_consumer_lambda_name = module.lambdas.core_sqs_consumer_lambda_name
-  providers = {
-    aws = aws.ohio
-  }
 }
 locals {
   bucket_prefix = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.region}"
@@ -100,9 +85,6 @@ module "archival" {
     "${var.ProjectId}-events" : 15
     // We delete pretty quickly in QA
   })
-  providers = {
-    aws = aws.ohio
-  }
 }
 
 resource "aws_cloudfront_key_value_store" "linkry_kv" {
@@ -191,7 +173,6 @@ resource "aws_route53_record" "linkry" {
   }
 }
 resource "aws_lambda_event_source_mapping" "queue_consumer" {
-  provider                = aws.ohio
   region                  = "us-east-2"
   depends_on              = [module.lambdas, module.sqs_queues]
   for_each                = local.queue_arns
diff --git a/terraform/modules/dynamo/main.tf b/terraform/modules/dynamo/main.tf
@@ -1,13 +1,3 @@
-provider "aws" {
-  region = "us-east-2"
-  default_tags {
-    tags = {
-      project           = var.ProjectId
-      terraform_managed = true
-    }
-  }
-}
-
 resource "aws_dynamodb_table" "app_audit_log" {
   billing_mode                = "PAY_PER_REQUEST"
   name                        = "${var.ProjectId}-audit-log"
