fix unresolved merge conflict

hpi-schul-cloud · CeEv · Feb 10, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
commit 0e7f1a870b20198abd8778556fff0da001ccf42a
diff --git a/apps/server/src/modules/server-console/server-console.app.module.ts b/apps/server/src/modules/server-console/server-console.app.module.ts
@@ -1,5 +1,5 @@
 import { Configuration } from '@hpi-schul-cloud/commons/lib';
-import { DB_PASSWORD, DB_URL, DB_USERNAME } from '@src/imports-from-feathers';
+import { DB_PASSWORD, DB_URL, DB_USERNAME } from '@imports-from-feathers';
 import { ConsoleWriterModule } from '@infra/console/console-writer/console-writer.module';
 import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.module';
 import { SyncModule } from '@infra/sync/sync.module';

diff --git a/apps/server/src/apps/board-collaboration.app.ts b/apps/server/src/apps/board-collaboration.app.ts

 // application imports
 import { LegacyLogger, Logger } from '@core/logger';
 import { RedisIoAdapter } from '@infra/socketio';
 import { BoardCollaborationModule } from '@modules/board/board-collaboration.app.module';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import { SwaggerDocumentOptions } from '@nestjs/swagger';
diff --git a/apps/server/src/apps/deletion-console.app.ts b/apps/server/src/apps/deletion-console.app.ts
 import { DeletionConsoleModule } from '@modules/deletion-console/deletion-console.app.module';
 import { BootstrapConsole } from 'nestjs-console';

 async function run() {
 	const bootstrap = new BootstrapConsole({
 		module: DeletionConsoleModule,
 		useDecorators: true,
diff --git a/apps/server/src/apps/helpers/app-start-loggable.ts b/apps/server/src/apps/helpers/app-start-loggable.ts
 export class AppStartLoggable implements Loggable {
 	constructor(private readonly info: AppStartInfo) {}

 	getLogMessage(): LogMessage {
 		const data: LogMessageData = { appName: this.info.appName };

 		if (this.info.port !== undefined) {
diff --git a/apps/server/src/apps/helpers/metrics/prometheus-metrics.ts b/apps/server/src/apps/helpers/metrics/prometheus-metrics.ts
 export class PrometheusMetricsSetupStateLoggable implements Loggable {
 	constructor(private readonly state: PrometheusMetricsSetupState) {}

 	getLogMessage(): LogMessage {
 		return {
 			message: 'Setting up Prometheus metrics...',
 			data: {
 	}
 }

 export const addPrometheusMetricsMiddlewaresIfEnabled = (logger: Logger, app: Express) => {
 	if (!PrometheusMetricsConfig.instance.isEnabled) {
 		logger.debug(
 			new PrometheusMetricsSetupStateLoggable(
 	);
 };

 export const createAndStartPrometheusMetricsAppIfEnabled = (logger: Logger) => {
 	if (!PrometheusMetricsConfig.instance.isEnabled) {
 		logger.debug(
 			new PrometheusMetricsSetupStateLoggable(PrometheusMetricsSetupState.FEATURE_DISABLED_APP_WILL_NOT_BE_CREATED)
diff --git a/apps/server/src/apps/helpers/metrics/prometheus/config.ts b/apps/server/src/apps/helpers/metrics/prometheus/config.ts
 		this._collectMetricsRouteMetrics = Configuration.get('PROMETHEUS_METRICS_COLLECT_METRICS_ROUTE_METRICS') as boolean;
 	}

 	public static get instance() {
 		if (this._instance === undefined) {
 			this._instance = new this();
 		}
 		return this._instance;
 	}

 	public static reload() {
 		this._instance = new this();
 	}
 }
diff --git a/apps/server/src/apps/helpers/metrics/prometheus/handler.spec.ts b/apps/server/src/apps/helpers/metrics/prometheus/handler.spec.ts
 		});

 		it('return HTTP 500 if the Prometheus client metrics() method call fails', async () => {
 			clientRegisterMetricsSpy.mockImplementation(async (): Promise<string> => Promise.reject(Error('test error')));

 			const response = await request(app).get('/metrics');

diff --git a/apps/server/src/modules/board/board-collaboration.app.module.ts b/apps/server/src/modules/board/board-collaboration.app.module.ts
 import { BoardWsApiModule } from './board-ws-api.module';
 import { BoardModule } from './board.module';


 export const ENTITIES = [
 	AccountEntity,
 	LegacyBoard,
diff --git a/Dockerfile b/Dockerfile

 ENV NODE_ENV=production
 ENV NO_COLOR="true"
 CMD npm run start
diff --git a/Dockerfile.filepreview b/Dockerfile.filepreview
 ARG BASE_IMAGE
 FROM $BASE_IMAGE

 RUN apk add --no-cache imagemagick imagemagick-heic imagemagick-jpeg imagemagick-pdf imagemagick-raw imagemagick-svg imagemagick-tiff imagemagick-webp

	// application imports
	import { LegacyLogger, Logger } from '@core/logger';
	import { RedisIoAdapter } from '@infra/socketio';
Check warning on line 10 in apps/server/src/apps/board-collaboration.app.ts GitHub Actions / nest_lint `'@infra/socketio' import is restricted from being used by a pattern. apps-modules may NOT import from @apps, @infra, @shared, or migrations`
	import { BoardCollaborationModule } from '@modules/board/board-collaboration.app.module';
	import { ExpressAdapter } from '@nestjs/platform-express';
	import { SwaggerDocumentOptions } from '@nestjs/swagger';
	import { DeletionConsoleModule } from '@modules/deletion-console/deletion-console.app.module';
	import { BootstrapConsole } from 'nestjs-console';

	async function run() {
Check warning on line 5 in apps/server/src/apps/deletion-console.app.ts GitHub Actions / nest_lint `Missing return type on function`
	const bootstrap = new BootstrapConsole({
	module: DeletionConsoleModule,
	useDecorators: true,
	export class AppStartLoggable implements Loggable {
	constructor(private readonly info: AppStartInfo) {}

	getLogMessage(): LogMessage {
Check warning on line 13 in apps/server/src/apps/helpers/app-start-loggable.ts GitHub Actions / nest_lint `Missing accessibility modifier on method definition getLogMessage`
	const data: LogMessageData = { appName: this.info.appName };

	if (this.info.port !== undefined) {
	export class PrometheusMetricsSetupStateLoggable implements Loggable {
	constructor(private readonly state: PrometheusMetricsSetupState) {}

	getLogMessage(): LogMessage {
Check warning on line 22 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts GitHub Actions / nest_lint `Missing accessibility modifier on method definition getLogMessage`
	return {
	message: 'Setting up Prometheus metrics...',
	data: {
	}
	}

	export const addPrometheusMetricsMiddlewaresIfEnabled = (logger: Logger, app: Express) => {
Check warning on line 32 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts GitHub Actions / nest_lint `Missing return type on function`
	if (!PrometheusMetricsConfig.instance.isEnabled) {
	logger.debug(
	new PrometheusMetricsSetupStateLoggable(
	);
	};

	export const createAndStartPrometheusMetricsAppIfEnabled = (logger: Logger) => {
Check warning on line 52 in apps/server/src/apps/helpers/metrics/prometheus-metrics.ts GitHub Actions / nest_lint `Missing return type on function`
	if (!PrometheusMetricsConfig.instance.isEnabled) {
	logger.debug(
	new PrometheusMetricsSetupStateLoggable(PrometheusMetricsSetupState.FEATURE_DISABLED_APP_WILL_NOT_BE_CREATED)
	this._collectMetricsRouteMetrics = Configuration.get('PROMETHEUS_METRICS_COLLECT_METRICS_ROUTE_METRICS') as boolean;
	}

	public static get instance() {
Check warning on line 44 in apps/server/src/apps/helpers/metrics/prometheus/config.ts GitHub Actions / nest_lint `Public accessibility modifier on get property accessor instance` Check warning on line 44 in apps/server/src/apps/helpers/metrics/prometheus/config.ts GitHub Actions / nest_lint `Missing return type on function`
	if (this._instance === undefined) {
	this._instance = new this();
	}
	return this._instance;
	}

	public static reload() {
Check warning on line 52 in apps/server/src/apps/helpers/metrics/prometheus/config.ts GitHub Actions / nest_lint `Missing return type on function`
	this._instance = new this();
	}
	}
	});

	it('return HTTP 500 if the Prometheus client metrics() method call fails', async () => {
	clientRegisterMetricsSpy.mockImplementation(async (): Promise<string> => Promise.reject(Error('test error')));
Check warning on line 33 in apps/server/src/apps/helpers/metrics/prometheus/handler.spec.ts GitHub Actions / nest_lint `Async arrow function has no 'await' expression`

	const response = await request(app).get('/metrics');
	import { BoardWsApiModule } from './board-ws-api.module';
	import { BoardModule } from './board.module';


Check failure on line 66 in apps/server/src/modules/board/board-collaboration.app.module.ts GitHub Actions / nest_lint Delete `⏎`
	export const ENTITIES = [
	AccountEntity,
	LegacyBoard,

	ENV NODE_ENV=production
	ENV NO_COLOR="true"
	CMD npm run start
Check warning on line 27 in Dockerfile GitHub Actions / build_and_push JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals `JSONArgsRecommended: JSON arguments recommended for CMD to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/`
	ARG BASE_IMAGE
	FROM $BASE_IMAGE
Check warning on line 2 in Dockerfile.filepreview GitHub Actions / build_and_push Default value for global ARG results in an empty or invalid base image name `InvalidDefaultArgInFrom: Default value for ARG $BASE_IMAGE results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/`

	RUN apk add --no-cache imagemagick imagemagick-heic imagemagick-jpeg imagemagick-pdf imagemagick-raw imagemagick-svg imagemagick-tiff imagemagick-webp