Simplify auth token handling and inject DSN via env var

Author: lforst

.github/workflows/build.yml

@@ -643,6 +643,7 @@ jobs:
         env:
           E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ env.DEFAULT_NODE_VERSION }}
           E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
         run: |
           cd packages/e2e-tests
           yarn test:e2e

packages/e2e-tests/.gitignore

@@ -1 +1 @@
-auth-token.json
+.env

packages/e2e-tests/package.json

@@ -13,11 +13,10 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
     "lint:prettier": "prettier --config ../../.prettierrc.json --check .",
-    "test:e2e": "run-s test:validate-configuration test:validate-test-app-setups test:validate-auth-token test:run",
+    "test:e2e": "run-s test:validate-configuration test:validate-test-app-setups test:run",
     "test:run": "ts-node run.ts",
     "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
-    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts",
-    "test:validate-auth-token": "ts-node validate-auth-token.ts"
+    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",

packages/e2e-tests/run.ts

@@ -16,20 +16,24 @@ const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSIO
 const DEFAULT_BUILD_TIMEOUT_SECONDS = 60;
 const DEFAULT_TEST_TIMEOUT_SECONDS = 60;
 
-let authToken = process.env.E2E_TEST_AUTH_TOKEN;
+if (!process.env.E2E_TEST_AUTH_TOKEN) {
+  console.log(
+    "No auth token configured! Please configure the E2E_TEST_AUTH_TOKEN environment variable with an auth token that has the scope 'project:read'!",
+  );
+}
 
-try {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-var-requires
-  authToken = require(path.resolve(__dirname, 'auth-token.json')).authToken;
-} catch (e) {
-  console.log('Failed to parse auth-token.json');
+if (!process.env.E2E_TEST_DSN) {
+  console.log('No DSN configured! Please configure the E2E_TEST_DSN environment variable with a DSN!');
 }
 
-if (!authToken) {
-  console.log('No auth token configured!');
+if (!process.env.E2E_TEST_AUTH_TOKEN || !process.env.E2E_TEST_DSN) {
   process.exit(1);
 }
 
+const envVarsToInject = {
+  REACT_APP_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
+};
+
 // https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
 function groupCIOutput(groupTitle: string, fn: () => void): void {
   if (process.env.CI) {
@@ -159,6 +163,10 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
       encoding: 'utf8',
       shell: true, // needed so we can pass the build command in as whole without splitting it up into args
       timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
+      env: {
+        ...process.env,
+        ...envVarsToInject,
+      },
     });
 
     // Prepends some text to the output build command's output so we can distinguish it from logging in this script
@@ -190,11 +198,11 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
       cwd: path.dirname(recipePath),
       timeout: (test.timeoutSeconds ?? DEFAULT_TEST_TIMEOUT_SECONDS) * 1000,
       encoding: 'utf8',
+      shell: true, // needed so we can pass the test command in as whole without splitting it up into args
       env: {
         ...process.env,
-        E2E_TEST_AUTH_TOKEN: authToken,
+        ...envVarsToInject,
       },
-      shell: true, // needed so we can pass the test command in as whole without splitting it up into args
     });
 
     // Prepends some text to the output test command's output so we can distinguish it from logging in this script

packages/e2e-tests/test-applications/standard-frontend-react/.gitignore

@@ -22,7 +22,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-!*.d.ts
 /test-results/
 /playwright-report/
 /playwright/.cache/
+
+!*.d.ts

packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx

@@ -15,8 +15,7 @@ import Index from './pages/Index';
 import User from './pages/User';
 
 Sentry.init({
-  // DSN belongs to "e2e-javascript-standard-frontend-react" project in "sentry-sdks" org
-  dsn: 'https://[email protected]/4503941750587392',
+  dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
     new BrowserTracing({
       routingInstrumentation: Sentry.reactRouterV6Instrumentation(