Ci

.github/workflows/dev-branch.yaml

@@ -0,0 +1,47 @@
+name: dev-branch-deployment
+on:
+  push:
+    branches-ignore:
+      - main
+      - master
+jobs:
+  dev-deploy-to-aws:
+    runs-on: ubuntu-latest
+    env:
+      CICD_ACCOUNT_ID: ${{ secrets.CICD_ACCOUNT_ID }}
+
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        name: Set up python
+        with: 
+          python-version: 3.11
+
+      - name: Install python dependencies
+        run: pip install -r requirements.txt
+
+      - name: Configure AWS profile
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.STS_ASSUME_ROLE_ARN }}
+          role-session-name: github-actions-cfn-deploy
+          aws-region: ${{ vars.AWS_REGION }}
+
+      - uses: actions/setup-node@v4
+        name: Install nodejs
+        with: 
+          node-version: 20
+
+      - name: Install CDK CLI with nodejs
+        run: | 
+          npm install -g aws-cdk
+
+      - name: Build the CDK stack using the aws profile
+        run: |
+          cd immersion/environments/dev
+          cdk deploy --app "python3 app.py" --require-approval never

.github/workflows/master-branch.yaml

@@ -0,0 +1,47 @@
+name: dev-branch-deployment
+on:
+  pull_request:
+    branches:
+      - main
+      - master
+jobs:
+  prod-deploy-to-aws:
+    runs-on: ubuntu-latest
+    env:
+      CICD_ACCOUNT_ID: ${{ secrets.CICD_ACCOUNT_ID }}
+
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        name: Set up python
+        with: 
+          python-version: 3.11
+
+      - name: Install python dependencies
+        run: pip install -r requirements.txt
+
+      - name: Configure AWS profile
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.STS_ASSUME_ROLE_ARN }}
+          role-session-name: github-actions-cfn-deploy
+          aws-region: ${{ vars.AWS_REGION }}
+
+      - uses: actions/setup-node@v4
+        name: Install nodejs
+        with: 
+          node-version: 20
+
+      - name: Install CDK CLI with nodejs
+        run: | 
+          npm install -g aws-cdk
+
+      - name: Build the CDK stack using the aws profile
+        run: |
+          cd immersion/environments/dev
+          cdk deploy --app "python3 app.py" --require-approval never

immersion/environments/dev/app.py

@@ -0,0 +1,13 @@
+from immersion_stack import ImmersionStack
+import aws_cdk as cdk
+import os
+
+app = cdk.App()
+ImmersionStack(app, "ImmersionStackDev",
+    env = {
+        "account": os.getenv('CICD_ACCOUNT_ID'), # Assuming it's only being deployed with GH Actions
+        "region": "us-east-1"
+    }
+)
+
+app.synth()

immersion/immersion_stack.py → immersion/environments/dev/immersion_stack.py

@@ -26,36 +26,56 @@ class ImmersionStack(Stack):
     def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         super().__init__(scope, construct_id, **kwargs)
 
