BC-7834

.eslintrc.js → .eslintrc.cjs

@@ -15,7 +15,7 @@ module.exports = {
     node: true,
     jest: true,
   },
-  ignorePatterns: ['.eslintrc.js'],
+  ignorePatterns: ['.eslintrc.cjs'],
   rules: {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

.github/workflows/push.yml

@@ -106,7 +106,7 @@ jobs:
     needs:
       - build_and_push
       - branch_meta
-    uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@BC-7674
+    uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@main
     with:
       branch: ${{ needs.branch_meta.outputs.branch }}
     secrets:

ansible/roles/tldraw-server/tasks/main.yml

@@ -5,7 +5,7 @@
       template: onepassword.yml.j2
     when:
      - ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool
-     - WITH_TLDRAW is defined and WITH_TLDRAW|bool
+     - WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: TlDraw server configmap
     kubernetes.core.k8s:
@@ -14,40 +14,40 @@
       template: configmap.yml.j2
     when:
       - ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool
-      - WITH_TLDRAW is defined and WITH_TLDRAW|bool
+      - WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: TlDraw server deployment
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: deployment.yml.j2
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
+    when: WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: TlDraw worker deployment
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: worker-deployment.yml.j2
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
+    when: WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: TlDraw server service
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: server-svc.yml.j2
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
+    when: WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: TlDraw server pod monitor
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: pod-monitor.yml.j2
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
+    when: WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool
 
   - name: Tldraw ingress
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: ingress.yml.j2
       apply: yes
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
+    when: WITH_TLDRAW2 is defined and WITH_TLDRAW2|bool

ansible/roles/tldraw-valkey/tasks/main.yml

@@ -40,6 +40,8 @@
           enabled: false
         serviceAccount:
           create: false
+        # https://github.com/bitnami/charts/issues/9689
+        useHostnames: false
         resources:
           limits:
             cpu: "{{ TLDRAW_VALKEY_CPU_LIMITS|default('1000m', true) }}"

package.json

@@ -20,7 +20,7 @@
 		"start:worker:dev": "nest start worker --watch",
 		"start:worker:debug": "nest start worker --debug --watch",
 		"start:worker:prod": "node dist/apps/tldraw-worker.js",
-		"lint": "eslint \"{src}/**/*.ts\" --fix",
+		"lint": "eslint \"src/**/*.ts\" --fix",
 		"test": "jest",
 		"test:watch": "jest --watch",
 		"test:cov": "jest --coverage",
@@ -31,7 +31,7 @@
 		"@nestjs/config": "^3.2.3",
 		"@nestjs/core": "^10.4.1",
 		"@nestjs/platform-express": "^10.4.1",
-		"@y/redis": "github:hpi-schul-cloud/y-redis#c9863e74d8d22dd75f53e894835cede66afdddd9",
+		"@y/redis": "github:hpi-schul-cloud/y-redis#0211a7c3645ffb740279e28e491539cda2e4afaf",
 		"ioredis": "^5.4.1",
 		"prom-client": "^15.1.3",
 		"reflect-metadata": "^0.2.2",

src/apps/tldraw-server.ts

@@ -4,25 +4,24 @@ import { MetricsModule } from '../infra/metrics/metrics.module.js';
 import { ServerModule } from '../modules/server/server.module.js';
 
 async function bootstrap() {
-  const httpPort = 3347;
-  const nestApp = await NestFactory.create(ServerModule);
-  nestApp.enableCors();
-  await nestApp.init();
+	const httpPort = 3347;
+	const nestApp = await NestFactory.create(ServerModule);
+	nestApp.enableCors();
+	await nestApp.init();
 
-  const metricsPort = 9090;
-  const metricsApp = await NestFactory.create(MetricsModule);
+	const metricsPort = 9090;
+	const metricsApp = await NestFactory.create(MetricsModule);
 
-  await metricsApp.listen(metricsPort, async () => {
-    const logger = await metricsApp.resolve(Logger);
-    logger.setContext('METRICS');
-    logger.log(`Server is running on port ${metricsPort}`);
-  });
-
-  await nestApp.listen(httpPort, async () => {
-    const logger = await nestApp.resolve(Logger);
-    logger.setContext('TLDRAW');
-    logger.log(`Server is running on port ${httpPort}`);
-  });
+	await metricsApp.listen(metricsPort, async () => {
+		const logger = await metricsApp.resolve(Logger);
+		logger.setContext('METRICS');
+		logger.log(`Metrics server is running on port ${metricsPort}`);
+	});
 
+	await nestApp.listen(httpPort, async () => {
+		const logger = await nestApp.resolve(Logger);
+		logger.setContext('TLDRAW');
+		logger.log(`Server is running on port ${httpPort}`);
+	});
 }
 bootstrap();

src/apps/tldraw-worker.ts

@@ -2,8 +2,8 @@ import { NestFactory } from '@nestjs/core';
 import { WorkerModule } from '../modules/worker/worker.module.js';
 
 async function bootstrap() {
-  const nestApp = await NestFactory.createApplicationContext(WorkerModule);
+	const nestApp = await NestFactory.createApplicationContext(WorkerModule);
 
-  await nestApp.init();
+	await nestApp.init();
 }
 bootstrap();

src/infra/authorization/authorization.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { AuthorizationService } from './authorization.service.js';
 
 @Module({
-    providers: [AuthorizationService],
-    exports: [AuthorizationService],
+	providers: [AuthorizationService],
+	exports: [AuthorizationService],
 })
 export class AuthorizationModule {}

src/infra/authorization/index.ts

@@ -1,3 +1,2 @@
 export * from './authorization.module.js';
 export * from './authorization.service.js';
-

src/infra/logging/index.ts

@@ -1,3 +1,2 @@
 export * from './logger.js';
 export * from './logger.module.js';
-

src/infra/logging/logger.module.ts

@@ -1,9 +1,8 @@
-
 import { Module } from '@nestjs/common';
 import { Logger } from './logger.js';
 
 @Module({
-    providers: [Logger],
-    exports: [Logger]
+	providers: [Logger],
+	exports: [Logger],
 })
-export class LoggerModule {}
+export class LoggerModule {}

src/infra/logging/logger.ts

@@ -1,4 +1,4 @@
 import { ConsoleLogger, Injectable, Scope } from '@nestjs/common';
 
 @Injectable({ scope: Scope.TRANSIENT })
-export class Logger extends ConsoleLogger {}
+export class Logger extends ConsoleLogger {}

src/infra/metrics/api/metrics.controller.ts

@@ -3,10 +3,10 @@ import { MetricsService } from '../metrics.service.js';
 
 @Controller('/metrics')
 export class MetricsController {
-  constructor(private readonly appService: MetricsService) {}
+	constructor(private readonly appService: MetricsService) {}
 
-  @Get()
-  getMetrics(): Promise<string> {
-    return this.appService.getMetrics();
-  }
-}
+	@Get()
+	getMetrics(): Promise<string> {
+		return this.appService.getMetrics();
+	}
+}

