Merge branch 'main' into N21-2314-provisioning-decoupling

hpi-schul-cloud · Jan 31, 2025 · 2c2bbc1 · 2c2bbc1
2 parents 3b399d2 + f8f3e1e
commit 2c2bbc1
Show file tree

Hide file tree

Showing 146 changed files with 6,788 additions and 3,195 deletions.
diff --git a/ansible/roles/common-cartridge/templates/deployment.yml.j2 b/ansible/roles/common-cartridge/templates/deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: common-cartridge
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/h5p-library-management/templates/api-h5p-library-management-cronjob.yml.j2 b/ansible/roles/h5p-library-management/templates/api-h5p-library-management-cronjob.yml.j2
@@ -35,6 +35,8 @@ spec:
             runAsGroup: 1000
             fsGroup: 1000
             runAsNonRoot: true
+          os:
+            name: linux
           volumes:
             - name: libraries-list
               configMap:

diff --git a/ansible/roles/media-licenses/templates/vidis-sync-cronjob.yml.j2 b/ansible/roles/media-licenses/templates/vidis-sync-cronjob.yml.j2
@@ -29,6 +29,8 @@ spec:
             git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
             git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
         spec:
+          os:
+            name: linux
           containers:
           - name: vidis-sync-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/media-metadata-sync/templates/media-metadata-sync-cronjob.yml.j2 b/ansible/roles/media-metadata-sync/templates/media-metadata-sync-cronjob.yml.j2
@@ -29,6 +29,8 @@ spec:
             git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
             git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
         spec:
+          os:
+            name: linux
           containers:
           - name: media-metadata-sync-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-deletion-queueing-cronjob.yml.j2
@@ -19,6 +19,8 @@ spec:
     spec:
       template:
         spec:
+          os:
+            name: linux
           containers:
           - name: moin-schule-users-deletion-queueing-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-users-sync-cronjob.yml.j2
@@ -19,6 +19,8 @@ spec:
     spec:
       template:
         spec:
+          os:
+            name: linux
           containers:
           - name: moin-schule-users-sync-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/admin-api-server-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/admin-api-server-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-admin
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: amqp-files
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/api-files-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-files-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-files
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/api-fwu-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-fwu-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-fwu
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/board-collaboration-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/board-collaboration-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: board-collaboration
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob.yml.j2 b/ansible/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob.yml.j2
@@ -34,6 +34,8 @@ spec:
             runAsGroup: 1000
             fsGroup: 1000
             runAsNonRoot: true
+          os:
+            name: linux
           containers:
           - name: data-deletion-trigger-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/migration-job.yml.j2 b/ansible/roles/schulcloud-server-core/templates/migration-job.yml.j2
