Merge branch 'main' into eeen17/siglead-mainscreen-api

Author: eeen17

.editorconfig

@@ -8,6 +8,9 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.ics]
+insert_final_newline = false
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

.github/workflows/autoupdate.yml

@@ -0,0 +1,17 @@
+name: autoupdate
+on:
+  push:
+    branches:
+      - main
+jobs:
+  autoupdate:
+    permissions:
+      contents: write
+    name: autoupdate
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker://chinthakagodawita/autoupdate-action:v1
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          PR_FILTER: "protected"
+          MERGE_MSG: "Auto-update feature branch with changes from the main branch"

.github/workflows/deploy-dev.yml

@@ -8,7 +8,7 @@ on:
       - main
 
 jobs:
-  test-unit:
+  test:
     runs-on: ubuntu-latest
     name: Run Unit Tests
     steps:
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Restore Yarn Cache
         uses: actions/cache@v4
@@ -30,14 +30,47 @@ jobs:
           restore-keys: |
             yarn-modules-${{ runner.os }}-
 
-      - name: Set up Python 3.11 for testing
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
       - name: Run unit testing
         run: make test_unit
 
+  build:
+    runs-on: ubuntu-latest
+    name: Build Application
+    steps:
+      - uses: actions/checkout@v4
+        env:
+          HUSKY: "0"
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+          cache: "yarn"
+
+      - name: Restore Yarn Cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
+          restore-keys: |
+            yarn-modules-${{ runner.os }}-
+
+      - name: Run build
+        run: make build
+        env:
+          HUSKY: "0"
+          VITE_RUN_ENVIRONMENT: dev
+
+      - name: Upload Build files
+        uses: actions/upload-artifact@v4
+        with:
+          include-hidden-files: true
+          name: build
+          path: |
+            .aws-sam/
+            dist/
+            dist_ui/
+
   deploy-test-dev:
     runs-on: ubuntu-latest
     permissions:
@@ -47,9 +80,10 @@ jobs:
       group: ${{ github.event.repository.name }}-dev-env
       cancel-in-progress: false
     environment: "AWS DEV"
-    name: Deploy to DEV and Run Tests
+    name: Deploy to DEV and Run Live Tests
     needs:
-      - test-unit
+      - test
+      - build
     steps:
       - uses: actions/checkout@v4
         env:
@@ -59,7 +93,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Restore Yarn Cache
         uses: actions/cache@v4
@@ -69,6 +103,11 @@ jobs:
           restore-keys: |
             yarn-modules-${{ runner.os }}-
 
+      - name: Download Build files
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+
       - uses: aws-actions/setup-sam@v2
         with:
           use-installer: true
@@ -93,13 +132,9 @@ jobs:
       - name: Run health check
         run: make dev_health_check
 
-      - name: Run live testing
-        run: make test_live_integration
-        env:
-          JWT_KEY: ${{ secrets.JWT_KEY }}
-
-      - name: Run E2E testing
-        run: make test_e2e
+      - name: Run post-deploy testing (Live and E2E)
+        run: make test_post_deploy -j 2
         env:
           PLAYWRIGHT_USERNAME: ${{ secrets.PLAYWRIGHT_USERNAME }}
           PLAYWRIGHT_PASSWORD: ${{ secrets.PLAYWRIGHT_PASSWORD }}
+          JWT_KEY: ${{ secrets.JWT_KEY }}

.github/workflows/deploy-prod.yml

@@ -7,23 +7,68 @@ on:
     branches:
       - main
 jobs:
-  test-unit:
+  test:
     runs-on: ubuntu-latest
     name: Run Unit Tests
     steps:
+      - uses: actions/checkout@v4
+        env:
+          HUSKY: "0"
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
           node-version: 22.x
+          cache: "yarn"
+
+      - name: Restore Yarn Cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
+          restore-keys: |
+            yarn-modules-${{ runner.os }}-
+
+      - name: Run unit testing
+        run: make test_unit
+
+  build:
+    runs-on: ubuntu-latest
+    name: Build Application
+    steps:
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
-      - name: Set up Python 3.11 for testing
-        uses: actions/setup-python@v5
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
         with:
-          python-version: 3.11
-      - name: Run unit testing
-        run: make test_unit
+          node-version: 22.x
+          cache: "yarn"
+
+      - name: Restore Yarn Cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-prod
+          restore-keys: |
+            yarn-modules-${{ runner.os }}-
+
+      - name: Run build
+        run: make build
+        env:
+          HUSKY: "0"
+          VITE_RUN_ENVIRONMENT: prod
+
+      - name: Upload Build files
+        uses: actions/upload-artifact@v4
+        with:
+          include-hidden-files: true
+          name: build-prod
+          path: |
+            .aws-sam/
+            dist/
+            dist_ui/
 
   deploy-prod:
     runs-on: ubuntu-latest
