Merge pull request #107 from mitdbg/main

Releasing Physical Plan Execution and UI Improvements

Author: mdr223

.github/workflows/deploy-to-aws.yaml

@@ -118,19 +118,34 @@ jobs:
       - name: Start NGINX on Homepage EC2
         env:
           CARNOT_DEPLOY_KEY: ${{ secrets.CARNOT_DEPLOY_KEY }}
+          MS_APP_ID: ${{ secrets.MICROSOFT_APPLICATION_ID }}
         run: |
+          echo "Preparing Entra ID association file..."
+          mkdir -p .well-known
+          echo "{\"associatedApplications\":[{\"applicationId\": \"$MS_APP_ID\"}]}" > .well-known/microsoft-identity-association.json
+
+          # sleep to ensure that the instance is ready to accept SSH connections
           echo "Copying homepage files to $HOMEPAGE_PUBLIC_IP"
-          
-          # copy index.html to EC2; sleep first to wait for it to be ready to accept SSH connections
           sleep 5
-          scp -o StrictHostKeyChecking=no -i deployer_key.pem app/index.html ubuntu@$HOMEPAGE_PUBLIC_IP:~/
+
+          # copy files to EC2
+          scp -r -o StrictHostKeyChecking=no -i deployer_key.pem app/index.html app/terms-of-service.md app/privacy-statement.md .well-known ubuntu@$HOMEPAGE_PUBLIC_IP:~/
 
           # Copy index.html to the NGINX default location inside the container's volume mount and (re)start container
           ssh -o StrictHostKeyChecking=no -i deployer_key.pem ubuntu@$HOMEPAGE_PUBLIC_IP "
             sudo docker start carnot-homepage-nginx
             sleep 3
+
+            # Ensure the directory exists in the container and copy files
+            sudo docker exec carnot-homepage-nginx mkdir -p /usr/share/nginx/html/.well-known
             sudo docker cp index.html carnot-homepage-nginx:/usr/share/nginx/html/index.html
-            rm index.html
+            sudo docker cp terms-of-service.md carnot-homepage-nginx:/usr/share/nginx/html/terms-of-service.md
+            sudo docker cp privacy-statement.md carnot-homepage-nginx:/usr/share/nginx/html/privacy-statement.md
+            sudo docker cp .well-known/microsoft-identity-association.json carnot-homepage-nginx:/usr/share/nginx/html/.well-known/microsoft-identity-association.json
+
+            # Clean up home directory
+            rm -rf index.html terms-of-service.md privacy-statement.md .well-known
+
             sudo docker restart carnot-homepage-nginx
           "
 

.gitignore

@@ -209,6 +209,10 @@ __marimo__/
 # allow env/ within deploy/terraform/env/
 !deploy/terraform/env/
 
+# test data files
+tests/pytest/data/movie-reviews
+tests/pytest/data/quest/
+
 # Miscellaneous
 .github/workflows/github-trust-policy.json
 venv_web/

app/backend/app/auth.py

@@ -5,8 +5,8 @@
 from jose import jwt
 
 AUTH0_ISSUER = f"https://{os.getenv('AUTH0_DOMAIN')}/"
-AUTH0_AUDIENCE = os.getenv("AUTH0_AUDIENCE")
-CLAIMS_NAMESPACE = os.getenv("AUTH0_CLAIMS_NAMESPACE")
+AUTH0_AUDIENCE = os.getenv("AUTH0_AUDIENCE", "")
+CLAIMS_NAMESPACE = os.getenv("AUTH0_CLAIMS_NAMESPACE", "")  # NOTE: not used anymore; may be deprecated
 ALGORITHMS = ["RS256"]
 
 # Cache for JWKS keys to avoid hitting Auth0 on every request

app/backend/app/env.py

@@ -1,6 +1,6 @@
 import os
 
-IS_LOCAL_ENV = os.getenv("LOCAL_ENV").lower() == "true"
+IS_LOCAL_ENV = os.getenv("LOCAL_ENV", "").lower() == "true"
 FILESYSTEM = "file" if IS_LOCAL_ENV else "s3"
 REGION_NAME = os.getenv("AWS_REGION", "us-east-1")
 COMPANY_ENV = os.getenv("COMPANY_ENV", "dev")