Skip to content

Commit cf76b40

Browse files
committed
fix: fix formatter
Signed-off-by: lstocchi <[email protected]>
1 parent 5f7c45a commit cf76b40

File tree

3 files changed

+53
-33
lines changed

3 files changed

+53
-33
lines changed

src/crc-start.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export async function startCrc(
8383
return true;
8484
}
8585
}
86-
console.error(err);
86+
console.error(err);
8787
provider.updateStatus('stopped');
8888
throw new Error(`${productName} start error: ${err}`);
8989
}

src/extension.ts

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import { registerOpenTerminalCommand } from './dev-terminal.js';
3737
import { commandManager } from './command.js';
3838
import { registerOpenConsoleCommand } from './crc-console.js';
3939
import { registerLogInCommands } from './login-commands.js';
40-
import { defaultLogger } from './logger.js';
4140
import { pushImageToCrcCluster } from './image-handler.js';
4241
import type { Preset } from './types.js';
42+
import { needSetup, setUpCrc } from './crc-setup.js';
4343

4444
const CRC_PUSH_IMAGE_TO_CLUSTER = 'crc.image.push.to.cluster';
4545
const CRC_PRESET_KEY = 'crc.crcPreset';
@@ -220,9 +220,7 @@ function registerProviderConnectionFactory(
220220
): void {
221221
connectionFactoryDisposable = provider.setKubernetesProviderConnectionFactory(
222222
{
223-
initialize: async () => {
224-
await createCrcVm(provider, extensionContext, telemetryLogger, defaultLogger);
225-
},
223+
initialize: () => initializeCrc(provider, extensionContext, telemetryLogger),
226224
create: async (params, logger) => {
227225
await presetChanged(provider, extensionContext, telemetryLogger);
228226
await saveConfig(params);
@@ -258,16 +256,38 @@ async function createCrcVm(
258256
}
259257
}
260258

259+
async function initializeCrc(
260+
provider: extensionApi.Provider,
261+
extensionContext: extensionApi.ExtensionContext,
262+
telemetryLogger: extensionApi.TelemetryLogger,
263+
): Promise<void> {
264+
const hasSetupFinished = await setUpCrc(true);
265+
if (!hasSetupFinished) {
266+
throw new Error(`Failed at initializing ${productName}`);
267+
}
268+
269+
await needSetup();
270+
await connectToCrc();
271+
await presetChanged(provider, extensionContext, telemetryLogger);
272+
addCommands(telemetryLogger);
273+
await syncPreferences(provider, extensionContext, telemetryLogger);
274+
return presetChanged(provider, extensionContext, telemetryLogger);
275+
}
276+
261277
function addCommands(telemetryLogger: extensionApi.TelemetryLogger): void {
262-
registerOpenTerminalCommand();
263-
registerOpenConsoleCommand();
264-
registerLogInCommands();
265-
registerDeleteCommand();
266-
267-
commandManager.addCommand(CRC_PUSH_IMAGE_TO_CLUSTER, image => {
268-
telemetryLogger.logUsage('pushImage');
269-
return pushImageToCrcCluster(image);
270-
});
278+
try {
279+
registerOpenTerminalCommand();
280+
registerOpenConsoleCommand();
281+
registerLogInCommands();
282+
registerDeleteCommand();
283+
284+
commandManager.addCommand(CRC_PUSH_IMAGE_TO_CLUSTER, image => {
285+
telemetryLogger.logUsage('pushImage');
286+
pushImageToCrcCluster(image);
287+
});
288+
} catch (e) {
289+
// do nothing
290+
}
271291
}
272292

273293
function deleteCommands(): void {
@@ -335,7 +355,7 @@ function registerOpenShiftLocalCluster(
335355
} catch (e) {
336356
logger.error(e);
337357
throw e;
338-
}
358+
}
339359
},
340360
stop: () => {
341361
provider.updateStatus('stopping');
@@ -406,6 +426,6 @@ async function presetChanged(
406426
// podman connection
407427
registerPodmanConnection(provider, extensionContext);
408428
} else if (preset === 'openshift' || preset === 'microshift') {
409-
registerOpenShiftLocalCluster(getPresetLabel(preset), provider, extensionContext, telemetryLogger);
429+
await registerOpenShiftLocalCluster(getPresetLabel(preset), provider, extensionContext, telemetryLogger);
410430
}
411431
}

src/util.spec.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ import { expect, test, vi } from 'vitest';
2121
import { getLoggerCallback } from './util';
2222

2323
test('check logger passed to getLoggerCallback is actually called with data', async () => {
24-
const logMock = vi.fn();
25-
const logger = {
26-
log: logMock,
27-
} as unknown as extensionApi.Logger;
28-
const callback = getLoggerCallback(undefined, logger);
29-
callback('data');
30-
expect(logMock).toBeCalledWith('data');
24+
const logMock = vi.fn();
25+
const logger = {
26+
log: logMock,
27+
} as unknown as extensionApi.Logger;
28+
const callback = getLoggerCallback(undefined, logger);
29+
callback('data');
30+
expect(logMock).toBeCalledWith('data');
3131
});
3232

3333
test('check logger passed to getLoggerCallback is actually called with data', async () => {
34-
const logMock = vi.fn();
35-
const context = {
36-
log: {
37-
log: logMock,
38-
},
39-
} as unknown as extensionApi.LifecycleContext;
40-
const callback = getLoggerCallback(context);
41-
callback('data2');
42-
expect(logMock).toBeCalledWith('data2');
43-
});
34+
const logMock = vi.fn();
35+
const context = {
36+
log: {
37+
log: logMock,
38+
},
39+
} as unknown as extensionApi.LifecycleContext;
40+
const callback = getLoggerCallback(context);
41+
callback('data2');
42+
expect(logMock).toBeCalledWith('data2');
43+
});

0 commit comments

Comments
 (0)