sentry: add sourcemaps to frontend and print

Add .cache/npm/sentry-cli to cache. Add it with a .gitkeep file that the permissions are set correctly. Move the .gitkeep instruction from e2e up to the top level .gitignore. It may be that you need to delete your node_modules folders for frontend and print after this commit.
BacLuc · Sep 30, 2023 · 9fb9ac6 · 9fb9ac6
1 parent 2fbdbbb
commit 9fb9ac6
Show file tree

Hide file tree

Showing 21 changed files with 596 additions and 20 deletions.
diff --git a/.cache/npm/sentry-cli/.gitkeep b/.cache/npm/sentry-cli/.gitkeep
diff --git a/.docker-hub/frontend/Dockerfile b/.docker-hub/frontend/Dockerfile
@@ -10,6 +10,10 @@ RUN npm ci && npm run build
 
 # frontend build stage
 FROM node:lts-alpine AS frontend-build-stage
+ARG SENTRY_AUTH_TOKEN
+ARG SENTRY_ORG
+ARG SENTRY_FRONTEND_PROJECT
+ARG SENTRY_RELEASE_NAME
 
 COPY common /common
 
@@ -23,6 +27,12 @@ RUN apk --no-cache add --virtual native-deps g++ make python3 git && npm ci && a
 COPY frontend .
 COPY --from=pdf-build-stage /pdf/dist ./src/pdf
 COPY --from=pdf-build-stage /pdf/src/assets/fonts/Inter ./src/assets/fonts/Inter
+
+ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
+ENV SENTRY_ORG=$SENTRY_ORG
+ENV SENTRY_FRONTEND_PROJECT=$SENTRY_FRONTEND_PROJECT
+ENV SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME
+
 RUN npm run build
 
 # production stage

diff --git a/.docker-hub/print/Dockerfile b/.docker-hub/print/Dockerfile
@@ -1,11 +1,21 @@
 # build stage
 FROM node:20.8.0 AS build-stage
+ARG SENTRY_AUTH_TOKEN
+ARG SENTRY_ORG
+ARG SENTRY_PRINT_PROJECT
+ARG SENTRY_RELEASE_NAME
 
 COPY common /common
 
 WORKDIR /app
 
 COPY print/package*.json ./
+
+ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
+ENV SENTRY_ORG=$SENTRY_ORG
+ENV SENTRY_PRINT_PROJECT=$SENTRY_PRINT_PROJECT
+ENV SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME
+
 RUN npm ci
 
 COPY print .

diff --git a/.github/workflows/deployment-devel.yml b/.github/workflows/deployment-devel.yml
@@ -20,6 +20,7 @@ jobs:
     secrets:
       DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
   upgrade-or-install-deployment:
     name: Upgrade or install deployment

diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml
@@ -14,6 +14,7 @@ jobs:
     secrets:
       DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
   upgrade-or-install-deployment:
     name: Upgrade or install deployment

diff --git a/.github/workflows/deployment-stage-prod.yml b/.github/workflows/deployment-stage-prod.yml
@@ -24,6 +24,7 @@ jobs:
     secrets:
       DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
   upgrade-or-install-deployment:
     name: Upgrade or install deployment

diff --git a/.github/workflows/reusable-build-and-push.yml b/.github/workflows/reusable-build-and-push.yml
@@ -15,6 +15,7 @@ on:
         required: true
       DOCKER_HUB_PASSWORD:
         required: true
+      SENTRY_AUTH_TOKEN:
 
 jobs:
   build-and-push:
