Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ApplicationManager): remove unused interfaces #1114

Merged
merged 2 commits into from
May 27, 2024
Merged

refactor(ApplicationManager): remove unused interfaces #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72731dc
refactor: remove unused interfaces
axel7083 May 22, 2024
f5feb14
fix: restart not starting
axel7083 May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 27 additions & 47 deletions packages/backend/src/managers/applicationManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
***********************************************************************/
import { describe, expect, test, vi, beforeEach } from 'vitest';
import {
type ContainerAttachedInfo,
type ImageInfo,
type ApplicationPodInfo,
ApplicationManager,
CONFIG_FILENAME,
} from './applicationManager';
import { type ImageInfo, ApplicationManager, CONFIG_FILENAME } from './applicationManager';
import type { GitManager } from './gitManager';
import os from 'os';
import fs, { type PathLike } from 'node:fs';
Expand Down Expand Up @@ -151,6 +145,7 @@ const podManager = {
findPodByLabelsValues: vi.fn(),
getPodsWithLabels: vi.fn(),
getHealth: vi.fn(),
getPod: vi.fn(),
} as unknown as PodManager;

const localRepositoryRegistry = {
Expand Down Expand Up @@ -283,6 +278,10 @@ describe('pullApplication', () => {
recipeFolderExists: false,
});
vi.mocked(podManager.getAllPods).mockResolvedValue([]);
vi.mocked(podManager.getPod).mockResolvedValue({
engineId: 'dummyEngineId',
Id: 'dummyPodId',
} as unknown as PodInfo);
vi.spyOn(podman, 'isQEMUMachine').mockResolvedValue(false);
vi.spyOn(modelsManager, 'isModelOnDisk').mockReturnValue(false);
vi.spyOn(modelsManager, 'uploadModelToPodmanMachine').mockResolvedValue('path');
Expand Down Expand Up @@ -428,6 +427,10 @@ describe('pullApplication', () => {
recipeFolderExists: true,
});
vi.mocked(podManager.getAllPods).mockResolvedValue([]);
vi.mocked(podManager.getPod).mockResolvedValue({
engineId: 'dummyEngineId',
Id: 'dummyPodId',
} as unknown as PodInfo);
vi.spyOn(modelsManager, 'isModelOnDisk').mockReturnValue(true);
vi.spyOn(modelsManager, 'uploadModelToPodmanMachine').mockResolvedValue('path');
vi.spyOn(modelsManager, 'getLocalModelPath').mockReturnValue('path');
Expand Down Expand Up @@ -801,17 +804,15 @@ describe('createApplicationPod', () => {
});
});
test('call createAndAddContainersToPod after pod is created', async () => {
const pod: ApplicationPodInfo = {
const pod: PodInfo = {
engineId: 'engine',
Id: 'id',
portmappings: [],
};
} as unknown as PodInfo;
vi.spyOn(manager, 'createPod').mockResolvedValue(pod);
// mock createContainerAndAttachToPod
const createAndAddContainersToPodMock = vi
.spyOn(manager, 'createAndAddContainersToPod')
.mockImplementation((_pod: ApplicationPodInfo, _images: ImageInfo[], _modelInfo: ModelInfo, _modelPath: string) =>
Promise.resolve([]),
);
.spyOn(manager, 'createContainerAndAttachToPod')
.mockResolvedValue(undefined);
await manager.createApplicationPod({ id: 'recipe-id' } as Recipe, { id: 'model-id' } as ModelInfo, images, 'path');
expect(createAndAddContainersToPodMock).toBeCalledWith(pod, images, { id: 'model-id' }, 'path');
expect(mocks.updateTaskMock).toBeCalledWith({
Expand All @@ -824,13 +825,12 @@ describe('createApplicationPod', () => {
});
});
test('throw if createAndAddContainersToPod fails', async () => {
const pod: ApplicationPodInfo = {
const pod: PodInfo = {
engineId: 'engine',
Id: 'id',
portmappings: [],
};
} as unknown as PodInfo;
vi.spyOn(manager, 'createPod').mockResolvedValue(pod);
vi.spyOn(manager, 'createAndAddContainersToPod').mockRejectedValue('error');
vi.spyOn(manager, 'createContainerAndAttachToPod').mockRejectedValue('error');
await expect(() =>
manager.createApplicationPod({ id: 'recipe-id' } as Recipe, { id: 'model-id' } as ModelInfo, images, 'path'),
).rejects.toThrowError('error');
Expand Down Expand Up @@ -860,42 +860,22 @@ describe('runApplication', () => {
builderManager,
podManager,
);
const pod: ApplicationPodInfo = {
const pod: PodInfo = {
engineId: 'engine',
Id: 'id',
containers: [
{
name: 'first',
modelService: false,
ports: ['8080', '8081'],
},
{
name: 'second',
modelService: true,
ports: ['9000'],
},
],
portmappings: [
Containers: [
{
container_port: 9000,
host_port: 9001,
host_ip: '',
protocol: '',
range: -1,
Id: 'dummyContainerId',
},
],
};
} as unknown as PodInfo;
test('check startPod is called and also waitContainerIsRunning for sample app', async () => {
const waitContainerIsRunningMock = vi
.spyOn(manager, 'waitContainerIsRunning')
.mockImplementation((_engineId: string, _container: ContainerAttachedInfo) => Promise.resolve());
const waitContainerIsRunningMock = vi.spyOn(manager, 'waitContainerIsRunning').mockResolvedValue(undefined);
vi.spyOn(utils, 'timeout').mockResolvedValue();
await manager.runApplication(pod);
expect(mocks.startPod).toBeCalledWith(pod.engineId, pod.Id);
expect(waitContainerIsRunningMock).toBeCalledWith(pod.engineId, {
name: 'first',
modelService: false,
ports: ['8080', '8081'],
Id: 'dummyContainerId',
});
});
});
Expand All @@ -914,11 +894,11 @@ describe('createAndAddContainersToPod', () => {
builderManager,
podManager,
);
const pod: ApplicationPodInfo = {
const pod: PodInfo = {
engineId: 'engine',
Id: 'id',
portmappings: [],
};
} as unknown as PodInfo;
const imageInfo1: ImageInfo = {
id: 'id',
appName: 'appName',
Expand All @@ -936,7 +916,7 @@ describe('createAndAddContainersToPod', () => {
id: 'container-1',
});
vi.spyOn(podman, 'isQEMUMachine').mockResolvedValue(false);
await manager.createAndAddContainersToPod(pod, [imageInfo1, imageInfo2], modelInfo, 'path');
await manager.createContainerAndAttachToPod(pod, [imageInfo1, imageInfo2], modelInfo, 'path');
expect(mocks.createContainerMock).toHaveBeenNthCalledWith(1, 'engine', {
Image: 'id',
Detach: true,
Expand Down
Loading