From 572cac255206fbfccaae2e4a7b4bc0b67d408bdf Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 17 Oct 2023 11:10:51 +0200 Subject: [PATCH] Remove SENTRY_DSN references --- .github/workflows/release-master.yml | 2 -- .../budibase/templates/app-service-deployment.yaml | 2 -- .../templates/worker-service-deployment.yaml | 2 -- charts/budibase/values.yaml | 1 - hosting/docker-compose.build.yaml | 2 -- hosting/docker-compose.yaml | 13 ++++++++----- packages/builder/vite.config.js | 1 - packages/client/src/api/api.js | 2 +- 8 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 3af3a751ad..4acd5088d2 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -14,7 +14,6 @@ env: # Posthog token used by ui at build time POSTHOG_TOKEN: phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} jobs: @@ -110,7 +109,6 @@ jobs: git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}" git push - trigger-deploy-to-qa-env: needs: [release-helm-chart] runs-on: ubuntu-latest diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 3243509094..73c6d990d2 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -134,8 +134,6 @@ spec: {{ end }} - name: SELF_HOSTED value: {{ .Values.globals.selfHosted | quote }} - - name: SENTRY_DSN - value: {{ .Values.globals.sentryDSN | quote }} - name: POSTHOG_TOKEN value: {{ .Values.globals.posthogToken | quote }} - name: WORKER_URL diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 7621aa23ef..5e0addb9dd 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -130,8 +130,6 @@ spec: {{ end }} - name: SELF_HOSTED value: {{ .Values.globals.selfHosted | quote }} - - name: SENTRY_DSN - value: {{ .Values.globals.sentryDSN }} - name: ENABLE_ANALYTICS value: {{ .Values.globals.enableAnalytics | quote }} - name: POSTHOG_TOKEN diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index e5f1eabb53..857067d0f1 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -78,7 +78,6 @@ globals: budibaseEnv: PRODUCTION tenantFeatureFlags: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR" enableAnalytics: "1" - sentryDSN: "" posthogToken: "phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU" selfHosted: "1" # set to 0 for budibase cloud environment, set to 1 for self-hosted setup multiTenancy: "0" # set to 0 to disable multiple orgs, set to 1 to enable multiple orgs diff --git a/hosting/docker-compose.build.yaml b/hosting/docker-compose.build.yaml index 391d263098..bc363fb0bf 100644 --- a/hosting/docker-compose.build.yaml +++ b/hosting/docker-compose.build.yaml @@ -19,7 +19,6 @@ services: API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} JWT_SECRET: ${JWT_SECRET} LOG_LEVEL: info - SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 ENABLE_ANALYTICS: "true" REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} @@ -48,7 +47,6 @@ services: COUCH_DB_USERNAME: ${COUCH_DB_USER} COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD} COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 - SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 INTERNAL_API_KEY: ${INTERNAL_API_KEY} REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index b3887c15fa..8f66d211f7 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -20,7 +20,6 @@ services: API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} JWT_SECRET: ${JWT_SECRET} LOG_LEVEL: info - SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 ENABLE_ANALYTICS: "true" REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} @@ -31,8 +30,8 @@ services: depends_on: - worker-service - redis-service -# volumes: -# - /some/path/to/plugins:/plugins + # volumes: + # - /some/path/to/plugins:/plugins worker-service: restart: unless-stopped @@ -51,7 +50,6 @@ services: COUCH_DB_USERNAME: ${COUCH_DB_USER} COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD} COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 - SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 INTERNAL_API_KEY: ${INTERNAL_API_KEY} REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} @@ -113,7 +111,12 @@ services: PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984" depends_on: - couchdb-service - command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"] + command: + [ + "sh", + "-c", + "sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;", + ] redis-service: restart: unless-stopped diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index b7af647916..0858f4c496 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -80,7 +80,6 @@ export default defineConfig(({ mode }) => { "process.env.INTERCOM_TOKEN": JSON.stringify( process.env.INTERCOM_TOKEN ), - "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN), }), copyFonts("fonts"), ...(isProduction ? [] : devOnlyPlugins), diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js index 4062bd3b73..8488b702b6 100644 --- a/packages/client/src/api/api.js +++ b/packages/client/src/api/api.js @@ -32,7 +32,7 @@ export const API = createAPIClient({ }, // Show an error notification for all API failures. - // We could also log these to sentry. + // We could also log these to Posthog. // Or we could check error.status and redirect to login on a 403 etc. onError: error => { const { status, method, url, message, handled, suppressErrors } =