@@ -43,6 +44,11 @@ jobs:
             ${{ ((inputs.tag != '') && format('{0}/ecamp3-frontend:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
             ${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-frontend:${{ inputs.sha }}
           context: .
+          build-args: |
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            SENTRY_ORG=${{ vars.SENTRY_ORG }}
+            SENTRY_FRONTEND_PROJECT=${{ vars.SENTRY_FRONTEND_PROJECT }}
+            SENTRY_RELEASE_NAME=${{ inputs.sha }}
           cache-from: type=gha,scope=frontend
           cache-to: type=gha,scope=frontend,mode=max
 
@@ -81,6 +87,11 @@ jobs:
             ${{ ((inputs.tag != '') && format('{0}/ecamp3-print:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
             ${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-print:${{ inputs.sha }}
           context: .
+          build-args: |
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            SENTRY_ORG=${{ vars.SENTRY_ORG }}
+            SENTRY_PRINT_PROJECT=${{ vars.SENTRY_PRINT_PROJECT }}
+            SENTRY_RELEASE_NAME=${{ inputs.sha }}
           cache-from: type=gha,scope=print
           cache-to: type=gha,scope=print,mode=max
 

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@
 /.caddy/
 /.env
 /.helm/ecamp3/charts
+
+!/**/.gitkeep
diff --git a/.helm/.env-example b/.helm/.env-example
@@ -9,6 +9,13 @@ BASIC_AUTH_ENABLED=false
 BASIC_AUTH_USERNAME=test
 BASIC_AUTH_PASSWORD=test
 
+API_SENTRY_DSN=
+FRONTEND_SENTRY_DSN=
+PRINT_SENTRY_DSN=
+
+SENTRY_AUTH_TOKEN=
+SENTRY_RELEASE_NAME=$version
+
 BACKUP_SCHEDULE=@hourly
 BACKUP_S3_ENDPOINT=
 BACKUP_S3_BUCKET=

diff --git a/.helm/build-images.sh b/.helm/build-images.sh
@@ -16,20 +16,27 @@ if [ -z "$docker_hub_account" ] \
     exit 1
 fi
 
+sentry_build_args="--build-arg SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN --build-arg SENTRY_ORG=$SENTRY_ORG"
+sentry_build_args="$sentry_build_args --build-arg SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME"
+
+frontend_sentry_build_args="$sentry_build_args --build-arg SENTRY_FRONTEND_PROJECT=$SENTRY_FRONTEND_PROJECT"
+
 frontend_image_tag="${docker_hub_account}/ecamp3-frontend:${version}"
-docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/frontend/Dockerfile -t "$frontend_image_tag"
+docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/frontend/Dockerfile $frontend_sentry_build_args -t "$frontend_image_tag"
 docker push "$frontend_image_tag"
 
 api_image_tag="${docker_hub_account}/ecamp3-api-php:${version}"
-docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$api_image_tag" --target api_platform_php
+docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$api_image_tag" --target api_platform_php $sentry_build_args
 docker push "$api_image_tag"
 
 caddy_image_tag="${docker_hub_account}/ecamp3-api-caddy:${version}"
 docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$caddy_image_tag" --target api_platform_caddy_prod
 docker push "$caddy_image_tag"
 
+print_sentry_build_args="$sentry_build_args --build-arg SENTRY_PRINT_PROJECT=$SENTRY_PRINT_PROJECT"
+
 print_image_tag="${docker_hub_account}/ecamp3-print:${version}"
-docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/print/Dockerfile -t "$print_image_tag"
+docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/print/Dockerfile $print_sentry_build_args -t "$print_image_tag"
 docker push "$print_image_tag"
 
 export REPO_OWNER=${docker_hub_account}

diff --git a/.helm/deploy-to-cluster.sh b/.helm/deploy-to-cluster.sh
@@ -46,9 +46,15 @@ for i in 1; do
   values="$values --set postgresql.dropDBOnUninstall=true"
   values="$values --set php.dataMigrationsDir=$migrations_dir"
   values="$values --set php.appSecret=$app_secret"
-  #values="$values --set php.sentryDsn=$API_SENTRY_DSN"
-  #values="$values --set frontend.sentryDsn=$FRONTEND_SENTRY_DSN"
-  #values="$values --set print.sentryDsn=$PRINT_SENTRY_DSN"
+  if [ -n "$API_SENTRY_DSN" ]; then
+    values="$values --set php.sentryDsn=$API_SENTRY_DSN"
+  fi
+  if [ -n "$FRONTEND_SENTRY_DSN" ]; then
+    values="$values --set frontend.sentryDsn=$FRONTEND_SENTRY_DSN"
+  fi
+  if [ -n "$PRINT_SENTRY_DSN" ]; then
+    values="$values --set print.sentryDsn=$PRINT_SENTRY_DSN"
+  fi
   values="$values --set php.jwt.passphrase=$app_jwt_passphrase"
   values="$values --set-file php.jwt.publicKey=$SCRIPT_DIR/public.pem"
   values="$values --set-file php.jwt.privateKey=$SCRIPT_DIR/private.pem"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,6 +15,7 @@ services:
       - ./common:/common:delegated
       - ./pdf:/pdf:delegated
       - ./.cache/npm:/home/node/.npm/_cacache:delegated
+      - ./.cache/npm/sentry-cli:/home/node/.npm/sentry-cli:delegated
     environment:
       - NODE_ENV=development
       - NPM_CONFIG_UPDATE_NOTIFIER=false
@@ -120,6 +121,7 @@ services:
       - ./print:/app:delegated
       - ./common:/common:delegated
       - ./.cache/npm:/home/node/.npm/_cacache:delegated
+      - ./.cache/npm/sentry-cli:/home/node/.npm/sentry-cli:delegated
     environment:
       - NODE_OPTIONS=--openssl-legacy-provider #TODO: remove when we update to webpack >=5
       - NUXT_HOST=0.0.0.0

diff --git a/e2e/.gitignore b/e2e/.gitignore
@@ -3,8 +3,6 @@ node_modules
 /data
 /dist
 
-!/**/.gitkeep
-
 
 /reports/
 selenium-debug.log

diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -29,3 +29,6 @@ yarn-error.log*
 # yalc
 .yalc
 yalc.lock
+
+# Sentry Auth Token
+.env.sentry-build-plugin
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ node_modules @@
     /data
     /dist
-    !/**/.gitkeep
     /reports/
     selenium-debug.log
@@ Expand Down @@