@@ -35,7 +80,8 @@ jobs:
       id-token: write
       contents: read
     needs:
-      - test-unit
+      - test
+      - build
     environment: "AWS PROD"
     steps:
       - name: Set up Node for testing
@@ -53,6 +99,10 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: 3.11
+      - name: Download Build files
+        uses: actions/download-artifact@v4
+        with:
+          name: build-prod
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: arn:aws:iam::298118738376:role/GitHubActionsRole

.github/workflows/review.yml

@@ -0,0 +1,33 @@
+name: Required Reviews
+on:
+  pull_request_review:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  check:
+    name: Checking required reviews
+    runs-on: ubuntu-latest
+    permissions: {}
+
+    if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
+
+    steps:
+      - uses: Automattic/[email protected]
+        with:
+          token: ${{ secrets.REQUIRED_REVIEWS_TOKEN }}
+          status: Required Reviews
+          requirements: |
+            - name: Cloud provider files
+              paths:
+                - '.github/'
+                - 'cloudformation/'
+              teams:
+                - "officers"
+                - "infra-chairs"
+            - name: Base Requirement
+              paths: unmatched
+              teams:
+                - "officers"
+                - "infra-chairs"
+                - "infra-leads"

.npmrc

@@ -0,0 +1 @@
+@acm-uiuc:registry=https://registry.npmjs.org

CODEOWNERS

@@ -52,8 +52,9 @@ clean:
 	rm -rf dist/
 	rm -rf dist_ui/
 	rm -rf dist_devel/
+	rm -rf coverage/
 
-build: src/ cloudformation/ docs/
+build: src/ cloudformation/
 	yarn -D
 	VITE_BUILD_HASH=$(GIT_HASH) yarn build
 	cp -r src/api/resources/ dist/api/resources
@@ -65,14 +66,14 @@ build: src/ cloudformation/ docs/
 local:
 	VITE_BUILD_HASH=$(GIT_HASH) yarn run dev
 
-deploy_prod: check_account_prod build
+deploy_prod: check_account_prod
 	@echo "Deploying CloudFormation stack..."
 	sam deploy $(common_params) --parameter-overrides $(run_env)=prod $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)"
 	@echo "Syncing S3 bucket..."
 	aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete
 	make invalidate_cloudfront
 
-deploy_dev: check_account_dev build
+deploy_dev: check_account_dev
 	@echo "Deploying CloudFormation stack..."
 	sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)"
 	@echo "Syncing S3 bucket..."
@@ -85,6 +86,7 @@ invalidate_cloudfront:
 	$(eval DISTRIBUTION_ID_2 := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontIcalDistributionId'].OutputValue" --output text))
 	$(eval INVALIDATION_ID := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
 	$(eval INVALIDATION_ID_2 := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID_2) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
+	@echo "Triggered invalidation jobs $(INVALIDATION_ID) and $(INVALIDATION_ID_2)..."
 	@echo "Waiting on job $(INVALIDATION_ID)..."
 	aws cloudfront wait invalidation-completed --distribution-id $(DISTRIBUTION_ID) --id $(INVALIDATION_ID)
 	@echo "Waiting on job $(INVALIDATION_ID_2)..."
@@ -109,6 +111,8 @@ test_e2e: install
 	yarn playwright install
 	yarn test:e2e
 
+test_post_deploy: test_live_integration test_e2e
+
 dev_health_check:
 	curl -f https://core.aws.qa.acmuiuc.org/api/v1/healthz && curl -f https://core.aws.qa.acmuiuc.org/
 

Makefile

@@ -43,6 +43,7 @@ Resources:
             Effect: Allow
             Resource:
               - Fn::Sub: arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:infra-core-api-config*
+              - Fn::Sub: arn:aws:secretsmanager:${AWS::Region}:427040638965:secret:infra-core-api-testing-credentials* # this secret only exists in awsdev account
 
           - Action:
               - dynamodb:DescribeLimits
@@ -153,6 +154,15 @@ Resources:
                 - lambda.amazonaws.com
 
       Policies:
+        - PolicyName: lambda-self-invoke
+          PolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              - Action:
+                  - lambda:invokeFunction
+                Effect: Allow
+                Resource:
+                  - Fn::Sub: "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${LambdaFunctionName}:*"
         - PolicyName: lambda-generic
           PolicyDocument:
             Version: "2012-10-17"

cloudformation/iam.yml

@@ -192,6 +192,16 @@ Resources:
             RestApiId: !Ref AppApiGateway
             Path: /{proxy+}
             Method: ANY
+        WarmingSchedule:
+          Type: Schedule
+          Properties:
+            Schedule: !If [
+              ShouldAttachVpc,
+              'rate(15 minutes)',
+              'rate(5 minutes)'
+              ]
+            Input: '{ "warmer":true,"concurrency":3 }'
+
 
   AppSqsLambdaFunction:
     Type: AWS::Serverless::Function