@@ -16,6 +16,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-migration-job
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-core/templates/preview-generator-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/preview-generator-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: preview-generator
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:file-preview-{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-h5p/templates/api-h5p-deployment.yml.j2 b/ansible/roles/schulcloud-server-h5p/templates/api-h5p-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-h5p
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-init/templates/job_init.yml.j2 b/ansible/roles/schulcloud-server-init/templates/job_init.yml.j2
@@ -7,6 +7,8 @@ metadata:
 spec:
   template:
     spec:
+      os:
+        name: linux
       containers:
       - name: api-init
         image: quay.io/schulcloudverbund/infra-tools:latest

diff --git a/ansible/roles/schulcloud-server-init/templates/management-deployment.yml.j2 b/ansible/roles/schulcloud-server-init/templates/management-deployment.yml.j2
@@ -46,6 +46,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-sync-full-cronjob.yml.j2 b/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-sync-full-cronjob.yml.j2
@@ -20,6 +20,8 @@ spec:
       activeDeadlineSeconds: {{ SERVER_LDAP_SYNC_FULL_CRONJOB_TIMEOUT|default("39600", true) }}
       template:
         spec:
+          os:
+            name: linux
           containers:
           - name: api-ldapsync-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2 b/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-worker
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-migration-system/templates/deployment.yml.j2 b/ansible/roles/schulcloud-server-migration-system/templates/deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-migration-systems
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-base-cronjob.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-base-cronjob.yml.j2
@@ -19,6 +19,8 @@ spec:
     spec:
       template:
         spec:
+          os:
+            name: linux
           containers:
           - name: api-tsp-sync-base-cronjob
             image: quay.io/schulcloudverbund/infra-tools:latest

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-cronjob.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-cronjob.yml.j2
@@ -44,6 +44,8 @@ spec:
             runAsGroup: 1000
             fsGroup: 1000
             runAsNonRoot: true
+          os:
+            name: linux
           containers:
           - name: api-tsp-sync-cronjob
             image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2
@@ -47,6 +47,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-tsp-sync
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-init.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-init.yml.j2
@@ -30,6 +30,8 @@ spec:
         runAsGroup: 1000
         fsGroup: 1000
         runAsNonRoot: true
+      os:
+        name: linux
       containers:
       - name: api-tsp-sync-init
         image: {{ SCHULCLOUD_SERVER_IMAGE }}:{{ SCHULCLOUD_SERVER_IMAGE_TAG }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-school-cronjob.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-school-cronjob.yml.j2
@@ -19,6 +19,8 @@ spec:
     spec:
       template:
         spec:
+          os:
+            name: linux
           containers:
           - name: api-tsp-sync-school-cronjob
             image: quay.io/schulcloudverbund/infra-tools:latest

diff --git a/apps/server/src/infra/boards-client/boards-client.adapter.spec.ts b/apps/server/src/infra/boards-client/boards-client.adapter.spec.ts
@@ -0,0 +1,107 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { createMock } from '@golevelup/ts-jest';
+import { faker } from '@faker-js/faker';
+import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
+import { BoardsClientAdapter } from './boards-client.adapter';
+import { BoardApi, BoardResponse, CreateBoardBodyParams, CreateBoardResponse } from './generated';
+
+describe(BoardsClientAdapter.name, () => {
+	let module: TestingModule;
+	let sut: BoardsClientAdapter;
+
+	const boardApiMock = createMock<BoardApi>();
+
+	beforeAll(async () => {
+		module = await Test.createTestingModule({
+			providers: [
+				BoardsClientAdapter,
+				{
+					provide: BoardApi,
+					useValue: boardApiMock,
+				},
+			],
+		}).compile();
+		sut = module.get(BoardsClientAdapter);
+	});
+
+	afterAll(async () => {
+		await module.close();
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should be defined', () => {
+		expect(sut).toBeDefined();
+	});
+
+	describe('createBoard', () => {
+		describe('when creating a board', () => {
+			const setup = () => {
+				const params: CreateBoardBodyParams = {
+					title: faker.lorem.words(),
+					layout: 'columns',
+					parentId: faker.string.uuid(),
+					parentType: 'course',
+				};
+				const responseData: CreateBoardResponse = {
+					id: faker.string.uuid(),
+				};
+
+				boardApiMock.boardControllerCreateBoard.mockResolvedValue(axiosResponseFactory.build({ data: responseData }));
+
+				return {
+					params,
+					responseData,
+				};
+			};
+
+			it('should call boardApi.boardControllerCreateBoard', async () => {
+				const { params, responseData } = setup();
+
+				const response = await sut.createBoard(params);
+
+				expect(response).toEqual(responseData);
+				expect(boardApiMock.boardControllerCreateBoard).toHaveBeenCalledWith(params);
+			});
+		});
+	});
+
+	describe('getBoardSkeletonById', () => {
+		describe('when reading a board', () => {
+			const setup = () => {
+				const boardId = faker.string.uuid();
+				const responseData: BoardResponse = {
+					id: boardId,
+					title: faker.lorem.words(),
+					layout: 'columns',
+					columns: [],
+					isVisible: true,
+					timestamps: {
+						createdAt: faker.date.recent().toISOString(),
+						lastUpdatedAt: faker.date.recent().toISOString(),
+					},
+				};
+
+				boardApiMock.boardControllerGetBoardSkeleton.mockResolvedValue(
+					axiosResponseFactory.build({ data: responseData })
+				);
+
+				return {
+					boardId,
+					responseData,
+				};
+			};
+
+			it('should call boardApi.boardControllerGetBoardSkeleton', async () => {
+				const { boardId, responseData } = setup();
+
+				const response = await sut.getBoardSkeletonById(boardId);
+
+				expect(response).toEqual(responseData);
+				expect(boardApiMock.boardControllerGetBoardSkeleton).toHaveBeenCalledWith(boardId);
+			});
+		});
+	});
+});
diff --git a/apps/server/src/infra/boards-client/boards-client.adapter.ts b/apps/server/src/infra/boards-client/boards-client.adapter.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { BoardApi, BoardResponse, CreateBoardBodyParams, CreateBoardResponse } from './generated';
+
+@Injectable()
+export class BoardsClientAdapter {
+	constructor(private readonly boardApi: BoardApi) {}
+
+	public async createBoard(params: CreateBoardBodyParams): Promise<CreateBoardResponse> {
+		const response = await this.boardApi.boardControllerCreateBoard(params);
+
+		return response.data;
+	}
+
+	public async getBoardSkeletonById(boardId: string): Promise<BoardResponse> {
+		const response = await this.boardApi.boardControllerGetBoardSkeleton(boardId);
+
+		return response.data;
+	}
+}
diff --git a/apps/server/src/infra/boards-client/boards-client.config.ts b/apps/server/src/infra/boards-client/boards-client.config.ts
@@ -0,0 +1,3 @@
+export interface BoardsClientConfig {
+	API_HOST: string;
+}