From fed9770cfc2b0e7a4a813f338657b7835b0630a8 Mon Sep 17 00:00:00 2001 From: Ryan Koval Date: Wed, 4 Aug 2021 23:47:10 -0500 Subject: [PATCH] added callout that this env var is no longer used --- awsworkflow/aws.go | 5 +++++ workflow/workflow.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/awsworkflow/aws.go b/awsworkflow/aws.go index cd1d3639..030349d1 100644 --- a/awsworkflow/aws.go +++ b/awsworkflow/aws.go @@ -2,6 +2,7 @@ package awsworkflow import ( "context" + "errors" "net/http" "os" "strings" @@ -55,6 +56,10 @@ var defaultAwsConsoleDomainChina string = "console.amazonaws.cn" var defaultAwsConsoleDomainUsGov string = "console.amazonaws-us-gov.com" func InitAWSConsoleDomain(region string) { + oldAwsConsoleDomain := os.Getenv("ALRED_AWS_CONSOLE_SERVICES_WORKFLOW_AWS_CONSOLE_DOMAIN") + if oldAwsConsoleDomain != "" { + panic(errors.New("`ALRED_AWS_CONSOLE_SERVICES_WORKFLOW_AWS_CONSOLE_DOMAIN` env var was renamed to `ALFRED_AWS_CONSOLE_SERVICES_WORKFLOW_AWS_CONSOLE_DOMAIN` due to the misspelling. Please update your config")) + } awsConsoleDomain := os.Getenv("ALFRED_AWS_CONSOLE_SERVICES_WORKFLOW_AWS_CONSOLE_DOMAIN") if awsConsoleDomain == "" { if strings.HasPrefix(region, "cn-") { diff --git a/workflow/workflow.go b/workflow/workflow.go index 6b960b39..4f134b9b 100644 --- a/workflow/workflow.go +++ b/workflow/workflow.go @@ -139,6 +139,10 @@ func Run(wf *aw.Workflow, rawQuery string, transport http.RoundTripper, forceFet } func finalize(wf *aw.Workflow, query *parsers.Query) { + if r := recover(); r != nil { + // we don't want this deferred function to prevent panics from showing in the workflow + panic(r) + } if wf.IsEmpty() { title := "" subtitle := ""