Skip to content

Commit b7806f7

Browse files
committed
chore: add containerProvider check
Signed-off-by: Sonia Sandler <[email protected]>
1 parent ae3d9ae commit b7806f7

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

src/extension.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as extensionApi from '@podman-desktop/api';
2121

2222
import { LoggerDelegator } from './logger';
2323
import { ProviderConnectionShellAccessImpl } from './macadam-machine-stream';
24-
import { getErrorMessage } from './utils';
24+
import { getErrorMessage, verifyContainerProivder } from './utils';
2525
import { isHyperVEnabled, isWSLEnabled } from './win/utils';
2626

2727
const MACADAM_CLI_NAME = 'macadam';
@@ -151,7 +151,7 @@ export async function getJSONMachineListByProvider(vmProvider?: string): Promise
151151
let stdout: macadamJSPackage.VmDetails[] = [];
152152
let stderr = '';
153153
try {
154-
stdout = await macadam.listVms({ containerProvider: vmProvider });
154+
stdout = await macadam.listVms({ containerProvider: verifyContainerProivder(vmProvider ?? '') });
155155
} catch (err: unknown) {
156156
stderr = `${err}`;
157157
}
@@ -173,7 +173,7 @@ async function startMachine(
173173

174174
try {
175175
await macadam.startVm({
176-
containerProvider: machineInfo.vmType,
176+
containerProvider: verifyContainerProivder(machineInfo.vmType),
177177
runOptions: { logger: new LoggerDelegator(context, logger) },
178178
});
179179
provider.updateStatus('started');
@@ -201,7 +201,7 @@ async function stopMachine(
201201
telemetryRecords.provider = 'macadam';
202202
try {
203203
await macadam.stopVm({
204-
containerProvider: machineInfo.vmType,
204+
containerProvider: verifyContainerProivder(machineInfo.vmType),
205205
runOptions: { logger: new LoggerDelegator(context, logger) },
206206
});
207207
provider.updateStatus('stopped');
@@ -230,7 +230,7 @@ async function registerProviderFor(
230230
await stopMachine(provider, machineInfo, context, logger);
231231
},
232232
delete: async (logger): Promise<void> => {
233-
await macadam.removeVm({ containerProvider: machineInfo.vmType, runOptions: { logger } });
233+
await macadam.removeVm({ containerProvider: verifyContainerProivder(machineInfo.vmType), runOptions: { logger } });
234234
},
235235
};
236236

src/utils.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ export function getErrorMessage(err: unknown): string {
7878
return '';
7979
}
8080

81-
export async function execMacadam(
81+
/*
82+
export async function execMacadam(
8283
args: string[],
8384
containersProvider?: string,
8485
options?: extensionApi.RunOptions,
@@ -94,4 +95,13 @@ export async function execMacadam(
9495
}
9596
9697
return extensionApi.process.exec(macadamCli, args, finalOptions);
98+
}
99+
*/
100+
101+
export function verifyContainerProivder(containerProvider: string): 'wsl' | 'hyperv' | 'applehv'| undefined {
102+
if (containerProvider === 'wsl' || containerProvider === 'hyperv' || containerProvider === 'applehv') {
103+
return containerProvider;
104+
} else {
105+
return undefined;
106+
}
97107
}

0 commit comments

Comments
 (0)