From 9faaebe36864a2900e4e27c247497e7cb8a3e338 Mon Sep 17 00:00:00 2001
From: Justin Plock <jplock@amazon.com>
Date: Thu, 13 Feb 2025 14:46:44 -0500
Subject: [PATCH] [fix] fix references

---
 template.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/template.yml b/template.yml
index 0ea99bb..7a0399f 100644
--- a/template.yml
+++ b/template.yml
@@ -653,7 +653,10 @@ Resources:
       Description: "DO NOT DELETE - Organization Activation Function"
       Environment:
         Variables:
-          ROOT_ID: !GetAtt rOrganization.RootId
+          ROOT_ID: !If
+            - cHasOrganizationRootId
+            - !Ref pOrganizationRootId
+            - !GetAtt rOrganization.RootId
       Handler: index.handler
       MemorySize: 1024  # megabytes
       PropagateTags: true
@@ -737,7 +740,10 @@ Resources:
       StackInstancesGroup:
         - DeploymentTargets:
             OrganizationalUnitIds:
-              - !GetAtt rOrganization.RootId
+              - !If
+                - cHasOrganizationRootId
+                - !Ref pOrganizationRootId
+                - !GetAtt rOrganization.RootId
           Regions:
             - !Ref "AWS::Region"  # single region only for the IAM roles
       StackSetName: AWSPlatform-BASELINE-ROLES