Merge commit 'edb15946ca06072c26a5979f8a1682526ec5fce2' into puvvadar/gitflow_211118_o3de

4 years ago · 6cd0852f8d
parent ef25271d80 edb15946ca
commit 6cd0852f8d
2 changed files with 2 additions and 2 deletions
--- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
@ -84,7 +84,7 @@ static constexpr const char TEST_VALID_EMPTY_ACCOUNTID_RESOURCE_MAPPING_CONFIG_F
    },
    "AccountId": "",
    "Region": "us-west-2",
-    "Version": "1.0.0"
+    "Version": "1.1.0"
 })";

 static constexpr const char TEST_INVALID_RESOURCE_MAPPING_CONFIG_FILE[] =
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
@ -24,7 +24,7 @@ _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME: str = "Type"
 _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME: str = "Name/ID"
 _RESOURCE_MAPPING_REGION_JSON_KEY_NAME: str = "Region"
 _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME: str = "Version"
-_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.0.0"
+_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.1.0"

 RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME: str = "AccountId"
 RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE: str = "EMPTY"