src/infra/metrics/index.ts

@@ -1,3 +1,2 @@
 export * from './metrics.module.js';
 export * from './metrics.service.js';
-

src/infra/metrics/metrics.module.ts

@@ -1,12 +1,11 @@
-
 import { Module } from '@nestjs/common';
 import { LoggerModule } from '../logging/logger.module.js';
 import { MetricsController } from './api/metrics.controller.js';
 import { MetricsService } from './metrics.service.js';
 
 @Module({
-    imports: [LoggerModule],
-    controllers: [MetricsController],
-    providers: [MetricsService],
+	imports: [LoggerModule],
+	controllers: [MetricsController],
+	providers: [MetricsService],
 })
-export class MetricsModule {};
+export class MetricsModule {}

src/infra/redis/index.ts

@@ -1,3 +1,2 @@
 export * from './redis.module.js';
 export * from './redis.service.js';
-

src/infra/redis/redis.module.ts

@@ -3,8 +3,8 @@ import { LoggerModule } from '../logging/logger.module.js';
 import { RedisService } from './redis.service.js';
 
 @Module({
-    imports: [LoggerModule],
-    providers: [RedisService],
-    exports: [RedisService],
+	imports: [LoggerModule],
+	providers: [RedisService],
+	exports: [RedisService],
 })
 export class RedisModule {}

src/infra/redis/redis.service.ts

