Fix condition for master account membershipt

getmoto · Dec 27, 2024 · 9bbe518 · 9bbe518
1 parent 5601d8f
commit 9bbe518
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/moto/organizations/models.py b/moto/organizations/models.py
@@ -538,9 +538,9 @@ def list_organizational_units_for_parent(
         ]
 
     def create_account(self, **kwargs: Any) -> Dict[str, Any]:
-        if (
-            self.org is None
-            or self.account_id not in organizations_backends.master_accounts
+        if self.org is None or (
+            self.account_id != self.org.master_account_id
+            and self.account_id not in organizations_backends.master_accounts
         ):
             raise AWSOrganizationsNotInUseException
 
@@ -554,9 +554,9 @@ def create_account(self, **kwargs: Any) -> Dict[str, Any]:
         return new_account.create_account_status
 
     def close_account(self, **kwargs: Any) -> None:
-        if (
-            self.org is None
-            or self.account_id not in organizations_backends.master_accounts
+        if self.org is None or (
+            self.account_id != self.org.master_account_id
+            and self.account_id not in organizations_backends.master_accounts
         ):
             raise AWSOrganizationsNotInUseException