chore(api): move session domain to env var

.github/workflows/deploy-aws.yml

@@ -25,6 +25,7 @@ env:
   TF_VAR_s3_assets_access_key_id: ${{ secrets.ASSETS_KEY }}
   TF_VAR_s3_assets_secret_access_key: ${{ secrets.ASSETS_SECRET }}
   TF_VAR_git_sha: ${{ github.sha }}
+  TF_VAR_session_domain: pets-staging.lhowsam.com
   # needed for tests
   S3_ASSETS_BUCKET: pets-api-staging-assets
   S3_ASSETS_REGION: eu-west-2

.github/workflows/e2e-render.yml

@@ -0,0 +1,39 @@
+name: e2e-render
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 */7 * * *'
+env:
+  DATABASE_URL: postgres://pets:pets@localhost:5432/pets
+  REDIS_URL: redis://localhost:6379
+  API_BASE_URL: http://localhost:8000
+  S3_ASSETS_BUCKET: pets-api-staging-assets
+  S3_ASSETS_REGION: eu-west-2
+  S3_ASSETS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  S3_ASSETS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  e2e-render:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+    name: e2e-render
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+
+      - name: Install dependencies
+        uses: ./.github/actions/install
+
+      - name: generate prisma client
+        run: pnpm db:generate
+
+      - name: e2e render
+        uses: ./.github/actions/e2e
+        with:
+          target: e2e-staging-render

Makefile

@@ -21,3 +21,8 @@ e2e-local:
 .PHONY: e2e-staging
 e2e-staging:
 	API_BASE_URL=https://pets-staging.lhowsam.com ./node_modules/.bin/playwright test --config=playwright-stg.config.ts ${tests}
+
+
+.PHONY: e2e-staging-render
+e2e-staging-render:
+	API_BASE_URL=https://pets-api-staging.onrender.com ./node_modules/.bin/playwright test --config=playwright-render.config.ts ${tests}

playwright-render.config.ts

@@ -0,0 +1,12 @@
+import type { PlaywrightTestConfig } from '@playwright/test';
+import baseConfig from './playwright-base.config';
+
+const stagingConfig: PlaywrightTestConfig = {
+  ...baseConfig,
+  use: {
+    baseURL: 'https://pets-api-staging.onrender.com',
+  },
+  retries: process.env.CI ? 2 : 0,
+};
+
+export default stagingConfig;

src/server.ts

@@ -93,7 +93,7 @@ class CreateServer {
           secure: this.isProduction(),
           httpOnly: true, // prevent client side js from reading the cookie
           maxAge: 7 * 24 * 60 * 60 * 1000, // 7 days
-          domain: this.isProduction() ? 'pets-staging.lhowsam.com' : undefined,
+          domain: this.isProduction() ? process.env.SESSION_DOMAIN : undefined,
           path: '/',
           signed: this.isProduction(),
           sameSite: 'lax',

terraform/ecs.tf

@@ -151,6 +151,10 @@ resource "aws_ecs_task_definition" "app_task" {
           {
             "name": "GIT_SHA",
             "value": "${var.git_sha}"
+          },
+          {
+            "name": "SESSION_DOMAIN",
+            "value": "${var.session_domain}"
           }
         ],
         "portMappings": [

terraform/lb.tf

@@ -16,9 +16,6 @@ resource "aws_default_subnet" "app_subnet_c" {
 resource "aws_alb" "app_load_balancer" {
   name               = "${var.project_name}-${var.env}-lb"
   load_balancer_type = "application"
-  connection {
-    timeout = "30"
-  }
   subnets = [
     aws_default_subnet.application_subnet_a.id,
     aws_default_subnet.application_subnet_b.id,
@@ -103,7 +100,6 @@ resource "aws_lb_listener" "web_http" {
   }
 }
 
-
 resource "aws_default_subnet" "application_subnet_a" {
   availability_zone = "eu-west-2a"
 }

terraform/variables.tf

@@ -118,7 +118,7 @@ variable "database_url" {
 variable "session_domain" {
   type        = string
   description = "The domain to use for the session cookie. This should not start with https://"
-  default     = "pets-api.lhowsam.com"
+  default     = "pets-staging.lhowsam.com"
 }
 
 variable "s3_assets_bucket" {