From 15a4c59c4497da61f6d1c7d37e19e5e44769d1a5 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:44:38 -0600 Subject: [PATCH 1/6] no longer need to set the internal ECS DNS records --- cmd/cli/multiregion/dns.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index 60dcd5c..5f27c96 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -129,8 +129,6 @@ func (d *DnsCommand) setDnsRecordValues(idpKey string) { {supportBotName, supportBotName + "-" + region}, // ECS services - {idpKey + "-email", idpKey + "-email-" + region}, - {idpKey + "-broker", idpKey + "-broker-" + region}, {idpKey + "-pw-api", idpKey + "-pw-api-" + region}, {idpKey, idpKey + "-" + region}, {idpKey + "-sync", idpKey + "-sync-" + region}, From 2dfb97f196045f8e582f50f2f6d0fd34a1208649 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:45:42 -0600 Subject: [PATCH 2/6] a DNS error shouldn't be a fatal since other records might work --- cmd/cli/multiregion/dns.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index 5f27c96..871f2a9 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -151,10 +151,12 @@ func (d *DnsCommand) setCloudflareCname(name, value string) { r, _, err := d.cfClient.ListDNSRecords(ctx, d.cfZone, cloudflare.ListDNSRecordsParams{Name: name + "." + d.domainName}) if err != nil { - log.Fatalf("error finding DNS record %s: %s", name, err) + fmt.Printf("Error: Cloudflare API call failed to find DNS record %s: %s\n", name, err) + return } if len(r) != 1 { - log.Fatalf("did not find DNS record %s", name) + fmt.Printf("Error: did not find DNS record %q in domain %q\n", name, d.domainName) + return } if r[0].Content == value { @@ -179,6 +181,6 @@ func (d *DnsCommand) setCloudflareCname(name, value string) { Content: value, }) if err != nil { - log.Fatalf("error updating DNS record %s: %s", name, err) + fmt.Printf("error updating DNS record %s: %s\nparams: %+v\n", name, err, params) } } From f5aa09fbf1cbea96107bc7d1dc9394407f03a366 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:46:35 -0600 Subject: [PATCH 3/6] need to set the DNS record value using the FQDN --- cmd/cli/multiregion/dns.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index 871f2a9..c5bea2a 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -135,7 +135,7 @@ func (d *DnsCommand) setDnsRecordValues(idpKey string) { } for _, record := range dnsRecords { - d.setCloudflareCname(record.name, record.value) + d.setCloudflareCname(record.name, record.value+"."+d.domainName) } } From cb9badd430bd18a6406e1246f46c2016cedebe76 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:48:38 -0600 Subject: [PATCH 4/6] put error message back to pre-troubleshooting format --- cmd/cli/multiregion/dns.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index c5bea2a..3659720 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -181,6 +181,6 @@ func (d *DnsCommand) setCloudflareCname(name, value string) { Content: value, }) if err != nil { - fmt.Printf("error updating DNS record %s: %s\nparams: %+v\n", name, err, params) + fmt.Printf("error updating DNS record %s: %s\n", name, err) } } From a7fc513ef979e33445f242da49255f55108f3a0c Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:48:51 -0600 Subject: [PATCH 5/6] retain the DNS record comment --- cmd/cli/multiregion/dns.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index 3659720..b4f6071 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -179,6 +179,7 @@ func (d *DnsCommand) setCloudflareCname(name, value string) { Type: "CNAME", Name: name, Content: value, + Comment: r[0].Comment, }) if err != nil { fmt.Printf("error updating DNS record %s: %s\n", name, err) From c914ca519167bcb32f3908191a2363ca2586490e Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:49:06 -0600 Subject: [PATCH 6/6] print a message when running in read-only mode --- cmd/cli/multiregion/dns.go | 4 ++++ cmd/cli/multiregion/failover.go | 4 ++++ cmd/cli/multiregion/setup.go | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index b4f6071..6858a75 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -56,6 +56,10 @@ func InitDnsCmd(parentCmd *cobra.Command) { func runDnsCommand(failback bool) { pFlags := getPersistentFlags() + if pFlags.readOnlyMode { + fmt.Println("-- Read-only mode enabled --") + } + d := newDnsCommand(pFlags, failback) d.setDnsRecordValues(pFlags.idp) diff --git a/cmd/cli/multiregion/failover.go b/cmd/cli/multiregion/failover.go index 45b40b4..e93a7bb 100644 --- a/cmd/cli/multiregion/failover.go +++ b/cmd/cli/multiregion/failover.go @@ -65,6 +65,10 @@ func InitFailoverCmd(parentCmd *cobra.Command) { func runFailover() { pFlags := getPersistentFlags() + if pFlags.readOnlyMode { + fmt.Println("-- Read-only mode enabled --") + } + lib.SetToken(pFlags.tfcToken) answer := simplePrompt(`Please confirm activation of failover mode. Type "yes" to continue.`) diff --git a/cmd/cli/multiregion/setup.go b/cmd/cli/multiregion/setup.go index f981d9a..b3ddea8 100644 --- a/cmd/cli/multiregion/setup.go +++ b/cmd/cli/multiregion/setup.go @@ -29,6 +29,10 @@ func InitSetupCmd(parentCmd *cobra.Command) { func runSetup() { pFlags := getPersistentFlags() + if pFlags.readOnlyMode { + fmt.Println("-- Read-only mode enabled --") + } + lib.SetToken(pFlags.tfcToken) createSecondaryWorkspaces(pFlags)