From 5fd68cf1c2576b530959984983fc01d0264d7ef4 Mon Sep 17 00:00:00 2001
From: allisaurus <34254888+allisaurus@users.noreply.github.com>
Date: Fri, 10 Dec 2021 13:20:09 -0800
Subject: [PATCH] Let resource mapping tool save resources without an account
 ID (#6262)

* Let resource mapping tool save resources without an account ID

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
---
 .../model/basic_resource_attributes.py        |  5 ++-
 .../tests/unit/model/__init__.py              |  6 +++
 .../model/test_basic_resource_attributes.py   | 42 +++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/__init__.py
 create mode 100644 Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/test_basic_resource_attributes.py

diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
index 8a85b5d8a3..25df1d5f8e 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
@@ -70,8 +70,9 @@ class BasicResourceAttributes(object):
         self._region = new_region
 
     def is_valid(self) -> bool:
-        return not self._type == "" and not self._name_id == "" \
-               and not self._account_id == "" and not self._region == ""
+        return not self._type == "" \
+               and not self._name_id == "" \
+               and not self._region == ""
 
 
 class BasicResourceAttributesBuilder(object):
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/__init__.py
new file mode 100644
index 0000000000..f5193b300e
--- /dev/null
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/__init__.py
@@ -0,0 +1,6 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/test_basic_resource_attributes.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/test_basic_resource_attributes.py
new file mode 100644
index 0000000000..47b23734ae
--- /dev/null
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/model/test_basic_resource_attributes.py
@@ -0,0 +1,42 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+from unittest import TestCase
+from model.basic_resource_attributes import (BasicResourceAttributes, BasicResourceAttributesBuilder)
+
+class TestBasicResourceAttributes(TestCase):
+    """
+    BasicResourceAttributes unit test cases
+    """
+
+    def setUp(self) -> None:
+        testResourceAttributes: BasicResourceAttributes = BasicResourceAttributes()
+        testResourceAttributes.region = "us-east-1"
+        testResourceAttributes.type = "AWS::S3::Bucket"
+        testResourceAttributes.account_id = "123456789012"
+        testResourceAttributes.name_id = "my-o3de-bucket-in-us-east-1"
+
+        self._test_basic_resource_attributes = testResourceAttributes
+    
+    def test_is_valid(self) -> None:
+        assert self._test_basic_resource_attributes.is_valid() == True
+
+    def test_is_valid_no_accountid_ok(self) -> None:
+        self._test_basic_resource_attributes.account_id = ""
+        assert self._test_basic_resource_attributes.is_valid() == True
+
+    def test_is_valid_no_type_invalid(self) -> None:
+        self._test_basic_resource_attributes.type = ""
+        assert self._test_basic_resource_attributes.is_valid() == False
+
+    def test_is_valid_no_nameid_invalid(self) -> None:
+        self._test_basic_resource_attributes.name_id = ""
+        assert self._test_basic_resource_attributes.is_valid() == False
+
+    def test_is_valid_no_region_invalid(self) -> None:
+        self._test_basic_resource_attributes.region = ""
+        assert self._test_basic_resource_attributes.is_valid() == False