@@ -7,63 +7,65 @@ import { Logger } from '../logging/logger.js';
 
 @Injectable()
 export class RedisService {
-  private sentinelServiceName: string;
+	private sentinelServiceName: string;
 
-  constructor(private configService: ConfigService, private logger: Logger) {
-    this.sentinelServiceName = this.configService.get<string>(
-      'REDIS_SENTINEL_SERVICE_NAME') || '';
+	constructor(
+		private configService: ConfigService,
+		private logger: Logger,
+	) {
+		this.sentinelServiceName = this.configService.get<string>('REDIS_SENTINEL_SERVICE_NAME') || '';
 
-    this.logger.setContext(RedisService.name);
-  }
+		this.logger.setContext(RedisService.name);
+	}
 
-  async getRedisInstance() {
-    let redisInstance: Redis;
-    if (this.sentinelServiceName) {
-      redisInstance = await this.createRedisSentinelInstance();
-    } else {
-      redisInstance = this.createNewRedisInstance();
-    }
+	async getRedisInstance() {
+		let redisInstance: Redis;
+		if (this.sentinelServiceName) {
+			redisInstance = await this.createRedisSentinelInstance();
+		} else {
+			redisInstance = this.createNewRedisInstance();
+		}
 
-    return redisInstance;
-  }
+		return redisInstance;
+	}
 
-  private createNewRedisInstance() {
-    const redisUrl = this.configService.getOrThrow('REDIS');;
-    const redisInstance = new Redis(redisUrl);
+	private createNewRedisInstance() {
+		const redisUrl = this.configService.getOrThrow('REDIS');
+		const redisInstance = new Redis(redisUrl);
 
-    return redisInstance;
-  }
+		return redisInstance;
+	}
 
-  private async createRedisSentinelInstance() {
-    const sentinelName = this.configService.get<string>('REDIS_SENTINEL_NAME') || 'mymaster';
-    const sentinelPassword = this.configService.getOrThrow('REDIS_SENTINEL_PASSWORD');
-    const sentinels = await this.discoverSentinelHosts();
-    this.logger.log('Discovered sentinels:', sentinels);
+	private async createRedisSentinelInstance() {
+		const sentinelName = this.configService.get<string>('REDIS_SENTINEL_NAME') || 'mymaster';
+		const sentinelPassword = this.configService.getOrThrow('REDIS_SENTINEL_PASSWORD');
+		const sentinels = await this.discoverSentinelHosts();
+		this.logger.log('Discovered sentinels:', sentinels);
 
-    const redisInstance = new Redis({
-      sentinels,
-      sentinelPassword,
-      password: sentinelPassword,
-      name: sentinelName,
-    });
+		const redisInstance = new Redis({
+			sentinels,
+			sentinelPassword,
+			password: sentinelPassword,
+			name: sentinelName,
+		});
 
-    return redisInstance;
-  }
+		return redisInstance;
+	}
 
-  private async discoverSentinelHosts() {
-    const resolveSrv = util.promisify(dns.resolveSrv);
-    try {
-      const records = await resolveSrv(this.sentinelServiceName);
+	private async discoverSentinelHosts() {
+		const resolveSrv = util.promisify(dns.resolveSrv);
+		try {
+			const records = await resolveSrv(this.sentinelServiceName);
 
-      const hosts = records.map((record) => ({
-        host: record.name,
-        port: record.port,
-      }));
+			const hosts = records.map((record) => ({
+				host: record.name,
+				port: record.port,
+			}));
 
-      return hosts;
-    } catch (err) {
-      this.logger.error('Error during service discovery:', err);
-      throw err;
-    }
-  }
+			return hosts;
+		} catch (err) {
+			this.logger.error('Error during service discovery:', err);
+			throw err;
+		}
+	}
 }

src/infra/storage/index.ts

@@ -1,3 +1,2 @@
 export * from './storage.module.js';
 export * from './storage.service.js';
-

src/infra/storage/storage.module.ts

@@ -3,8 +3,8 @@ import { LoggerModule } from '../logging/logger.module.js';
 import { StorageService } from './storage.service.js';
 
 @Module({
-    imports: [LoggerModule],
-    providers: [StorageService],
-    exports: [StorageService],
+	imports: [LoggerModule],
+	providers: [StorageService],
+	exports: [StorageService],
 })
 export class StorageModule {}