+        if os.getenv('CI') == "true":
+            APP_NAME = ssm.StringParameter.value_from_lookup(
+                self,
+                parameter_name="/immersion/app_name"
+            )
+
+            DISCORD_TOKEN = ssm.StringParameter.value_from_lookup(
+                self,
+                parameter_name="/immersion/discord-token-secure"
+            )
+        else:
+            APP_NAME = os.getenv('APP_NAME')
+            DISCORD_TOKEN = os.getenv('DISCORD_TOKEN')
+
+        SSM_PARAMETER_NAME_API = ssm.StringParameter.value_from_lookup(
+            self,
+            parameter_name="engage_api_key_test"
+        )
+
+
         # DynamoDB Table Definitions
         serverTable = dynamodb.TableV2(
             self, 
-            f'{os.getenv('APP_NAME')}ServerTable',
+            f"{APP_NAME}ServerTable",
             partition_key=dynamodb.Attribute(name='serverId', type=dynamodb.AttributeType.STRING),
         )
 
         onboardingTable = dynamodb.TableV2(
             self,
-            f'{os.getenv('APP_NAME')}OrganizationTable',
+            f"{APP_NAME}OrganizationTable",
             partition_key=dynamodb.Attribute(name='organizationId', type=dynamodb.AttributeType.NUMBER)
         )
 
         cacheTable = dynamodb.TableV2(
             self,
-            f'{os.getenv('APP_NAME')}APICacheTable',
+            f"{APP_NAME}APICacheTable",
             partition_key=dynamodb.Attribute(name='clubId', type=dynamodb.AttributeType.STRING),
         )
 
         eventTable = dynamodb.TableV2(
             self,
-            f'{os.getenv('APP_NAME')}EventTable',
+            f"{APP_NAME}EventTable",
             partition_key=dynamodb.Attribute(name='eventId', type=dynamodb.AttributeType.STRING),
         )
 
         # SQS Queue and Size Metric Defintion
         queue = sqs.Queue(
             self,
-            f'{os.getenv('APP_NAME')}DataQueue',
-            queue_name=f'{os.getenv('APP_NAME')}_Data_Queue',
+            f"{APP_NAME}DataQueue",
+            queue_name=f"{APP_NAME}_Data_Queue",
         )
 
         scale_metric = queue.metric_approximate_number_of_messages_visible(
@@ -65,8 +85,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
 
         scale_out_alarm = scale_metric.create_alarm(
             self,
-            f'{os.getenv('APP_NAME')}DataParserScaleOutAlarm',
-            alarm_name=f'{os.getenv('APP_NAME')}DataProcessScaleOutAlarm',
+            f"{APP_NAME}DataParserScaleOutAlarm",
+            alarm_name=f"{APP_NAME}DataProcessScaleOutAlarm",
             threshold=1, 
             evaluation_periods=1,
             comparison_operator=cw.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
@@ -75,8 +95,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
 
         scale_in_alarm = scale_metric.create_alarm(
             self,
-            f'{os.getenv('APP_NAME')}DataParserScaleInAlarm',
-            alarm_name=f'{os.getenv('APP_NAME')}DataParserScaleInAlarm',
+            f"{APP_NAME}DataParserScaleInAlarm",
+            alarm_name=f"{APP_NAME}DataParserScaleInAlarm",
             threshold=0,
             evaluation_periods=1,
             comparison_operator=cw.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
@@ -92,35 +112,35 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
 
         cluster = ecs.Cluster(
             self,
-            f'{os.getenv('APP_NAME')}ServiceCluster',
+            f"{APP_NAME}ServiceCluster",
             vpc=vpc
         )
 
         # Discord App Container Definition 
         app_task_defintion = ecs.FargateTaskDefinition(
             self,
-            f'{os.getenv('APP_NAME')}DiscordAppTaskDefinition',
+            f"{APP_NAME}DiscordAppTaskDefinition",
             memory_limit_mib=1024, # 1 GB
             cpu=512, # 0.5 vCPU
         )
 
         app_task_defintion.add_container(
-            f'{os.getenv('APP_NAME')}DiscordApp',
+            f"{APP_NAME}DiscordApp",
             image=ecs.ContainerImage.from_docker_image_asset(
                 DockerImageAsset(
                     self,
-                    f'{os.getenv('APP_NAME')}DiscordAppDockerImage',
-                    directory='src/discordapp/'
+                    f"{APP_NAME}DiscordAppDockerImage",
+                    directory='../../../src/discordapp/'
                 )
             ),
             environment={
-                'DISCORD_TOKEN': os.getenv('DISCORD_TOKEN')
+                'DISCORD_TOKEN': DISCORD_TOKEN
             }
         )
 
         app_service = ecs.FargateService(
             self,
-            f'{os.getenv('APP_NAME')}DiscordAppService',
+            f"{APP_NAME}DiscordAppService",
             cluster=cluster,
             task_definition=app_task_defintion,
             assign_public_ip=True
@@ -133,19 +153,19 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         # Data Parser Task Definition
         parser_task_definition = ecs.FargateTaskDefinition(
             self,
-            f'{os.getenv('APP_NAME')}DataParserTask',
+            f"{APP_NAME}DataParserTask",
             memory_limit_mib=1024, # 1 GB
             cpu=512, # 0.5 vCPU
         )
 
         parser_task_definition.add_container(
-            f'{os.getenv('APP_NAME')}DataParser',
+            f"{APP_NAME}DataParser",
             # TODO: REFACTOR TO USE GITHUB CONTAINER REGISTRY!
             image=ecs.ContainerImage.from_docker_image_asset( 
                 DockerImageAsset(
                     self,
-                    f'{os.getenv('APP_NAME')}DataParserImage',
-                    directory='src/data_parser/',
+                    f"{APP_NAME}DataParserImage",
+                    directory='../../../src/data_parser/',
                 )
             ),
             environment={
@@ -159,7 +179,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
 
         parser_service = ecs.FargateService(
             self,
-            f'{os.getenv('APP_NAME')}DataParserService',
+            f"{APP_NAME}DataParserService",
             cluster=cluster,
             task_definition=parser_task_definition,
             assign_public_ip=True
@@ -168,7 +188,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         # Scale metrics for data parser service
         scaling_target = appautoscaling.ScalableTarget(
             self,
-            id=f'{os.getenv('APP_NAME')}ParserScalingTarget',
+            id=f"{APP_NAME}ParserScalingTarget",
             service_namespace=appautoscaling.ServiceNamespace.ECS,
             scalable_dimension='ecs:service:DesiredCount',
             min_capacity=0,
@@ -218,26 +238,27 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         # TODO: figure out how to make a layer for python dependencies
         # filter_layer = _lambda.LayerVersion(
         #     self,
-        #     f'{os.getenv('APP_NAME')}FilterLayer',
+        #     f'{APP_NAME}FilterLayer',
 
         # )
 
         # Data Filter Lambda Functions
         engage_api_key_param = ssm.StringParameter.from_secure_string_parameter_attributes(
             self,
-            f'{os.getenv('APP_NAME')}APIKEY',
-            parameter_name=f'{os.getenv('SSM_PARAMETER_NAME_API')}'
+            f"{APP_NAME}APIKEY",
+            parameter_name=f"{os.getenv('SSM_PARAMETER_NAME_API')}"
         )
 
         club_information_lambda = lambda_python.PythonFunction(
             self,
-            f'{os.getenv('APP_NAME')}ClubInformationLambda',
-            runtime=Runtime.PYTHON_3_13,
-            entry='src/data_filters/onboarding',
+            f"{APP_NAME}ClubInformationLambda",
+            runtime=Runtime.PYTHON_3_10,
+            entry='../../../src/data_filters/onboarding',
             handler='lambda_handler',
             environment={
                 'QUEUE_URL': queue.queue_url
             },
         )
+
         queue.grant_send_messages(club_information_lambda)
-        engage_api_key_param.grant_read(club_information_lambda)
+        engage_api_key_param.grant_read(club_information_lambda)

immersion/environments/prod/app.py

@@ -0,0 +1,13 @@
+from immersion_stack import ImmersionStack
+import aws_cdk as cdk
+import os
+
+app = cdk.App()
+ImmersionStack(app, "ImmersionStackDev",
+    env = {
+        "account": os.getenv('CICD_ACCOUNT_ID'), # Assuming it's only being deployed with GH Actions
+        "region": "us-east-1"
+    }
+)
+
+app.synth()