fix: update env names

Author: EndyKaufman

.docker/docker-compose-full.env

@@ -17,14 +17,15 @@ SERVER_SSO_DEFAULT_PROJECT='default:ru=по умолчанию,KzMRNEZTetzatIgQP
 
 SERVER_SSO_ADMIN_SECRET=VfKSfPPljhHBXCEohnitursmgDxfAyiD
 
-CLIENT_MINIO_URL=http://localhost:9000
+SERVER_CLIENT_MINIO_URL=http://localhost:9000
 SERVER_SSO_ADMIN_EMAIL=[email protected]
 SERVER_SSO_ADMIN_USERNAME=admin
 SERVER_SSO_ADMIN_PASSWORD=SbxcbII7RUvCOe9TDXnKhfRrLJW5cGDA
-BASE_URL=http://localhost:9090
-SERVER_URL=http://localhost:9090/api
 SERVER_MINIO_URL=http://localhost:9000
 
+E2E_CLIENT_URL=http://localhost:9090
+E2E_SERVER_URL=http://localhost:9090
+
 SERVER_MINIO_SERVER_HOST=nestjs-mod-sso-minio
 SERVER_MINIO_ACCESS_KEY=FWGmrAGaeMKM
 SERVER_MINIO_SECRET_KEY=QatVJuLoZRARlJguoZMpoKvZMJHzvuOR

.docker/docker-compose-full.yml

@@ -115,7 +115,7 @@ services:
       SERVER_SSO_CLIENT_URL: '${SERVER_SSO_CLIENT_URL}'
       SERVER_SSO_GOOGLE_OAUTH_CLIENT_ID: '${SERVER_SSO_GOOGLE_OAUTH_CLIENT_ID}'
       SERVER_SSO_GOOGLE_OAUTH_CLIENT_SECRET_KEY: '${SERVER_SSO_GOOGLE_OAUTH_CLIENT_SECRET_KEY}'
-      CLIENT_MINIO_URL: '${CLIENT_MINIO_URL}'
+      SERVER_CLIENT_MINIO_URL: '${SERVER_CLIENT_MINIO_URL}'
     restart: 'always'
     depends_on:
       nestjs-mod-sso-minio:

.docker/server.Dockerfile

@@ -37,7 +37,7 @@ EXPOSE 8080
 ENV NODE_ENV=production
 ENV TZ=UTC
 ENV SERVER_PORT=8080
-ENV CLIENT_MINIO_URL=http://localhost:9000
+ENV SERVER_CLIENT_MINIO_URL=http://localhost:9000
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=prod-deps /app/apps /app/apps
 COPY --from=prod-deps /app/libs /app/libs

.github/workflows/kubernetes.yml

@@ -220,8 +220,8 @@ jobs:
         if: ${{ !contains(github.event.head_commit.message, '[skip e2e]') }}
         env:
           SERVER_SSO_ADMIN_SECRET: ${{ secrets.SERVER_SSO_ADMIN_SECRET }}
-          BASE_URL: 'https://${{ secrets.SERVER_DOMAIN }}'
-          SERVER_URL: 'https://${{ secrets.SERVER_DOMAIN }}'
+          E2E_CLIENT_URL: 'https://${{ secrets.SERVER_DOMAIN }}'
+          E2E_SERVER_URL: 'https://${{ secrets.SERVER_DOMAIN }}'
           SERVER_MINIO_URL: 'https://files.${{ secrets.SERVER_DOMAIN }}'
         run: |
           npm run test:e2e

.github/workflows/vercel.yml

@@ -115,9 +115,8 @@ jobs:
       - name: Run e2e-tests
         if: ${{ !contains(github.event.head_commit.message, '[skip e2e]') }}
         run: |
-          export BASE_URL=https://nestjs-mod-fullstack.vercel.app
-          export CLIENT_URL=https://nestjs-mod-fullstack.vercel.app
-          export SERVER_URL=https://nestjs-mod-fullstack.vercel.app/api
+          export E2E_CLIENT_URL=https://nestjs-mod-fullstack.vercel.app
+          export E2E_SERVER_URL=https://nestjs-mod-fullstack.vercel.app
           cp -r .vercel/.env.production.local .env
           npx --yes tsx update-files-for-vercel.ts
           npx playwright install chromium --with-deps

.kubernetes/templates/server/1.configmap.yaml

@@ -19,7 +19,7 @@ data:
   SERVER_MINIO_ACCESS_KEY: '%SERVER_MINIO_MINIO_ROOT_USER%'
   SERVER_MINIO_SECRET_KEY: '%SERVER_MINIO_MINIO_ROOT_PASSWORD%'
   SERVER_KEYV_URL: 'redis://:%SERVER_REDIS_REDIS_PASSWORD%@%NAMESPACE%-redis.%NAMESPACE%:6379'
-  CLIENT_MINIO_URL: 'https://files.%SERVER_DOMAIN%'
+  SERVER_CLIENT_MINIO_URL: 'https://files.%SERVER_DOMAIN%'
   SERVER_SSO_CLIENT_URL: 'https://%SERVER_DOMAIN%'
   SERVER_SSO_SERVER_URL: 'https://%SERVER_DOMAIN%'
   SERVER_SSO_GOOGLE_OAUTH_CLIENT_ID: '%SERVER_SSO_GOOGLE_OAUTH_CLIENT_ID%'

apps/client-e2e/playwright.config.ts

@@ -9,6 +9,7 @@ import { join } from 'path';
  */
 // require('dotenv').config();
 
+const clientUrl = process.env['E2E_CLIENT_URL'];
 const parsed = config(
   process.env['ENV_FILE']
     ? {
@@ -22,8 +23,11 @@ if (parsed.error) {
   throw parsed.error;
 }
 
-// For CI, you may want to set BASE_URL to the deployed application.
-const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
+// For CI, you may want to set E2E_CLIENT_URL to the deployed application.
+const baseURL =
+  clientUrl || process.env['E2E_CLIENT_URL'] || 'http://localhost:4200';
+
+process.env['E2E_CLIENT_URL'] = baseURL;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -33,8 +37,8 @@ export default defineConfig({
   /* Run tests in files in parallel */
   fullyParallel: false,
   workers: 1,
-  maxFailures: 0,
-  retries: 4,
+  maxFailures: 10,
+  retries: 3,
   timeout: 120 * 1000,
   reporter: [['list']],
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */

apps/client/src/environments/environment.prod.ts

@@ -1,2 +1,2 @@
 export const serverUrl = '';
-export const minioURL = '___CLIENT_MINIO_URL___';
+export const minioURL = '___SERVER_CLIENT_MINIO_URL___';

apps/server-e2e/src/server/time.spec.ts

@@ -12,7 +12,7 @@ describe('Get server time from rest api and ws', () => {
       'x-skip-throttle': process.env.SERVER_SSO_ADMIN_SECRET,
     },
     serverUrl: process.env.IS_DOCKER_COMPOSE
-      ? get('CLIENT_URL').asString()
+      ? get('E2E_SERVER_URL').asString()
       : undefined,
   });
   const timeApi = restClientHelper.getTimeApi();

apps/server-e2e/src/server/timezone-time.spec.ts

@@ -12,7 +12,7 @@ describe('Get server time from rest api and ws (timezone)', () => {
       'x-skip-throttle': process.env.SERVER_SSO_ADMIN_SECRET,
     },
     serverUrl: process.env.IS_DOCKER_COMPOSE
-      ? get('CLIENT_URL').asString()
+      ? get('E2E_SERVER_URL').asString()
       : undefined,
   });