lyn2919: Update all references to O3DE

- Also fix issue where invalid SIDs could be generated
- Make default project name consistent across Gems

Gems/AWSCore/cdk/README.md

@@ -44,9 +44,9 @@ $ pip install -r requirements.txt
 
 ## Set environment variables or accept defaults
 
-* O3D_AWS_DEPLOY_REGION*: The region to deploy the stacks into, will default to CDK_DEFAULT_REGION
-* O3D_AWS_DEPLOY_ACCOUNT*: The account to deploy stacks into, will default to CDK_DEFAULT_ACCOUNT
-* O3D_AWS_PROJECT_NAME*: The name of the O3DE project stacks should be deployed for will default to AWS-PROJECT
+* O3DE_AWS_DEPLOY_REGION*: The region to deploy the stacks into, will default to CDK_DEFAULT_REGION
+* O3DE_AWS_DEPLOY_ACCOUNT*: The account to deploy stacks into, will default to CDK_DEFAULT_ACCOUNT
+* O3DE_AWS_PROJECT_NAME*: The name of the O3DE project stacks should be deployed for will default to AWS-PROJECT
 
 See https://docs.aws.amazon.com/cdk/latest/guide/environments.html for more information including how to pass parameters
 to use for environment variables.

Gems/AWSCore/cdk/app.py

@@ -22,11 +22,11 @@ from core.aws_core import AWSCore
 from example.example_resources_stack import ExampleResources
 
 """Configuration"""
-REGION = os.environ.get('O3D_AWS_DEPLOY_REGION', os.environ.get('CDK_DEFAULT_REGION'))
-ACCOUNT = os.environ.get('O3D_AWS_DEPLOY_ACCOUNT', os.environ.get('CDK_DEFAULT_ACCOUNT'))
+REGION = os.environ.get('O3DE_AWS_DEPLOY_REGION', os.environ.get('CDK_DEFAULT_REGION'))
+ACCOUNT = os.environ.get('O3DE_AWS_DEPLOY_ACCOUNT', os.environ.get('CDK_DEFAULT_ACCOUNT'))
 
 # Set the common prefix to group stacks in a project together.
-PROJECT_NAME = os.environ.get('O3D_AWS_PROJECT_NAME', f'AWS-PROJECT').upper()
+PROJECT_NAME = os.environ.get('O3DE_AWS_PROJECT_NAME', f'O3DE-AWS-PROJECT').upper()
 
 # The name of this feature
 FEATURE_NAME = 'Core'

Gems/AWSCore/cdk/core/core_stack.py

@@ -27,7 +27,7 @@ class CoreStack(core.Stack):
     """
 
     # Resource groups cannot start with 'AWS' or 'aws' so add this prefix
-    RESOURCE_GROUP_PREFIX = 'O3D'
+    RESOURCE_GROUP_PREFIX = 'O3DE'
 
     def __init__(self, scope: core.Construct, id_: str, project_name: str, feature_name: str, **kwargs) -> None:
         super().__init__(scope, id_, **kwargs)