DEPLOY Edge -> Stable

.github/workflows/deploy-preprod.yml

@@ -1,42 +1,20 @@
-name: Deploy Preprod
+name: Deploy Preprod Assets
 
 on:
   push:
     branches:
       - edge
 
 jobs:
-  deploy-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Heroku CLI
-        run: |
-          curl https://cli-assets.heroku.com/install.sh | sh
-
-      - name: Login to Heroku
-        uses: akhileshns/heroku-deploy@v3.13.15
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "polis-preprod"
-          heroku_email: ${{secrets.HEROKU_EMAIL}}
-          branch: "edge"
-
-      - name: Deploy to Heroku
-        run: |
-          git push https://heroku:${{secrets.HEROKU_API_KEY}}@git.heroku.com/polis-preprod.git edge:main
-
   deploy-static:
     runs-on: ubuntu-latest
-    needs: deploy-backend
     permissions:
       contents: read
       id-token: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -51,7 +29,6 @@ jobs:
       - name: Build static assets
         env:
           EMBED_SERVICE_HOSTNAME: preprod.pol.is
-          ENABLE_TWITTER_WIDGETS: true
           GA_TRACKING_ID: G-WVP78N35QR
           SERVICE_URL: https://preprod.pol.is
         run: |

.github/workflows/deploy-prod.yml

@@ -1,44 +1,21 @@
-name: Deploy Prod
+name: Deploy Prod Assets
 
 on:
   push:
     branches:
       - stable
 
 jobs:
-  deploy-backend:
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Heroku CLI
-        run: |
-          curl https://cli-assets.heroku.com/install.sh | sh
-
-      - name: Login to Heroku
-        uses: akhileshns/heroku-deploy@v3.13.15
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "polisapp"
-          heroku_email: ${{secrets.HEROKU_EMAIL}}
-          branch: "stable"
-
-      - name: Deploy to Heroku
-        run: |
-          git push https://heroku:${{secrets.HEROKU_API_KEY}}@git.heroku.com/polisapp.git stable:main
-
   deploy-static:
     runs-on: ubuntu-latest
-    needs: deploy-backend
     environment: production
     permissions:
       contents: read
       id-token: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -53,7 +30,6 @@ jobs:
       - name: Build static assets
         env:
           EMBED_SERVICE_HOSTNAME: pol.is
-          ENABLE_TWITTER_WIDGETS: true
           GA_TRACKING_ID: G-WVP78N35QR
           SERVICE_URL: https://pol.is
         run: |

cdk/lib/cdk-stack.ts

@@ -107,6 +107,11 @@ export class CdkStack extends cdk.Stack {
       ],
     });
 
+    instanceRole.addToPolicy(new iam.PolicyStatement({
+      actions: ['s3:PutObject', 's3:PutObjectAcl', 's3:AbortMultipartUpload'],
+      resources: ['arn:aws:s3:::*', 'arn:aws:s3:::*/*'],
+    }));
+
     // IAM Role for CodeDeploy
     const codeDeployRole = new iam.Role(this, 'CodeDeployRole', {
       assumedBy: new iam.ServicePrincipal('codedeploy.amazonaws.com'),
@@ -281,6 +286,7 @@ EOF`,
       launchTemplate: webLaunchTemplate,
       minCapacity: 2,
       maxCapacity: 10,
+      desiredCapacity: 2,
       vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },
       healthCheck: autoscaling.HealthCheck.elb({grace: cdk.Duration.minutes(5)})
     });
@@ -289,6 +295,7 @@ EOF`,
       vpc,
       launchTemplate: mathWorkerLaunchTemplate,
       minCapacity: 1,
+      desiredCapacity: 1,
       maxCapacity: 5,
       vpcSubnets: {
         subnetType: ec2.SubnetType.PUBLIC,

cdk/package.json

@@ -20,7 +20,7 @@
     "typescript": "~5.6.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.178.2",
+    "aws-cdk-lib": "2.189.1",
     "constructs": "^10.0.0"
   }
 }