Organizations: Extend validation and errors

moto/organizations/exceptions.py

@@ -40,6 +40,16 @@ def __init__(self) -> None:
         )
 
 
+class AlreadyInOrganizationException(JsonRESTError):
+    code = 400
+
+    def __init__(self) -> None:
+        super().__init__(
+            "AlreadyInOrganizationException",
+            "The provided account is already a member of an organization.",
+        )
+
+
 class AWSOrganizationsNotInUseException(JsonRESTError):
     code = 400
 
@@ -83,6 +93,16 @@ def __init__(self) -> None:
         )
 
 
+class OrganizationNotEmptyException(JsonRESTError):
+    code = 400
+
+    def __init__(self) -> None:
+        super().__init__(
+            "OrganizationNotEmptyException",
+            "To delete an organization you must first remove all member accounts (except the master).",
+        )
+
+
 class PolicyTypeAlreadyEnabledException(JsonRESTError):
     code = 400
 

moto/organizations/models.py

@@ -12,11 +12,13 @@
     AccountAlreadyRegisteredException,
     AccountNotFoundException,
     AccountNotRegisteredException,
+    AlreadyInOrganizationException,
     AWSOrganizationsNotInUseException,
     ConstraintViolationException,
     DuplicateOrganizationalUnitException,
     DuplicatePolicyException,
     InvalidInputException,
+    OrganizationNotEmptyException,
     PolicyNotFoundException,
     PolicyTypeAlreadyEnabledException,
     PolicyTypeNotEnabledException,
@@ -422,6 +424,9 @@ def _get_root_by_id(self, root_id: str) -> FakeRoot:
         return root  # type: ignore[return-value]
 
     def create_organization(self, region: str, **kwargs: Any) -> Dict[str, Any]:
+        if self.org or self.account_id in organizations_backends.master_accounts:
+            raise AlreadyInOrganizationException
+
         self.org = FakeOrganization(
             self.account_id,
             region_name=region,
@@ -468,11 +473,12 @@ def describe_organization(self) -> Dict[str, Any]:
         raise AWSOrganizationsNotInUseException
 
     def delete_organization(self) -> None:
+        if self.org is None:
+            raise AWSOrganizationsNotInUseException
+
         if [account for account in self.accounts if account.name != "master"]:
-            raise RESTError(
-                "OrganizationNotEmptyException",
-                "To delete an organization you must first remove all member accounts (except the master).",
-            )
+            raise OrganizationNotEmptyException
+
         self._reset()
 
     def list_roots(self) -> Dict[str, Any]:
@@ -532,6 +538,12 @@ 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
+        ):
+            raise AWSOrganizationsNotInUseException
+
         new_account = FakeAccount(self.org, **kwargs)  # type: ignore
         self.accounts.append(new_account)
         self.attach_policy(PolicyId=utils.DEFAULT_POLICY_ID, TargetId=new_account.id)
@@ -542,6 +554,12 @@ 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
+        ):
+            raise AWSOrganizationsNotInUseException
+
         for account in self.accounts:
             if account.id == kwargs["AccountId"]:
                 account.close()