From 36a30c899bf9108686f330200242a46f43a4774d Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:51:23 +0800 Subject: [PATCH] remove email-service workspace and mfa-api DNS --- cmd/cli/multiregion/dns.go | 13 +------------ cmd/cli/multiregion/failover.go | 3 --- cmd/cli/multiregion/multiregion.go | 8 -------- cmd/cli/multiregion/setup.go | 31 ------------------------------ 4 files changed, 1 insertion(+), 54 deletions(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index a9a384b..ea89c8b 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -28,14 +28,6 @@ type DnsCommand struct { testMode bool } -type DnsValues struct { - albInternal string - albExternal string - bot string - mfa string - twosv string -} - func InitDnsCmd(parentCmd *cobra.Command) { var failback, includeCommon bool @@ -136,10 +128,7 @@ func (d *DnsCommand) setDnsRecordValues(idpKey string) { } common := []nameValuePair{ - // "mfa-api" is the TOTP API, also known as serverless-mfa-api - {"mfa-api", "mfa-api-" + region}, - - // "twosv-api" is the Webauthn API, also known as serverless-mfa-api-go + // "twosv-api" is the TOTP and Webauthn API, also known as serverless-mfa-api-go {"twosv-api", "twosv-api-" + region}, // this is the idp-support-bot API that is configured in the Slack API dashboard diff --git a/cmd/cli/multiregion/failover.go b/cmd/cli/multiregion/failover.go index e93a7bb..933e6bd 100644 --- a/cmd/cli/multiregion/failover.go +++ b/cmd/cli/multiregion/failover.go @@ -21,8 +21,6 @@ const ( Ecr = "022-ecr" Phpmyadmin = "030-phpmyadmin" PhpmyadminSecondary = "030-phpmyadmin-secondary" - EmailService = "031-email-service" - EmailServiceSecondary = "031-email-service-secondary" DbBackup = "032-db-backup" IdBroker = "040-id-broker" IdBrokerSecondary = "040-id-broker-secondary" @@ -87,7 +85,6 @@ func newFailover(pFlags PersistentFlags) *Failover { ClusterSecondary: clusterSecondaryWorkspace, DatabaseSecondary: databaseSecondaryWorkspace, PhpmyadminSecondary: pmaSecondaryWorkspace, - EmailServiceSecondary: emailSecondaryWorkspace, IdBrokerSecondary: brokerSecondaryWorkspace, PwManagerSecondary: pwSecondaryWorkspace, SimplesamlphpSecondary: sspSecondaryWorkspace, diff --git a/cmd/cli/multiregion/multiregion.go b/cmd/cli/multiregion/multiregion.go index 34c45c4..06c209e 100644 --- a/cmd/cli/multiregion/multiregion.go +++ b/cmd/cli/multiregion/multiregion.go @@ -113,14 +113,6 @@ func pmaSecondaryWorkspace(pFlags PersistentFlags) string { return fmt.Sprintf("idp-%s-%s-030-phpmyadmin-secondary", pFlags.idp, pFlags.env) } -func emailWorkspace(pFlags PersistentFlags) string { - return fmt.Sprintf("idp-%s-%s-031-email-service", pFlags.idp, pFlags.env) -} - -func emailSecondaryWorkspace(pFlags PersistentFlags) string { - return fmt.Sprintf("idp-%s-%s-031-email-service-secondary", pFlags.idp, pFlags.env) -} - func backupWorkspace(pFlags PersistentFlags) string { return fmt.Sprintf("idp-%s-%s-032-db-backup", pFlags.idp, pFlags.env) } diff --git a/cmd/cli/multiregion/setup.go b/cmd/cli/multiregion/setup.go index b3ddea8..3472fc5 100644 --- a/cmd/cli/multiregion/setup.go +++ b/cmd/cli/multiregion/setup.go @@ -60,7 +60,6 @@ func createSecondaryWorkspaces(pFlags PersistentFlags) { createSecondaryWorkspace(pFlags, clusterWorkspace(pFlags)) createSecondaryWorkspace(pFlags, databaseWorkspace(pFlags)) createSecondaryWorkspace(pFlags, pmaWorkspace(pFlags)) - createSecondaryWorkspace(pFlags, emailWorkspace(pFlags)) createSecondaryWorkspace(pFlags, brokerWorkspace(pFlags)) createSecondaryWorkspace(pFlags, pwWorkspace(pFlags)) createSecondaryWorkspace(pFlags, sspWorkspace(pFlags)) @@ -149,7 +148,6 @@ func setMultiregionVariables(pFlags PersistentFlags) { tfRemoteClusterSecondary := lib.TFVar{Key: "tf_remote_cluster_secondary", Value: pFlags.org + "/" + clusterSecondaryWorkspace(pFlags)} tfRemoteDatabase := lib.TFVar{Key: "tf_remote_database", Value: pFlags.org + "/" + databaseWorkspace(pFlags)} tfRemoteDatabaseSecondary := lib.TFVar{Key: "tf_remote_database_secondary", Value: pFlags.org + "/" + databaseSecondaryWorkspace(pFlags)} - tfRemoteEmailSecondary := lib.TFVar{Key: "tf_remote_email_secondary", Value: pFlags.org + "/" + emailSecondaryWorkspace(pFlags)} tfRemoteBrokerSecondary := lib.TFVar{Key: "tf_remote_broker_secondary", Value: pFlags.org + "/" + brokerSecondaryWorkspace(pFlags)} tfRemotePwManagerSecondary := lib.TFVar{Key: "tf_remote_pwmanager_secondary", Value: pFlags.org + "/" + pwSecondaryWorkspace(pFlags)} tfRemoteSsp := lib.TFVar{Key: "tf_remote_simplesamlphp", Value: pFlags.org + "/" + sspWorkspace(pFlags)} @@ -195,23 +193,15 @@ func setMultiregionVariables(pFlags PersistentFlags) { } setVars(pFlags, pmaSecondaryWorkspace(pFlags), pmaVars) - emailVars := []lib.TFVar{ - tfRemoteClusterSecondary, - tfRemoteDatabaseSecondary, - } - setVars(pFlags, emailSecondaryWorkspace(pFlags), emailVars) - brokerVars := []lib.TFVar{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, - tfRemoteEmailSecondary, } setVars(pFlags, brokerSecondaryWorkspace(pFlags), brokerVars) pwVars := []lib.TFVar{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, - tfRemoteEmailSecondary, tfRemoteBrokerSecondary, } setVars(pFlags, pwSecondaryWorkspace(pFlags), pwVars) @@ -227,7 +217,6 @@ func setMultiregionVariables(pFlags PersistentFlags) { syncVars := []lib.TFVar{ tfRemoteClusterSecondary, - tfRemoteEmailSecondary, tfRemoteBrokerSecondary, } setVars(pFlags, syncSecondaryWorkspace(pFlags), syncVars) @@ -246,16 +235,10 @@ func deleteUnusedVariables(pFlags PersistentFlags) { "tf_remote_cluster", "tf_remote_database", }) - deleteVariablesFromWorkspace(pFlags, emailSecondaryWorkspace(pFlags), []string{ - "aws_region", - "tf_remote_cluster", - "tf_remote_database", - }) deleteVariablesFromWorkspace(pFlags, brokerSecondaryWorkspace(pFlags), []string{ "aws_region", "tf_remote_cluster", "tf_remote_database", - "tf_remote_email", }) deleteVariablesFromWorkspace(pFlags, pwSecondaryWorkspace(pFlags), []string{ "aws_region", @@ -263,7 +246,6 @@ func deleteUnusedVariables(pFlags PersistentFlags) { "tf_remote_cluster", "tf_remote_database", "tf_remote_elasticache", - "tf_remote_email", }) deleteVariablesFromWorkspace(pFlags, sspSecondaryWorkspace(pFlags), []string{ "aws_region", @@ -277,7 +259,6 @@ func deleteUnusedVariables(pFlags PersistentFlags) { "aws_region", "tf_remote_broker", "tf_remote_cluster", - "tf_remote_email", }) } @@ -366,7 +347,6 @@ func setRemoteConsumers(pFlags PersistentFlags) error { databaseWorkspace(pFlags), databaseSecondaryWorkspace(pFlags), ecrWorkspace(pFlags), - emailSecondaryWorkspace(pFlags), brokerSecondaryWorkspace(pFlags), pwSecondaryWorkspace(pFlags), } @@ -405,7 +385,6 @@ func getWorkspaceConsumers(pFlags PersistentFlags, workspace string) []string { clusterSecondaryWorkspace(pFlags), databaseSecondaryWorkspace(pFlags), pmaSecondaryWorkspace(pFlags), - emailSecondaryWorkspace(pFlags), brokerSecondaryWorkspace(pFlags), pwSecondaryWorkspace(pFlags), sspSecondaryWorkspace(pFlags), @@ -414,7 +393,6 @@ func getWorkspaceConsumers(pFlags PersistentFlags, workspace string) []string { clusterSecondaryWorkspace(pFlags): { databaseSecondaryWorkspace(pFlags), pmaSecondaryWorkspace(pFlags), - emailSecondaryWorkspace(pFlags), backupWorkspace(pFlags), brokerSecondaryWorkspace(pFlags), searchWorkspace(pFlags), @@ -427,24 +405,17 @@ func getWorkspaceConsumers(pFlags PersistentFlags, workspace string) []string { }, databaseSecondaryWorkspace(pFlags): { pmaSecondaryWorkspace(pFlags), - emailSecondaryWorkspace(pFlags), backupWorkspace(pFlags), brokerSecondaryWorkspace(pFlags), pwSecondaryWorkspace(pFlags), sspSecondaryWorkspace(pFlags), }, ecrWorkspace(pFlags): { - emailSecondaryWorkspace(pFlags), brokerSecondaryWorkspace(pFlags), pwSecondaryWorkspace(pFlags), sspSecondaryWorkspace(pFlags), syncSecondaryWorkspace(pFlags), }, - emailSecondaryWorkspace(pFlags): { - brokerSecondaryWorkspace(pFlags), - pwSecondaryWorkspace(pFlags), - syncSecondaryWorkspace(pFlags), - }, brokerSecondaryWorkspace(pFlags): { searchWorkspace(pFlags), pwSecondaryWorkspace(pFlags), @@ -475,8 +446,6 @@ func setRunTriggers(pFlags PersistentFlags) error { // map of workspaces (key) and source workspaces (value) for run triggers to be created runTriggers := map[string]string{ databaseSecondaryWorkspace(pFlags): clusterSecondaryWorkspace(pFlags), - emailSecondaryWorkspace(pFlags): databaseSecondaryWorkspace(pFlags), - brokerSecondaryWorkspace(pFlags): emailSecondaryWorkspace(pFlags), pwSecondaryWorkspace(pFlags): brokerSecondaryWorkspace(pFlags), sspSecondaryWorkspace(pFlags): pwSecondaryWorkspace(pFlags), syncSecondaryWorkspace(pFlags): sspSecondaryWorkspace(pFlags),