From 7e43861dc8be22f1f357357c76ac470d5018ba28 Mon Sep 17 00:00:00 2001 From: Jordan Roth <41999487+jordanaroth@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:20:23 -0700 Subject: [PATCH] fix for email & assumerole --- 02_CFN_DEPLOY_AHA.yml | 2 +- BETA-multi-region/02_CFN_MR_DEPLOY_AHA.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/02_CFN_DEPLOY_AHA.yml b/02_CFN_DEPLOY_AHA.yml index bd81eda..f02724e 100644 --- a/02_CFN_DEPLOY_AHA.yml +++ b/02_CFN_DEPLOY_AHA.yml @@ -69,7 +69,7 @@ Conditions: UsingTeams: !Not [!Equals [!Ref MicrosoftTeamsWebhookURL, None]] UsingChime: !Not [!Equals [!Ref AmazonChimeWebhookURL, None]] UsingEventBridge: !Not [!Equals [!Ref EventBusName, None]] - UsingSecrets: !Or [!Condition UsingSlack, !Condition UsingTeams, !Condition UsingChime, !Condition UsingEventBridge] + UsingSecrets: !Or [!Condition UsingSlack, !Condition UsingTeams, !Condition UsingChime, !Condition UsingEventBridge, !Condition UsingCrossAccountRole] UsingCrossAccountRole: !Not [!Equals [!Ref ManagementAccountRoleArn, None]] UsingAccountIds: !Not [!Equals [!Ref AccountIDs, None]] Parameters: diff --git a/BETA-multi-region/02_CFN_MR_DEPLOY_AHA.yaml b/BETA-multi-region/02_CFN_MR_DEPLOY_AHA.yaml index d468679..05fa587 100644 --- a/BETA-multi-region/02_CFN_MR_DEPLOY_AHA.yaml +++ b/BETA-multi-region/02_CFN_MR_DEPLOY_AHA.yaml @@ -72,7 +72,7 @@ Conditions: UsingTeams: !Not [!Equals [!Ref MicrosoftTeamsWebhookURL, None]] UsingChime: !Not [!Equals [!Ref AmazonChimeWebhookURL, None]] UsingEventBridge: !Not [!Equals [!Ref EventBusName, None]] - UsingSecrets: !Or [!Condition UsingSlack, !Condition UsingTeams, !Condition UsingChime, !Condition UsingEventBridge] + UsingSecrets: !Or [!Condition UsingSlack, !Condition UsingTeams, !Condition UsingChime, !Condition UsingEventBridge, !Condition UsingCrossAccountRole] UsingCrossAccountRole: !Not [!Equals [!Ref ManagementAccountRoleArn, None]] NotUsingMultiRegion: !Equals [!Ref SecondaryRegion, 'No'] UsingMultiRegion: !Not [!Equals [!Ref SecondaryRegion, 'No']]