Merge remote-tracking branch 'origin' into MultiplayerComponents

Gems/AWSClientAuth/cdk/README.md

@@ -26,9 +26,9 @@ Once the python and pip are set up, you can install the required dependencies.
 
 Set variables
 ```
-set O3D_AWS_DEPLOY_REGION="us-west-2"
-set O3D_AWS_DEPLOY_ACCOUNT=""
-set O3D_AWS_PROJECT_NAME="AWSIProject"
+set O3DE_AWS_DEPLOY_REGION="us-west-2"
+set O3DE_AWS_DEPLOY_ACCOUNT=""
+set O3DE_AWS_PROJECT_NAME="AWSIProject"
 
 If you want to add 3rd party providers fill values in utils/constant.py
 ```

Gems/AWSClientAuth/cdk/app.py

@@ -16,11 +16,11 @@ from aws_client_auth.client_auth_stack import AWSClientAuthStack
 import os
 
 """Configuration"""
-REGION = os.environ.get('O3D_AWS_DEPLOY_REGION', os.environ['CDK_DEFAULT_REGION'])
-ACCOUNT = os.environ.get('O3D_AWS_DEPLOY_ACCOUNT', os.environ['CDK_DEFAULT_ACCOUNT'])
+REGION = os.environ.get('O3DE_AWS_DEPLOY_REGION', os.environ['CDK_DEFAULT_REGION'])
+ACCOUNT = os.environ.get('O3DE_AWS_DEPLOY_ACCOUNT', os.environ['CDK_DEFAULT_ACCOUNT'])
 
 # Set the common prefix to group stacks in a project together.
-PROJECT_NAME = os.environ.get('O3D_AWS_PROJECT_NAME', f'O3D-AWS-PROJECT').upper()
+PROJECT_NAME = os.environ.get('O3DE_AWS_PROJECT_NAME', f'O3DE-AWS-PROJECT').upper()
 
 env = core.Environment(account=ACCOUNT, region=REGION)
 app = core.App()

Gems/AWSClientAuth/cdk/cognito/cognito_identity_pool.py

@@ -58,7 +58,7 @@ class CognitoIdentityPool:
         self._identity_pool.add_depends_on(cognito_user_pool.get_user_pool())
         self._identity_pool.add_depends_on(cognito_user_pool.get_user_pool_client())
 
-        # Create roles to associate with Cognito Idenity pool
+        # Create roles to associate with Cognito Identity pool
         self._auth_role = CognitoIdentityPoolRole(scope, feature_name, project_name, env,
                                                   self._identity_pool, authenticated=True)
         self._unauth_role = CognitoIdentityPoolRole(scope, feature_name, project_name, env,

Gems/AWSClientAuth/cdk/utils/name_utils.py

@@ -8,7 +8,7 @@
  remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
-
+import re
 from aws_cdk import core
 
 
@@ -21,7 +21,9 @@ def format_aws_resource_id(feature_name: str, project_name: str, env: core.Envir
 
 
 def format_aws_resource_sid(feature_name: str, project_name: str, resource_type: str):
-    return f'{project_name}{feature_name}{resource_type}SId'
+    sid = f'{project_name}{feature_name}{resource_type}SId'
+    # Strip out all chars not valid in a sid
+    return re.sub(r'[^a-zA-Z0-9]', '', sid)
 
 
 def format_aws_resource_authenticated_id(feature_name: str, project_name: str, env: core.Environment,